epics/pvDatabase
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Merge pull request #9 from mrkraimer/master

Browse Source 
for installing in include/pv follow  pvaClientCPP
This commit is contained in:
Marty Kraimer
2016-02-04 13:12:15 -05:00
parent 3babe530ca 80ff17cfbc
commit 0611db9a18
8 changed files with 12 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
configure/CONFIG_SITE
View File

@ -14,14 +14,11 @@
# Set CHECK_RELEASE to NO to disable checking completely. # Set CHECK_RELEASE to NO to disable checking completely.
# Set CHECK_RELEASE to WARN to perform consistency checking but # Set CHECK_RELEASE to WARN to perform consistency checking but
# continue building anyway if conflicts are found. # continue building anyway if conflicts are found.
#CHECK_RELEASE = YES CHECK_RELEASE = WARN
# To install files into a location other than $(TOP) define # To install files into a location other than $(TOP) define
# INSTALL_LOCATION here. # INSTALL_LOCATION here.
#INSTALL_LOCATION=</path/name/to/install/top> #INSTALL_LOCATION=</path/name/to/install/top>
INSTALL_INCLUDE = $(INSTALL_LOCATION)/include/pv
USR_INCLUDES += -I $(INSTALL_LOCATION)/include
-include $(TOP)/../CONFIG_SITE.local -include $(TOP)/../CONFIG_SITE.local
-include $(TOP)/configure/CONFIG_SITE.local -include $(TOP)/configure/CONFIG_SITE.local

8
documentation/TODO.html
View File

@ -1,8 +0,0 @@
<h1>TODO</h1>
<h2>monitorPlugin</h2>
<p>A debate is on-going about what semantics should be.</p>
<h2>Must test record delete.</h2>
<p>Must test removing a record from the PVDatabase while a pvAccess client
is attached. Also why do both unlisten and detach exists?</p>
<h2>create more regression tests</h2>
<p>Currently only some simple tests exist. Most of the testing has been via the examples</p>

12
src/Makefile
View File

@ -3,17 +3,19 @@
TOP = .. TOP = ..
include $(TOP)/configure/CONFIG include $(TOP)/configure/CONFIG
INSTALL_INCLUDE = $(INSTALL_LOCATION)/include/pv
USR_INCLUDES += -I$(INSTALL_LOCATION)/include
PVDATABASE_SRC = $(TOP)/src PVDATABASE_SRC = $(TOP)/src
include $(PVDATABASE_SRC)/pv/Makefile
LIBRARY += pvDatabase
INC += pv/channelProviderLocal.h
INC += pv/pvDatabase.h
INC += pv/traceRecord.h
include $(PVDATABASE_SRC)/database/Makefile include $(PVDATABASE_SRC)/database/Makefile
include $(PVDATABASE_SRC)/pvAccess/Makefile include $(PVDATABASE_SRC)/pvAccess/Makefile
include $(PVDATABASE_SRC)/special/Makefile include $(PVDATABASE_SRC)/special/Makefile
LIBRARY += pvDatabase
pvDatabase_LIBS += pvAccess pvData Com pvDatabase_LIBS += pvAccess pvData Com
pvDatabase_LIBS += $(EPICS_BASE_IOC_LIBS) pvDatabase_LIBS += $(EPICS_BASE_IOC_LIBS)

5
src/pv/Makefile
View File

@ -1,5 +0,0 @@
SRC_DIRS += $(PVDATABASE_SRC)/pv
INC += pvDatabase.h
INC += channelProviderLocal.h
INC += traceRecord.h

2
test/src/powerSupply.h
View File

@ -37,7 +37,7 @@ namespace epics { namespace pvDatabase {
class PowerSupply; class PowerSupply;
typedef std::tr1::shared_ptr<PowerSupply> PowerSupplyPtr; typedef std::tr1::shared_ptr<PowerSupply> PowerSupplyPtr;
class epicsShareClass PowerSupply : class PowerSupply :
public PVRecord public PVRecord
{ {
public: public:

1
test/src/testExampleRecord.cpp
View File

@ -30,6 +30,7 @@
#include <pv/standardPVField.h> #include <pv/standardPVField.h>
#include <pv/pvData.h> #include <pv/pvData.h>
#include <pv/pvAccess.h> #include <pv/pvAccess.h>
#define epicsExportSharedSymbols
#include "powerSupply.h" #include "powerSupply.h"
#include <epicsExport.h> #include <epicsExport.h>

1
test/src/testPVCopy.cpp
View File

@ -29,6 +29,7 @@
#include <pv/standardPVField.h> #include <pv/standardPVField.h>
#include <pv/channelProviderLocal.h> #include <pv/channelProviderLocal.h>
#include <pv/convert.h> #include <pv/convert.h>
#define epicsExportSharedSymbols
#include "powerSupply.h" #include "powerSupply.h"

1
test/src/testPVRecord.cpp
View File

@ -29,6 +29,7 @@
#include <pv/standardPVField.h> #include <pv/standardPVField.h>
#include <pv/pvData.h> #include <pv/pvData.h>
#include <pv/pvCopy.h> #include <pv/pvCopy.h>
#define epicsExportSharedSymbols
#include "powerSupply.h" #include "powerSupply.h"