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

copy lib now part of pvDatabase

Browse Source
This commit is contained in:
mrkraimer
2019-06-26 10:47:58 -04:00
parent f2d6e05816
commit e57348a4c5
22 changed files with 35 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -3,12 +3,8 @@ TOP = .
include $(TOP)/configure/CONFIG
DIRS += configure
DIRS += src/copy
src/copy_DEPEND_DIRS = configure
DIRS += src
src_DEPEND_DIRS = configure src/copy
src_DEPEND_DIRS = configure
DIRS += test
test_DEPEND_DIRS = src

14
src/Makefile
View File

@ -13,21 +13,31 @@ LIBRARY += pvDatabase
# shared library ABI version.
SHRLIB_VERSION ?= $(EPICS_PVA_MAJOR_VERSION).$(EPICS_PVA_MINOR_VERSION).$(EPICS_PVA_MAINTENANCE_VERSION)
INC += pv/channelProviderLocal.h
INC += pv/pvPlugin.h
INC += pv/pvStructureCopy.h
INC += pv/pvArrayPlugin.h
INC += pv/pvDeadbandPlugin.h
INC += pv/pvTimestampPlugin.h
INC += pv/pvDatabase.h
INC += pv/channelProviderLocal.h
INC += pv/traceRecord.h
INC += pv/removeRecord.h
INC += pv/processRecord.h
INC += pv/pvSupport.h
INC += pv/controlSupport.h
INC += pv/scalarAlarmSupport.h
include $(PVDATABASE_SRC)/copy/Makefile
include $(PVDATABASE_SRC)/database/Makefile
include $(PVDATABASE_SRC)/pvAccess/Makefile
include $(PVDATABASE_SRC)/special/Makefile
include $(PVDATABASE_SRC)/support/Makefile
pvDatabase_LIBS += pvCopy
pvDatabase_LIBS += $(EPICS_BASE_PVA_CORE_LIBS)
pvDatabase_LIBS += $(EPICS_BASE_IOC_LIBS)

19
src/copy/Makefile
View File

@ -1,18 +1,7 @@
TOP = ../..
include $(TOP)/configure/CONFIG
LIBRARY += pvCopy
# This is a Makefile fragment, see ../Makefile
SHRLIB_VERSION ?= $(EPICS_PVA_MAJOR_VERSION).$(EPICS_PVA_MINOR_VERSION).$(EPICS_PVA_MAINTENANCE_VERSION)
# needed for Windows
LIB_SYS_LIBS_WIN32 += netapi32 ws2_32
INC += pv/pvPlugin.h
INC += pv/pvStructureCopy.h
INC += pv/pvArrayPlugin.h
INC += pv/pvDeadbandPlugin.h
INC += pv/pvTimestampPlugin.h
SRC_DIRS += $(PVDATABASE_SRC)/copy
LIBSRCS += pvPlugin.cpp
LIBSRCS += pvCopy.cpp
@ -20,8 +9,4 @@ LIBSRCS += pvArrayPlugin.cpp
LIBSRCS += pvDeadbandPlugin.cpp
LIBSRCS += pvTimestampPlugin.cpp
pvCopy_LIBS += $(EPICS_BASE_PVA_CORE_LIBS)
pvCopy_LIBS += $(EPICS_BASE_IOC_LIBS)
include $(TOP)/configure/RULES

2
src/database/pvDatabase.cpp
View File

@ -15,9 +15,9 @@
#include <pv/pvData.h>
#include <pv/pvTimeStamp.h>
#include <pv/rpcService.h>
#include <pv/pvStructureCopy.h>
#define epicsExportSharedSymbols
#include "pv/pvStructureCopy.h"
#include "pv/pvDatabase.h"
#include "pv/pvPlugin.h"
#include "pv/pvArrayPlugin.h"

2
src/database/pvRecord.cpp
View File

@ -23,9 +23,9 @@
#include <pv/pvData.h>
#include <pv/rpcService.h>
#include <pv/pvTimeStamp.h>
#include <pv/pvStructureCopy.h>
#define epicsExportSharedSymbols
#include "pv/pvStructureCopy.h"
#include "pv/pvDatabase.h"
using std::tr1::static_pointer_cast;

0
src/copy/pv/pvArrayPlugin.h → src/pv/pvArrayPlugin.h
View File

0
src/copy/pv/pvDeadbandPlugin.h → src/pv/pvDeadbandPlugin.h
View File

0
src/copy/pv/pvPlugin.h → src/pv/pvPlugin.h
View File

0
src/copy/pv/pvStructureCopy.h → src/pv/pvStructureCopy.h
View File

0
src/copy/pv/pvTimestampPlugin.h → src/pv/pvTimestampPlugin.h
View File

2
src/pvAccess/channelLocal.cpp
View File

@ -23,9 +23,9 @@
#include <pv/pvaVersionNum.h>
#include <pv/serverContext.h>
#include <pv/pvSubArrayCopy.h>
#include <pv/pvStructureCopy.h>
#define epicsExportSharedSymbols
#include "pv/pvStructureCopy.h"
#include "pv/pvDatabase.h"
#include "pv/channelProviderLocal.h"

