diff --git a/Makefile b/Makefile index 10141ff..c005d8f 100644 --- a/Makefile +++ b/Makefile @@ -1,12 +1,17 @@ -#Makefile at top of application tree +# Makefile for the EPICS V4 pvAccess module + TOP = . include $(TOP)/configure/CONFIG -DIRS += configure -DIRS += pvAccessApp -pvAccessApp_DEPEND_DIRS = configure + +DIRS := configure + +DIRS += src +src_DEPEND_DIRS = configure + +DIRS += pvtoolsSrc +pvtoolsSrc_DEPEND_DIRS = src + DIRS += testApp -testApp_DEPEND_DIRS = pvAccessApp +testApp_DEPEND_DIRS = src include $(TOP)/configure/RULES_TOP - - diff --git a/configure/CONFIG_SITE b/configure/CONFIG_SITE index 575e348..ebc5310 100644 --- a/configure/CONFIG_SITE +++ b/configure/CONFIG_SITE @@ -8,43 +8,27 @@ # CONFIG_SITE.Common.$(T_A) # CONFIG_SITE.$(EPICS_HOST_ARCH).$(T_A) -# Set this when you only want to compile this application -# for a subset of the cross-compiled target architectures -# that Base is built for. -#CROSS_COMPILER_TARGET_ARCHS = vxWorks-68040 +# CHECK_RELEASE controls the consistency checking of the support +# applications pointed to by the RELEASE* files. +# Normally CHECK_RELEASE should be set to YES. +# Set CHECK_RELEASE to NO to disable checking completely. +# Set CHECK_RELEASE to WARN to perform consistency checking but +# continue building anyway if conflicts are found. +CHECK_RELEASE = YES # To install files into a location other than $(TOP) define # INSTALL_LOCATION here. #INSTALL_LOCATION= -# Set this when your IOC and the host use different paths -# to access the application. This will be needed to boot -# from a Microsoft FTP server or with some NFS mounts. -# You must rebuild in the iocBoot directory for this to -# take effect. -#IOCS_APPL_TOP = +-include $(TOP)/configure/CONFIG_SITE.local +-include $(TOP)/../CONFIG.local -ifeq ($(EPICS_TEST_COVERAGE),1) +ifdef WITH_COVERAGE USR_CPPFLAGS += --coverage USR_LDFLAGS += --coverage endif -ifeq ($(EPICS_HOST_ARCH),linux-x86) - USR_LDFLAGS += -lpthread +ifdef WITH_MICROBENCH +USR_CPPFLAGS += -DWITH_MICROBENCH endif -ifeq ($(EPICS_HOST_ARCH),win32-x86) - USR_SYS_LIBS += ws2_32 -endif - -ifeq ($(EPICS_HOST_ARCH),win32-x86-debug) - USR_SYS_LIBS += ws2_32 -endif - -INSTALL_INCLUDE = $(INSTALL_LOCATION)/include/pv -USR_INCLUDES += -I $(INSTALL_LOCATION)/include - -#USR_CPPFLAGS += -DPV_MB -g -ggdb - --include $(TOP)/configure/CONFIG_SITE.local --include $(TOP)/../CONFIG.local diff --git a/configure/Makefile b/configure/Makefile index 1cd830e..aefe673 100644 --- a/configure/Makefile +++ b/configure/Makefile @@ -2,15 +2,8 @@ TOP=.. include $(TOP)/configure/CONFIG -# CHECK_RELEASE controls the consistency checking of the support -# applications pointed to by the RELEASE* files. -# Normally CHECK_RELEASE should be set to YES. -# Set CHECK_RELEASE to NO to disable checking completely. -# Set CHECK_RELEASE to WARN to perform consistency checking but -# continue building anyway if conflicts are found. -CHECK_RELEASE = YES - TARGETS = $(CONFIG_TARGETS) CONFIGS += $(subst ../,,$(wildcard $(CONFIG_INSTALLS))) include $(TOP)/configure/RULES + diff --git a/configure/RELEASE b/configure/RELEASE index fa6ac3c..03c3c5c 100644 --- a/configure/RELEASE +++ b/configure/RELEASE @@ -17,11 +17,10 @@ # EPICS V4 Developers: Do not edit the locations in this file! # # Create a file RELEASE.local pointing to your PVDATA, PVCOMMON -# and EPICS_BASE build directories, and optionally GTEST e.g. +# and EPICS_BASE build directories, e.g. # PVCOMMON = /home/install/epicsV4/pvCommonCPP # PVDATA = /home/install/epicsV4/pvDataCPP # EPICS_BASE = /home/install/epics/base -# # GTEST not used -include $(TOP)/configure/RELEASE.local -include $(TOP)/../RELEASE.local diff --git a/pvAccessApp/Makefile b/pvAccessApp/Makefile deleted file mode 100644 index 405c85a..0000000 --- a/pvAccessApp/Makefile +++ /dev/null @@ -1,112 +0,0 @@ -TOP = .. -include $(TOP)/configure/CONFIG - -PVACCESS = $(TOP)/pvAccessApp -USR_CXXFLAGS_RTEMS = -D__rtems__ - -SRC_DIRS += $(PVACCESS)/pva -INC += pvaConstants.h -INC += pvaVersion.h -INC += clientFactory.h -LIBSRCS += pvaVersion.cpp -LIBSRCS += clientFactory.cpp - - -SRC_DIRS += $(PVACCESS)/utils -INC += hexDump.h -INC += inetAddressUtil.h -INC += logger.h -INC += introspectionRegistry.h -INC += namedLockPattern.h -INC += referenceCountingLock.h -INC += configuration.h -INC += likely.h -LIBSRCS += hexDump.cpp -LIBSRCS += inetAddressUtil.cpp -LIBSRCS += logger.cpp -LIBSRCS += introspectionRegistry.cpp -LIBSRCS += configuration.cpp -LIBSRCS += referenceCountingLock.cpp - -SRC_DIRS += $(PVACCESS)/client -INC += pvAccess.h -LIBSRCS += pvAccess.cpp - -SRC_DIRS += $(PVACCESS)/factory -LIBSRCS += ChannelAccessFactory.cpp -LIBSRCS += CreateRequestFactory.cpp - -SRC_DIRS += $(PVACCESS)/remote -INC += remote.h -INC += blockingUDP.h -INC += beaconHandler.h -INC += blockingTCP.h -INC += channelSearchManager.h -INC += simpleChannelSearchManagerImpl.h -INC += transportRegistry.h -INC += serializationHelper.h -INC += codec.h -LIBSRCS += blockingUDPTransport.cpp -LIBSRCS += blockingUDPConnector.cpp -LIBSRCS += beaconHandler.cpp -LIBSRCS += blockingTCPConnector.cpp -LIBSRCS += simpleChannelSearchManagerImpl.cpp -LIBSRCS += abstractResponseHandler.cpp -LIBSRCS += blockingTCPAcceptor.cpp -LIBSRCS += transportRegistry.cpp -LIBSRCS += serializationHelper.cpp -LIBSRCS += codec.cpp - -SRC_DIRS += $(PVACCESS)/remoteClient -INC += clientContextImpl.h -LIBSRCS += clientContextImpl.cpp - -SRC_DIRS += $(PVACCESS)/server -INC += serverContext.h -INC += responseHandlers.h -INC += serverChannelImpl.h -INC += baseChannelRequester.h -INC += beaconEmitter.h -INC += beaconServerStatusProvider.h -LIBSRCS += responseHandlers.cpp -LIBSRCS += serverContext.cpp -LIBSRCS += serverChannelImpl.cpp -LIBSRCS += baseChannelRequester.cpp -LIBSRCS += beaconEmitter.cpp -LIBSRCS += beaconServerStatusProvider.cpp - -SRC_DIRS += $(PVACCESS)/rpcService -INC += rpcService.h -INC += rpcServer.h -LIBSRCS += rpcService.cpp -LIBSRCS += rpcServer.cpp - -SRC_DIRS += $(PVACCESS)/rpcClient -INC += rpcClient.h -LIBSRCS += rpcClient.cpp - -SRC_DIRS += $(PVACCESS)/ca -INC += caProvider.h -INC += caChannel.h -LIBSRCS += caProvider.cpp -LIBSRCS += caChannel.cpp - -SRC_DIRS += $(PVACCESS)/mb -INC += pvAccessMB.h -LIBSRCS += pvAccessMB.cpp - -SRC_DIRS += $(PVACCESS)/v3ioc -INC += syncChannelFind.h -DBD += PVAServerRegister.dbd -DBD += PVAClientRegister.dbd -LIBSRCS += PVAServerRegister.cpp -LIBSRCS += PVAClientRegister.cpp - -LIBRARY = pvAccess -pvAccess_LIBS += Com -pvAccess_LIBS += pvData -pvAccess_LIBS += ca -# needed for 64-bit Windows -pvAccess_SYS_LIBS_WIN32 += ws2_32 - -include $(TOP)/configure/RULES diff --git a/pvtoolsSrc/Makefile b/pvtoolsSrc/Makefile new file mode 100644 index 0000000..400de95 --- /dev/null +++ b/pvtoolsSrc/Makefile @@ -0,0 +1,24 @@ +TOP=.. + +include $(TOP)/configure/CONFIG + +PROD_HOST += pvget +pvget_SRCS += pvget.cpp +pvget_LIBS += pvAccess pvData pvMB Com + +PROD_HOST += pvput +pvput_SRCS += pvput.cpp +pvput_LIBS += pvAccess pvData pvMB Com + +PROD_HOST += pvinfo +pvinfo_SRCS += pvinfo.cpp +pvinfo_LIBS += pvAccess pvData pvMB Com + +PROD_HOST += eget +eget_SRCS += eget.cpp +eget_LIBS += pvAccess pvData pvMB ca Com + +include $(TOP)/configure/RULES +#---------------------------------------- +# ADD RULES AFTER THIS LINE + diff --git a/testApp/remote/eget.cpp b/pvtoolsSrc/eget.cpp similarity index 99% rename from testApp/remote/eget.cpp rename to pvtoolsSrc/eget.cpp index 6d546cb..2781ef8 100644 --- a/testApp/remote/eget.cpp +++ b/pvtoolsSrc/eget.cpp @@ -6,7 +6,7 @@ #include #include -#include +#include #include #include diff --git a/testApp/remote/pvget.cpp b/pvtoolsSrc/pvget.cpp similarity index 100% rename from testApp/remote/pvget.cpp rename to pvtoolsSrc/pvget.cpp diff --git a/testApp/remote/pvinfo.cpp b/pvtoolsSrc/pvinfo.cpp similarity index 100% rename from testApp/remote/pvinfo.cpp rename to pvtoolsSrc/pvinfo.cpp diff --git a/testApp/remote/pvput.cpp b/pvtoolsSrc/pvput.cpp similarity index 100% rename from testApp/remote/pvput.cpp rename to pvtoolsSrc/pvput.cpp diff --git a/testApp/remote/pvutils.cpp b/pvtoolsSrc/pvutils.cpp similarity index 100% rename from testApp/remote/pvutils.cpp rename to pvtoolsSrc/pvutils.cpp diff --git a/testApp/remote/pvutils.h b/pvtoolsSrc/pvutils.h similarity index 100% rename from testApp/remote/pvutils.h rename to pvtoolsSrc/pvutils.h diff --git a/src/Makefile b/src/Makefile new file mode 100644 index 0000000..5f0d8f4 --- /dev/null +++ b/src/Makefile @@ -0,0 +1,34 @@ +# Makefile for the pvAccess library + +TOP = .. +include $(TOP)/configure/CONFIG + +INSTALL_INCLUDE = $(INSTALL_LOCATION)/include/pv +USR_INCLUDES += -I$(INSTALL_LOCATION)/include + +PVACCESS_SRC = $(TOP)/src + +include $(PVACCESS_SRC)/pva/Makefile +include $(PVACCESS_SRC)/utils/Makefile +include $(PVACCESS_SRC)/client/Makefile +include $(PVACCESS_SRC)/factory/Makefile +include $(PVACCESS_SRC)/remote/Makefile +include $(PVACCESS_SRC)/remoteClient/Makefile +include $(PVACCESS_SRC)/server/Makefile +include $(PVACCESS_SRC)/rpcService/Makefile +include $(PVACCESS_SRC)/rpcClient/Makefile +include $(PVACCESS_SRC)/ca/Makefile +include $(PVACCESS_SRC)/mb/Makefile +include $(PVACCESS_SRC)/v3ioc/Makefile + +LIBRARY = pvAccess + +pvAccess_LIBS += pvData +pvAccess_LIBS += ca +pvAccess_LIBS += Com + +# needed for Windows +pvAccess_SYS_LIBS_WIN32 += ws2_32 + +include $(TOP)/configure/RULES + diff --git a/src/ca/Makefile b/src/ca/Makefile new file mode 100644 index 0000000..e0d75de --- /dev/null +++ b/src/ca/Makefile @@ -0,0 +1,9 @@ +# This is a Makefile fragment, see ../Makefile + +SRC_DIRS += $(PVACCESS_SRC)/ca + +INC += caProvider.h +INC += caChannel.h + +LIBSRCS += caProvider.cpp +LIBSRCS += caChannel.cpp diff --git a/pvAccessApp/ca/caChannel.cpp b/src/ca/caChannel.cpp similarity index 100% rename from pvAccessApp/ca/caChannel.cpp rename to src/ca/caChannel.cpp diff --git a/pvAccessApp/ca/caChannel.h b/src/ca/caChannel.h similarity index 100% rename from pvAccessApp/ca/caChannel.h rename to src/ca/caChannel.h diff --git a/pvAccessApp/ca/caProvider.cpp b/src/ca/caProvider.cpp similarity index 100% rename from pvAccessApp/ca/caProvider.cpp rename to src/ca/caProvider.cpp diff --git a/pvAccessApp/ca/caProvider.h b/src/ca/caProvider.h similarity index 100% rename from pvAccessApp/ca/caProvider.h rename to src/ca/caProvider.h diff --git a/src/client/Makefile b/src/client/Makefile new file mode 100644 index 0000000..8f569c8 --- /dev/null +++ b/src/client/Makefile @@ -0,0 +1,7 @@ +# This is a Makefile fragment, see ../Makefile + +SRC_DIRS += $(PVACCESS_SRC)/client + +INC += pvAccess.h + +LIBSRCS += pvAccess.cpp diff --git a/pvAccessApp/client/pvAccess.cpp b/src/client/pvAccess.cpp similarity index 100% rename from pvAccessApp/client/pvAccess.cpp rename to src/client/pvAccess.cpp diff --git a/pvAccessApp/client/pvAccess.h b/src/client/pvAccess.h similarity index 100% rename from pvAccessApp/client/pvAccess.h rename to src/client/pvAccess.h diff --git a/pvAccessApp/factory/ChannelAccessFactory.cpp b/src/factory/ChannelAccessFactory.cpp similarity index 100% rename from pvAccessApp/factory/ChannelAccessFactory.cpp rename to src/factory/ChannelAccessFactory.cpp diff --git a/pvAccessApp/factory/CreateRequestFactory.cpp b/src/factory/CreateRequestFactory.cpp similarity index 100% rename from pvAccessApp/factory/CreateRequestFactory.cpp rename to src/factory/CreateRequestFactory.cpp diff --git a/src/factory/Makefile b/src/factory/Makefile new file mode 100644 index 0000000..dbd281e --- /dev/null +++ b/src/factory/Makefile @@ -0,0 +1,6 @@ +# This is a Makefile fragment, see ../Makefile + +SRC_DIRS += $(PVACCESS_SRC)/factory + +LIBSRCS += ChannelAccessFactory.cpp +LIBSRCS += CreateRequestFactory.cpp diff --git a/src/mb/Makefile b/src/mb/Makefile new file mode 100644 index 0000000..a9fce30 --- /dev/null +++ b/src/mb/Makefile @@ -0,0 +1,7 @@ +# This is a Makefile fragment, see ../Makefile + +SRC_DIRS += $(PVACCESS_SRC)/mb + +INC += pvAccessMB.h + +LIBSRCS += pvAccessMB.cpp diff --git a/pvAccessApp/mb/pvAccessMB.cpp b/src/mb/pvAccessMB.cpp similarity index 100% rename from pvAccessApp/mb/pvAccessMB.cpp rename to src/mb/pvAccessMB.cpp diff --git a/pvAccessApp/mb/pvAccessMB.h b/src/mb/pvAccessMB.h similarity index 100% rename from pvAccessApp/mb/pvAccessMB.h rename to src/mb/pvAccessMB.h diff --git a/src/pva/Makefile b/src/pva/Makefile new file mode 100644 index 0000000..ae58254 --- /dev/null +++ b/src/pva/Makefile @@ -0,0 +1,10 @@ +# This is a Makefile fragment, see ../Makefile + +SRC_DIRS += $(PVACCESS_SRC)/pva + +INC += pvaConstants.h +INC += pvaVersion.h +INC += clientFactory.h + +LIBSRCS += pvaVersion.cpp +LIBSRCS += clientFactory.cpp diff --git a/pvAccessApp/pva/clientFactory.cpp b/src/pva/clientFactory.cpp similarity index 100% rename from pvAccessApp/pva/clientFactory.cpp rename to src/pva/clientFactory.cpp diff --git a/pvAccessApp/pva/clientFactory.h b/src/pva/clientFactory.h similarity index 100% rename from pvAccessApp/pva/clientFactory.h rename to src/pva/clientFactory.h diff --git a/pvAccessApp/pva/pvaConstants.h b/src/pva/pvaConstants.h similarity index 100% rename from pvAccessApp/pva/pvaConstants.h rename to src/pva/pvaConstants.h diff --git a/pvAccessApp/pva/pvaVersion.cpp b/src/pva/pvaVersion.cpp similarity index 100% rename from pvAccessApp/pva/pvaVersion.cpp rename to src/pva/pvaVersion.cpp diff --git a/pvAccessApp/pva/pvaVersion.h b/src/pva/pvaVersion.h similarity index 100% rename from pvAccessApp/pva/pvaVersion.h rename to src/pva/pvaVersion.h diff --git a/src/remote/Makefile b/src/remote/Makefile new file mode 100644 index 0000000..a0479b6 --- /dev/null +++ b/src/remote/Makefile @@ -0,0 +1,24 @@ +# This is a Makefile fragment, see ../Makefile + +SRC_DIRS += $(PVACCESS_SRC)/remote + +INC += remote.h +INC += blockingUDP.h +INC += beaconHandler.h +INC += blockingTCP.h +INC += channelSearchManager.h +INC += simpleChannelSearchManagerImpl.h +INC += transportRegistry.h +INC += serializationHelper.h +INC += codec.h + +LIBSRCS += blockingUDPTransport.cpp +LIBSRCS += blockingUDPConnector.cpp +LIBSRCS += beaconHandler.cpp +LIBSRCS += blockingTCPConnector.cpp +LIBSRCS += simpleChannelSearchManagerImpl.cpp +LIBSRCS += abstractResponseHandler.cpp +LIBSRCS += blockingTCPAcceptor.cpp +LIBSRCS += transportRegistry.cpp +LIBSRCS += serializationHelper.cpp +LIBSRCS += codec.cpp diff --git a/pvAccessApp/remote/abstractResponseHandler.cpp b/src/remote/abstractResponseHandler.cpp similarity index 100% rename from pvAccessApp/remote/abstractResponseHandler.cpp rename to src/remote/abstractResponseHandler.cpp diff --git a/pvAccessApp/remote/beaconHandler.cpp b/src/remote/beaconHandler.cpp similarity index 100% rename from pvAccessApp/remote/beaconHandler.cpp rename to src/remote/beaconHandler.cpp diff --git a/pvAccessApp/remote/beaconHandler.h b/src/remote/beaconHandler.h similarity index 100% rename from pvAccessApp/remote/beaconHandler.h rename to src/remote/beaconHandler.h diff --git a/pvAccessApp/remote/blockingTCP.h b/src/remote/blockingTCP.h similarity index 100% rename from pvAccessApp/remote/blockingTCP.h rename to src/remote/blockingTCP.h diff --git a/pvAccessApp/remote/blockingTCPAcceptor.cpp b/src/remote/blockingTCPAcceptor.cpp similarity index 100% rename from pvAccessApp/remote/blockingTCPAcceptor.cpp rename to src/remote/blockingTCPAcceptor.cpp diff --git a/pvAccessApp/remote/blockingTCPConnector.cpp b/src/remote/blockingTCPConnector.cpp similarity index 100% rename from pvAccessApp/remote/blockingTCPConnector.cpp rename to src/remote/blockingTCPConnector.cpp diff --git a/pvAccessApp/remote/blockingUDP.h b/src/remote/blockingUDP.h similarity index 100% rename from pvAccessApp/remote/blockingUDP.h rename to src/remote/blockingUDP.h diff --git a/pvAccessApp/remote/blockingUDPConnector.cpp b/src/remote/blockingUDPConnector.cpp similarity index 100% rename from pvAccessApp/remote/blockingUDPConnector.cpp rename to src/remote/blockingUDPConnector.cpp diff --git a/pvAccessApp/remote/blockingUDPTransport.cpp b/src/remote/blockingUDPTransport.cpp similarity index 100% rename from pvAccessApp/remote/blockingUDPTransport.cpp rename to src/remote/blockingUDPTransport.cpp diff --git a/pvAccessApp/remote/channelSearchManager.h b/src/remote/channelSearchManager.h similarity index 100% rename from pvAccessApp/remote/channelSearchManager.h rename to src/remote/channelSearchManager.h diff --git a/pvAccessApp/remote/codec.cpp b/src/remote/codec.cpp similarity index 100% rename from pvAccessApp/remote/codec.cpp rename to src/remote/codec.cpp diff --git a/pvAccessApp/remote/codec.h b/src/remote/codec.h similarity index 100% rename from pvAccessApp/remote/codec.h rename to src/remote/codec.h diff --git a/pvAccessApp/remote/remote.h b/src/remote/remote.h similarity index 100% rename from pvAccessApp/remote/remote.h rename to src/remote/remote.h diff --git a/pvAccessApp/remote/serializationHelper.cpp b/src/remote/serializationHelper.cpp similarity index 100% rename from pvAccessApp/remote/serializationHelper.cpp rename to src/remote/serializationHelper.cpp diff --git a/pvAccessApp/remote/serializationHelper.h b/src/remote/serializationHelper.h similarity index 100% rename from pvAccessApp/remote/serializationHelper.h rename to src/remote/serializationHelper.h diff --git a/pvAccessApp/remote/simpleChannelSearchManagerImpl.cpp b/src/remote/simpleChannelSearchManagerImpl.cpp similarity index 100% rename from pvAccessApp/remote/simpleChannelSearchManagerImpl.cpp rename to src/remote/simpleChannelSearchManagerImpl.cpp diff --git a/pvAccessApp/remote/simpleChannelSearchManagerImpl.h b/src/remote/simpleChannelSearchManagerImpl.h similarity index 100% rename from pvAccessApp/remote/simpleChannelSearchManagerImpl.h rename to src/remote/simpleChannelSearchManagerImpl.h diff --git a/pvAccessApp/remote/transportRegistry.cpp b/src/remote/transportRegistry.cpp similarity index 100% rename from pvAccessApp/remote/transportRegistry.cpp rename to src/remote/transportRegistry.cpp diff --git a/pvAccessApp/remote/transportRegistry.h b/src/remote/transportRegistry.h similarity index 100% rename from pvAccessApp/remote/transportRegistry.h rename to src/remote/transportRegistry.h diff --git a/src/remoteClient/Makefile b/src/remoteClient/Makefile new file mode 100644 index 0000000..2d0f390 --- /dev/null +++ b/src/remoteClient/Makefile @@ -0,0 +1,7 @@ +# This is a Makefile fragment, see ../Makefile + +SRC_DIRS += $(PVACCESS_SRC)/remoteClient + +INC += clientContextImpl.h + +LIBSRCS += clientContextImpl.cpp diff --git a/pvAccessApp/remoteClient/clientContextImpl.cpp b/src/remoteClient/clientContextImpl.cpp similarity index 100% rename from pvAccessApp/remoteClient/clientContextImpl.cpp rename to src/remoteClient/clientContextImpl.cpp diff --git a/pvAccessApp/remoteClient/clientContextImpl.h b/src/remoteClient/clientContextImpl.h similarity index 100% rename from pvAccessApp/remoteClient/clientContextImpl.h rename to src/remoteClient/clientContextImpl.h diff --git a/src/rpcClient/Makefile b/src/rpcClient/Makefile new file mode 100644 index 0000000..e41747e --- /dev/null +++ b/src/rpcClient/Makefile @@ -0,0 +1,7 @@ +# This is a Makefile fragment, see ../Makefile + +SRC_DIRS += $(PVACCESS_SRC)/rpcClient + +INC += rpcClient.h + +LIBSRCS += rpcClient.cpp diff --git a/pvAccessApp/rpcClient/rpcClient.cpp b/src/rpcClient/rpcClient.cpp similarity index 100% rename from pvAccessApp/rpcClient/rpcClient.cpp rename to src/rpcClient/rpcClient.cpp diff --git a/pvAccessApp/rpcClient/rpcClient.h b/src/rpcClient/rpcClient.h similarity index 100% rename from pvAccessApp/rpcClient/rpcClient.h rename to src/rpcClient/rpcClient.h diff --git a/src/rpcService/Makefile b/src/rpcService/Makefile new file mode 100644 index 0000000..8a236f7 --- /dev/null +++ b/src/rpcService/Makefile @@ -0,0 +1,9 @@ +# This is a Makefile fragment, see ../Makefile + +SRC_DIRS += $(PVACCESS_SRC)/rpcService + +INC += rpcService.h +INC += rpcServer.h + +LIBSRCS += rpcService.cpp +LIBSRCS += rpcServer.cpp diff --git a/pvAccessApp/rpcService/rpcServer.cpp b/src/rpcService/rpcServer.cpp similarity index 100% rename from pvAccessApp/rpcService/rpcServer.cpp rename to src/rpcService/rpcServer.cpp diff --git a/pvAccessApp/rpcService/rpcServer.h b/src/rpcService/rpcServer.h similarity index 100% rename from pvAccessApp/rpcService/rpcServer.h rename to src/rpcService/rpcServer.h diff --git a/pvAccessApp/rpcService/rpcService.cpp b/src/rpcService/rpcService.cpp similarity index 100% rename from pvAccessApp/rpcService/rpcService.cpp rename to src/rpcService/rpcService.cpp diff --git a/pvAccessApp/rpcService/rpcService.h b/src/rpcService/rpcService.h similarity index 100% rename from pvAccessApp/rpcService/rpcService.h rename to src/rpcService/rpcService.h diff --git a/src/server/Makefile b/src/server/Makefile new file mode 100644 index 0000000..f8fcdcb --- /dev/null +++ b/src/server/Makefile @@ -0,0 +1,17 @@ +# This is a Makefile fragment, see ../Makefile + +SRC_DIRS += $(PVACCESS_SRC)/server + +INC += serverContext.h +INC += responseHandlers.h +INC += serverChannelImpl.h +INC += baseChannelRequester.h +INC += beaconEmitter.h +INC += beaconServerStatusProvider.h + +LIBSRCS += responseHandlers.cpp +LIBSRCS += serverContext.cpp +LIBSRCS += serverChannelImpl.cpp +LIBSRCS += baseChannelRequester.cpp +LIBSRCS += beaconEmitter.cpp +LIBSRCS += beaconServerStatusProvider.cpp diff --git a/pvAccessApp/server/baseChannelRequester.cpp b/src/server/baseChannelRequester.cpp similarity index 100% rename from pvAccessApp/server/baseChannelRequester.cpp rename to src/server/baseChannelRequester.cpp diff --git a/pvAccessApp/server/baseChannelRequester.h b/src/server/baseChannelRequester.h similarity index 100% rename from pvAccessApp/server/baseChannelRequester.h rename to src/server/baseChannelRequester.h diff --git a/pvAccessApp/server/beaconEmitter.cpp b/src/server/beaconEmitter.cpp similarity index 100% rename from pvAccessApp/server/beaconEmitter.cpp rename to src/server/beaconEmitter.cpp diff --git a/pvAccessApp/server/beaconEmitter.h b/src/server/beaconEmitter.h similarity index 100% rename from pvAccessApp/server/beaconEmitter.h rename to src/server/beaconEmitter.h diff --git a/pvAccessApp/server/beaconServerStatusProvider.cpp b/src/server/beaconServerStatusProvider.cpp similarity index 100% rename from pvAccessApp/server/beaconServerStatusProvider.cpp rename to src/server/beaconServerStatusProvider.cpp diff --git a/pvAccessApp/server/beaconServerStatusProvider.h b/src/server/beaconServerStatusProvider.h similarity index 100% rename from pvAccessApp/server/beaconServerStatusProvider.h rename to src/server/beaconServerStatusProvider.h diff --git a/pvAccessApp/server/responseHandlers.cpp b/src/server/responseHandlers.cpp similarity index 100% rename from pvAccessApp/server/responseHandlers.cpp rename to src/server/responseHandlers.cpp diff --git a/pvAccessApp/server/responseHandlers.h b/src/server/responseHandlers.h similarity index 100% rename from pvAccessApp/server/responseHandlers.h rename to src/server/responseHandlers.h diff --git a/pvAccessApp/server/serverChannelImpl.cpp b/src/server/serverChannelImpl.cpp similarity index 100% rename from pvAccessApp/server/serverChannelImpl.cpp rename to src/server/serverChannelImpl.cpp diff --git a/pvAccessApp/server/serverChannelImpl.h b/src/server/serverChannelImpl.h similarity index 100% rename from pvAccessApp/server/serverChannelImpl.h rename to src/server/serverChannelImpl.h diff --git a/pvAccessApp/server/serverContext.cpp b/src/server/serverContext.cpp similarity index 100% rename from pvAccessApp/server/serverContext.cpp rename to src/server/serverContext.cpp diff --git a/pvAccessApp/server/serverContext.h b/src/server/serverContext.h similarity index 100% rename from pvAccessApp/server/serverContext.h rename to src/server/serverContext.h diff --git a/src/utils/Makefile b/src/utils/Makefile new file mode 100644 index 0000000..a5d0ac9 --- /dev/null +++ b/src/utils/Makefile @@ -0,0 +1,19 @@ +# This is a Makefile fragment, see ../Makefile + +SRC_DIRS += $(PVACCESS_SRC)/utils + +INC += hexDump.h +INC += inetAddressUtil.h +INC += logger.h +INC += introspectionRegistry.h +INC += namedLockPattern.h +INC += referenceCountingLock.h +INC += configuration.h +INC += likely.h + +LIBSRCS += hexDump.cpp +LIBSRCS += inetAddressUtil.cpp +LIBSRCS += logger.cpp +LIBSRCS += introspectionRegistry.cpp +LIBSRCS += configuration.cpp +LIBSRCS += referenceCountingLock.cpp diff --git a/pvAccessApp/utils/configuration.cpp b/src/utils/configuration.cpp similarity index 100% rename from pvAccessApp/utils/configuration.cpp rename to src/utils/configuration.cpp diff --git a/pvAccessApp/utils/configuration.h b/src/utils/configuration.h similarity index 100% rename from pvAccessApp/utils/configuration.h rename to src/utils/configuration.h diff --git a/pvAccessApp/utils/hexDump.cpp b/src/utils/hexDump.cpp similarity index 100% rename from pvAccessApp/utils/hexDump.cpp rename to src/utils/hexDump.cpp diff --git a/pvAccessApp/utils/hexDump.h b/src/utils/hexDump.h similarity index 100% rename from pvAccessApp/utils/hexDump.h rename to src/utils/hexDump.h diff --git a/pvAccessApp/utils/inetAddressUtil.cpp b/src/utils/inetAddressUtil.cpp similarity index 100% rename from pvAccessApp/utils/inetAddressUtil.cpp rename to src/utils/inetAddressUtil.cpp diff --git a/pvAccessApp/utils/inetAddressUtil.h b/src/utils/inetAddressUtil.h similarity index 100% rename from pvAccessApp/utils/inetAddressUtil.h rename to src/utils/inetAddressUtil.h diff --git a/pvAccessApp/utils/introspectionRegistry.cpp b/src/utils/introspectionRegistry.cpp similarity index 100% rename from pvAccessApp/utils/introspectionRegistry.cpp rename to src/utils/introspectionRegistry.cpp diff --git a/pvAccessApp/utils/introspectionRegistry.h b/src/utils/introspectionRegistry.h similarity index 100% rename from pvAccessApp/utils/introspectionRegistry.h rename to src/utils/introspectionRegistry.h diff --git a/pvAccessApp/utils/likely.h b/src/utils/likely.h similarity index 100% rename from pvAccessApp/utils/likely.h rename to src/utils/likely.h diff --git a/pvAccessApp/utils/logger.cpp b/src/utils/logger.cpp similarity index 100% rename from pvAccessApp/utils/logger.cpp rename to src/utils/logger.cpp diff --git a/pvAccessApp/utils/logger.h b/src/utils/logger.h similarity index 100% rename from pvAccessApp/utils/logger.h rename to src/utils/logger.h diff --git a/pvAccessApp/utils/namedLockPattern.h b/src/utils/namedLockPattern.h similarity index 100% rename from pvAccessApp/utils/namedLockPattern.h rename to src/utils/namedLockPattern.h diff --git a/pvAccessApp/utils/referenceCountingLock.cpp b/src/utils/referenceCountingLock.cpp similarity index 100% rename from pvAccessApp/utils/referenceCountingLock.cpp rename to src/utils/referenceCountingLock.cpp diff --git a/pvAccessApp/utils/referenceCountingLock.h b/src/utils/referenceCountingLock.h similarity index 100% rename from pvAccessApp/utils/referenceCountingLock.h rename to src/utils/referenceCountingLock.h diff --git a/src/v3ioc/Makefile b/src/v3ioc/Makefile new file mode 100644 index 0000000..5b0b3ca --- /dev/null +++ b/src/v3ioc/Makefile @@ -0,0 +1,11 @@ +# This is a Makefile fragment, see ../Makefile + +SRC_DIRS += $(PVACCESS_SRC)/v3ioc + +INC += syncChannelFind.h + +DBD += PVAServerRegister.dbd +DBD += PVAClientRegister.dbd + +LIBSRCS += PVAServerRegister.cpp +LIBSRCS += PVAClientRegister.cpp diff --git a/pvAccessApp/v3ioc/PVAClientRegister.cpp b/src/v3ioc/PVAClientRegister.cpp similarity index 100% rename from pvAccessApp/v3ioc/PVAClientRegister.cpp rename to src/v3ioc/PVAClientRegister.cpp diff --git a/pvAccessApp/v3ioc/PVAClientRegister.dbd b/src/v3ioc/PVAClientRegister.dbd similarity index 100% rename from pvAccessApp/v3ioc/PVAClientRegister.dbd rename to src/v3ioc/PVAClientRegister.dbd diff --git a/pvAccessApp/v3ioc/PVAServerRegister.cpp b/src/v3ioc/PVAServerRegister.cpp similarity index 100% rename from pvAccessApp/v3ioc/PVAServerRegister.cpp rename to src/v3ioc/PVAServerRegister.cpp diff --git a/pvAccessApp/v3ioc/PVAServerRegister.dbd b/src/v3ioc/PVAServerRegister.dbd similarity index 100% rename from pvAccessApp/v3ioc/PVAServerRegister.dbd rename to src/v3ioc/PVAServerRegister.dbd diff --git a/pvAccessApp/v3ioc/syncChannelFind.h b/src/v3ioc/syncChannelFind.h similarity index 100% rename from pvAccessApp/v3ioc/syncChannelFind.h rename to src/v3ioc/syncChannelFind.h diff --git a/testApp/remote/Makefile b/testApp/remote/Makefile index b067758..6a6b3a9 100644 --- a/testApp/remote/Makefile +++ b/testApp/remote/Makefile @@ -56,27 +56,10 @@ testCodec_SRCS = testCodec testCodec_LIBS += pvAccess pvData pvMB Com TESTS += testCodec - -PROD_HOST += pvget -pvget_SRCS += pvget.cpp -pvget_LIBS += pvAccess pvData pvMB Com - -PROD_HOST += pvput -pvput_SRCS += pvput.cpp -pvput_LIBS += pvAccess pvData pvMB Com - -PROD_HOST += pvinfo -pvinfo_SRCS += pvinfo.cpp -pvinfo_LIBS += pvAccess pvData pvMB Com - PROD_HOST += testGetPerformance testGetPerformance_SRCS += testGetPerformance.cpp testGetPerformance_LIBS += pvAccess pvData pvMB Com -PROD_HOST += eget -eget_SRCS += eget.cpp -eget_LIBS += pvAccess pvData pvMB ca Com - PROD_HOST += rpcServiceExample rpcServiceExample_SRCS += rpcServiceExample.cpp rpcServiceExample_LIBS += pvAccess pvData pvMB Com