2
src/pvAccess/channelProviderLocal.cpp
View File

@ -16,9 +16,9 @@
#include <pv/pvTimeStamp.h>
#include <pv/rpcService.h>
#include <pv/timeStamp.h>
#include <pv/pvStructureCopy.h>
#define epicsExportSharedSymbols
#include "pv/pvStructureCopy.h"
#include "pv/pvDatabase.h"
#include "pv/channelProviderLocal.h"

2
src/pvAccess/monitorFactory.cpp
View File

@ -20,9 +20,9 @@
#include <pv/rpcService.h>
#include <pv/serverContext.h>
#include <pv/timeStamp.h>
#include <pv/pvStructureCopy.h>
#define epicsExportSharedSymbols
#include "pv/pvStructureCopy.h"
#include "pv/pvDatabase.h"
#include "pv/channelProviderLocal.h"

2
src/special/processRecord.cpp
View File

@ -27,9 +27,9 @@
#include <pv/pvAccess.h>
#include <pv/status.h>
#include <pv/serverContext.h>
#include <pv/pvStructureCopy.h>
#define epicsExportSharedSymbols
#include "pv/pvStructureCopy.h"
#include "pv/pvDatabase.h"
#include "pv/processRecord.h"

2
src/special/processRecordRegister.cpp
View File

@ -20,9 +20,9 @@
#include <pv/pvData.h>
#include <pv/pvTimeStamp.h>
#include <pv/rpcService.h>
#include <pv/pvStructureCopy.h>
#define epicsExportSharedSymbols
#include "pv/pvStructureCopy.h"
#include "pv/pvDatabase.h"
#include "pv/processRecord.h"

3
src/special/removeRecord.cpp
View File

@ -24,9 +24,10 @@
#include <pv/pvAccess.h>
#include <pv/status.h>
#include <pv/serverContext.h>
#include <pv/pvStructureCopy.h>
#define epicsExportSharedSymbols
#include "pv/pvStructureCopy.h"
#include "pv/pvDatabase.h"
#include "pv/removeRecord.h"

2
src/special/removeRecordRegister.cpp
View File

@ -19,9 +19,9 @@
#include <pv/pvData.h>
#include <pv/pvTimeStamp.h>
#include <pv/rpcService.h>
#include <pv/pvStructureCopy.h>
#define epicsExportSharedSymbols
#include "pv/pvStructureCopy.h"
#include "pv/pvDatabase.h"
#include "pv/removeRecord.h"

2
src/special/traceRecord.cpp
View File

@ -24,9 +24,9 @@
#include <pv/pvAccess.h>
#include <pv/status.h>
#include <pv/serverContext.h>
#include <pv/pvStructureCopy.h>
#define epicsExportSharedSymbols
#include "pv/pvStructureCopy.h"
#include "pv/channelProviderLocal.h"
#include "pv/traceRecord.h"

2
src/special/traceRecordRegister.cpp
View File

@ -20,9 +20,9 @@
#include <pv/pvData.h>
#include <pv/pvTimeStamp.h>
#include <pv/rpcService.h>
#include <pv/pvStructureCopy.h>
#define epicsExportSharedSymbols
#include "pv/pvStructureCopy.h"
#include "pv/pvDatabase.h"
#include "pv/traceRecord.h"

7
src/support/controlSupport.cpp
View File

@ -9,12 +9,13 @@
* @date 2019.06.01
*/
#include <pv/pvData.h>
#include <pv/pvTimeStamp.h>
#include <pv/rpcService.h>
#include <pv/convert.h>
#include <pv/standardField.h>
#include <pv/pvStructureCopy.h>
#define epicsExportSharedSymbols
#include "pv/pvStructureCopy.h"
#include <pv/pvSupport.h>
#include "pv/pvDatabase.h"
#include "pv/controlSupport.h"

8
src/support/scalarAlarmSupport.cpp
View File

@ -8,16 +8,16 @@
* @author mrk
* @date 2019.06.01
*/
#include <pv/pvTimeStamp.h>
#include <pv/rpcService.h>
#include <pv/convert.h>
#include <pv/standardField.h>
#include <pv/alarm.h>
#include <pv/pvAlarm.h>
#include <pv/pvStructureCopy.h>
#define epicsExportSharedSymbols
#include <pv/pvSupport.h>
#include "pv/pvStructureCopy.h"
#include "pv/pvSupport.h"
#include "pv/pvDatabase.h"
#include "pv/scalarAlarmSupport.h"

1
test/Makefile
View File

@ -6,7 +6,6 @@ include $(TOP)/configure/CONFIG
PVDATABASE_TEST = $(TOP)/test
PROD_LIBS += pvDatabase
PROD_LIBS += pvCopy
PROD_LIBS += $(EPICS_BASE_PVA_CORE_LIBS)
PROD_LIBS += $(EPICS_BASE_IOC_LIBS)