From 1da6546894291941db0d221eac6af701739edf0f Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Thu, 27 Mar 2014 18:03:02 -0500 Subject: [PATCH 01/14] flow: Created branch 'feature/housekeeping'. From 2ae2ec623dc8a48546fcaeb9a2fd073e0000ca72 Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Thu, 27 Mar 2014 18:06:49 -0500 Subject: [PATCH 02/14] Tidy up top-level Makefile --- Makefile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 10141ff..ba1c937 100644 --- a/Makefile +++ b/Makefile @@ -1,12 +1,14 @@ -#Makefile at top of application tree +# Makefile for the EPICS V4 pvAccess module + TOP = . include $(TOP)/configure/CONFIG -DIRS += configure + +DIRS := configure + DIRS += pvAccessApp pvAccessApp_DEPEND_DIRS = configure + DIRS += testApp testApp_DEPEND_DIRS = pvAccessApp include $(TOP)/configure/RULES_TOP - - From ce2ad6e2ab90e485de14ea50756ed3696ee8f4ca Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Thu, 27 Mar 2014 18:08:02 -0500 Subject: [PATCH 03/14] Fix link library order for testCodec --- testApp/remote/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testApp/remote/Makefile b/testApp/remote/Makefile index e448fa3..3dc2a39 100644 --- a/testApp/remote/Makefile +++ b/testApp/remote/Makefile @@ -53,8 +53,8 @@ TESTS += testChannelAccess TESTPROD_HOST += testCodec testCodec_SRCS = testCodec -testCodec_LIBS += pvData pvAccess pvMB Com -TESTS += testCodec +testCodec_LIBS += pvAccess pvData pvMB Com +TESTS += testCodec PROD_HOST += pvget From 1781e051b099e483fbac316cbd502f1ed6f0de75 Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Thu, 27 Mar 2014 18:12:23 -0500 Subject: [PATCH 04/14] Split pvAccessApp/Makefile into fragments. --- pvAccessApp/Makefile | 120 +++++------------------------- pvAccessApp/ca/Makefile | 9 +++ pvAccessApp/client/Makefile | 7 ++ pvAccessApp/factory/Makefile | 6 ++ pvAccessApp/mb/Makefile | 7 ++ pvAccessApp/pva/Makefile | 10 +++ pvAccessApp/remote/Makefile | 24 ++++++ pvAccessApp/remoteClient/Makefile | 7 ++ pvAccessApp/rpcClient/Makefile | 7 ++ pvAccessApp/rpcService/Makefile | 9 +++ pvAccessApp/server/Makefile | 17 +++++ pvAccessApp/utils/Makefile | 19 +++++ pvAccessApp/v3ioc/Makefile | 11 +++ 13 files changed, 152 insertions(+), 101 deletions(-) create mode 100644 pvAccessApp/ca/Makefile create mode 100644 pvAccessApp/client/Makefile create mode 100644 pvAccessApp/factory/Makefile create mode 100644 pvAccessApp/mb/Makefile create mode 100644 pvAccessApp/pva/Makefile create mode 100644 pvAccessApp/remote/Makefile create mode 100644 pvAccessApp/remoteClient/Makefile create mode 100644 pvAccessApp/rpcClient/Makefile create mode 100644 pvAccessApp/rpcService/Makefile create mode 100644 pvAccessApp/server/Makefile create mode 100644 pvAccessApp/utils/Makefile create mode 100644 pvAccessApp/v3ioc/Makefile diff --git a/pvAccessApp/Makefile b/pvAccessApp/Makefile index 405c85a..567aa5f 100644 --- a/pvAccessApp/Makefile +++ b/pvAccessApp/Makefile @@ -1,112 +1,30 @@ TOP = .. include $(TOP)/configure/CONFIG -PVACCESS = $(TOP)/pvAccessApp -USR_CXXFLAGS_RTEMS = -D__rtems__ +PVACCESSAPP = $(TOP)/pvAccessApp -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 +include $(PVACCESSAPP)/pva/Makefile +include $(PVACCESSAPP)/utils/Makefile +include $(PVACCESSAPP)/client/Makefile +include $(PVACCESSAPP)/factory/Makefile +include $(PVACCESSAPP)/remote/Makefile +include $(PVACCESSAPP)/remoteClient/Makefile +include $(PVACCESSAPP)/server/Makefile +include $(PVACCESSAPP)/rpcService/Makefile +include $(PVACCESSAPP)/rpcClient/Makefile +include $(PVACCESSAPP)/ca/Makefile +include $(PVACCESSAPP)/mb/Makefile +include $(PVACCESSAPP)/v3ioc/Makefile LIBRARY = pvAccess -pvAccess_LIBS += Com + pvAccess_LIBS += pvData pvAccess_LIBS += ca -# needed for 64-bit Windows +pvAccess_LIBS += Com + +# needed for Windows pvAccess_SYS_LIBS_WIN32 += ws2_32 +USR_CXXFLAGS_RTEMS = -D__rtems__ + include $(TOP)/configure/RULES diff --git a/pvAccessApp/ca/Makefile b/pvAccessApp/ca/Makefile new file mode 100644 index 0000000..f76a954 --- /dev/null +++ b/pvAccessApp/ca/Makefile @@ -0,0 +1,9 @@ +# This is a Makefile fragment, see ../Makefile + +SRC_DIRS += $(PVACCESSAPP)/ca + +INC += caProvider.h +INC += caChannel.h + +LIBSRCS += caProvider.cpp +LIBSRCS += caChannel.cpp diff --git a/pvAccessApp/client/Makefile b/pvAccessApp/client/Makefile new file mode 100644 index 0000000..0e5c11c --- /dev/null +++ b/pvAccessApp/client/Makefile @@ -0,0 +1,7 @@ +# This is a Makefile fragment, see ../Makefile + +SRC_DIRS += $(PVACCESSAPP)/client + +INC += pvAccess.h + +LIBSRCS += pvAccess.cpp diff --git a/pvAccessApp/factory/Makefile b/pvAccessApp/factory/Makefile new file mode 100644 index 0000000..dc14111 --- /dev/null +++ b/pvAccessApp/factory/Makefile @@ -0,0 +1,6 @@ +# This is a Makefile fragment, see ../Makefile + +SRC_DIRS += $(PVACCESSAPP)/factory + +LIBSRCS += ChannelAccessFactory.cpp +LIBSRCS += CreateRequestFactory.cpp diff --git a/pvAccessApp/mb/Makefile b/pvAccessApp/mb/Makefile new file mode 100644 index 0000000..aba05f4 --- /dev/null +++ b/pvAccessApp/mb/Makefile @@ -0,0 +1,7 @@ +# This is a Makefile fragment, see ../Makefile + +SRC_DIRS += $(PVACCESSAPP)/mb + +INC += pvAccessMB.h + +LIBSRCS += pvAccessMB.cpp diff --git a/pvAccessApp/pva/Makefile b/pvAccessApp/pva/Makefile new file mode 100644 index 0000000..83221b9 --- /dev/null +++ b/pvAccessApp/pva/Makefile @@ -0,0 +1,10 @@ +# This is a Makefile fragment, see ../Makefile + +SRC_DIRS += $(PVACCESSAPP)/pva + +INC += pvaConstants.h +INC += pvaVersion.h +INC += clientFactory.h + +LIBSRCS += pvaVersion.cpp +LIBSRCS += clientFactory.cpp diff --git a/pvAccessApp/remote/Makefile b/pvAccessApp/remote/Makefile new file mode 100644 index 0000000..88704f2 --- /dev/null +++ b/pvAccessApp/remote/Makefile @@ -0,0 +1,24 @@ +# This is a Makefile fragment, see ../Makefile + +SRC_DIRS += $(PVACCESSAPP)/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/remoteClient/Makefile b/pvAccessApp/remoteClient/Makefile new file mode 100644 index 0000000..2302b3e --- /dev/null +++ b/pvAccessApp/remoteClient/Makefile @@ -0,0 +1,7 @@ +# This is a Makefile fragment, see ../Makefile + +SRC_DIRS += $(PVACCESSAPP)/remoteClient + +INC += clientContextImpl.h + +LIBSRCS += clientContextImpl.cpp diff --git a/pvAccessApp/rpcClient/Makefile b/pvAccessApp/rpcClient/Makefile new file mode 100644 index 0000000..f32270a --- /dev/null +++ b/pvAccessApp/rpcClient/Makefile @@ -0,0 +1,7 @@ +# This is a Makefile fragment, see ../Makefile + +SRC_DIRS += $(PVACCESSAPP)/rpcClient + +INC += rpcClient.h + +LIBSRCS += rpcClient.cpp diff --git a/pvAccessApp/rpcService/Makefile b/pvAccessApp/rpcService/Makefile new file mode 100644 index 0000000..50b0107 --- /dev/null +++ b/pvAccessApp/rpcService/Makefile @@ -0,0 +1,9 @@ +# This is a Makefile fragment, see ../Makefile + +SRC_DIRS += $(PVACCESSAPP)/rpcService + +INC += rpcService.h +INC += rpcServer.h + +LIBSRCS += rpcService.cpp +LIBSRCS += rpcServer.cpp diff --git a/pvAccessApp/server/Makefile b/pvAccessApp/server/Makefile new file mode 100644 index 0000000..6820075 --- /dev/null +++ b/pvAccessApp/server/Makefile @@ -0,0 +1,17 @@ +# This is a Makefile fragment, see ../Makefile + +SRC_DIRS += $(PVACCESSAPP)/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/utils/Makefile b/pvAccessApp/utils/Makefile new file mode 100644 index 0000000..d02c970 --- /dev/null +++ b/pvAccessApp/utils/Makefile @@ -0,0 +1,19 @@ +# This is a Makefile fragment, see ../Makefile + +SRC_DIRS += $(PVACCESSAPP)/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/v3ioc/Makefile b/pvAccessApp/v3ioc/Makefile new file mode 100644 index 0000000..d0cec93 --- /dev/null +++ b/pvAccessApp/v3ioc/Makefile @@ -0,0 +1,11 @@ +# This is a Makefile fragment, see ../Makefile + +SRC_DIRS += $(PVACCESSAPP)/v3ioc + +INC += syncChannelFind.h + +DBD += PVAServerRegister.dbd +DBD += PVAClientRegister.dbd + +LIBSRCS += PVAServerRegister.cpp +LIBSRCS += PVAClientRegister.cpp From c6a99a64cdfd6999e154432eb0a01d9abe10de30 Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Fri, 28 Mar 2014 11:20:18 -0500 Subject: [PATCH 05/14] Remove __rtems__, already defined by the compiler --- pvAccessApp/Makefile | 2 -- 1 file changed, 2 deletions(-) diff --git a/pvAccessApp/Makefile b/pvAccessApp/Makefile index 567aa5f..8a29045 100644 --- a/pvAccessApp/Makefile +++ b/pvAccessApp/Makefile @@ -25,6 +25,4 @@ pvAccess_LIBS += Com # needed for Windows pvAccess_SYS_LIBS_WIN32 += ws2_32 -USR_CXXFLAGS_RTEMS = -D__rtems__ - include $(TOP)/configure/RULES From a8869842588ee8a9cf196aba8cfcb9ab9e4085dd Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Fri, 28 Mar 2014 11:53:02 -0500 Subject: [PATCH 06/14] Rename pvAccessApp to src, adjust Makefiles --- Makefile | 6 ++-- pvAccessApp/Makefile | 28 ------------------- src/Makefile | 28 +++++++++++++++++++ {pvAccessApp => src}/ca/Makefile | 2 +- {pvAccessApp => src}/ca/caChannel.cpp | 0 {pvAccessApp => src}/ca/caChannel.h | 0 {pvAccessApp => src}/ca/caProvider.cpp | 0 {pvAccessApp => src}/ca/caProvider.h | 0 {pvAccessApp => src}/client/Makefile | 2 +- {pvAccessApp => src}/client/pvAccess.cpp | 0 {pvAccessApp => src}/client/pvAccess.h | 0 .../factory/ChannelAccessFactory.cpp | 0 .../factory/CreateRequestFactory.cpp | 0 {pvAccessApp => src}/factory/Makefile | 2 +- {pvAccessApp => src}/mb/Makefile | 2 +- {pvAccessApp => src}/mb/pvAccessMB.cpp | 0 {pvAccessApp => src}/mb/pvAccessMB.h | 0 {pvAccessApp => src}/pva/Makefile | 2 +- {pvAccessApp => src}/pva/clientFactory.cpp | 0 {pvAccessApp => src}/pva/clientFactory.h | 0 {pvAccessApp => src}/pva/pvaConstants.h | 0 {pvAccessApp => src}/pva/pvaVersion.cpp | 0 {pvAccessApp => src}/pva/pvaVersion.h | 0 {pvAccessApp => src}/remote/Makefile | 2 +- .../remote/abstractResponseHandler.cpp | 0 {pvAccessApp => src}/remote/beaconHandler.cpp | 0 {pvAccessApp => src}/remote/beaconHandler.h | 0 {pvAccessApp => src}/remote/blockingTCP.h | 0 .../remote/blockingTCPAcceptor.cpp | 0 .../remote/blockingTCPConnector.cpp | 0 {pvAccessApp => src}/remote/blockingUDP.h | 0 .../remote/blockingUDPConnector.cpp | 0 .../remote/blockingUDPTransport.cpp | 0 .../remote/channelSearchManager.h | 0 {pvAccessApp => src}/remote/codec.cpp | 0 {pvAccessApp => src}/remote/codec.h | 0 {pvAccessApp => src}/remote/remote.h | 0 .../remote/serializationHelper.cpp | 0 .../remote/serializationHelper.h | 0 .../remote/simpleChannelSearchManagerImpl.cpp | 0 .../remote/simpleChannelSearchManagerImpl.h | 0 .../remote/transportRegistry.cpp | 0 .../remote/transportRegistry.h | 0 {pvAccessApp => src}/remoteClient/Makefile | 2 +- .../remoteClient/clientContextImpl.cpp | 0 .../remoteClient/clientContextImpl.h | 0 {pvAccessApp => src}/rpcClient/Makefile | 2 +- {pvAccessApp => src}/rpcClient/rpcClient.cpp | 0 {pvAccessApp => src}/rpcClient/rpcClient.h | 0 {pvAccessApp => src}/rpcService/Makefile | 2 +- {pvAccessApp => src}/rpcService/rpcServer.cpp | 0 {pvAccessApp => src}/rpcService/rpcServer.h | 0 .../rpcService/rpcService.cpp | 0 {pvAccessApp => src}/rpcService/rpcService.h | 0 {pvAccessApp => src}/server/Makefile | 2 +- .../server/baseChannelRequester.cpp | 0 .../server/baseChannelRequester.h | 0 {pvAccessApp => src}/server/beaconEmitter.cpp | 0 {pvAccessApp => src}/server/beaconEmitter.h | 0 .../server/beaconServerStatusProvider.cpp | 0 .../server/beaconServerStatusProvider.h | 0 .../server/responseHandlers.cpp | 0 .../server/responseHandlers.h | 0 .../server/serverChannelImpl.cpp | 0 .../server/serverChannelImpl.h | 0 {pvAccessApp => src}/server/serverContext.cpp | 0 {pvAccessApp => src}/server/serverContext.h | 0 {pvAccessApp => src}/utils/Makefile | 2 +- {pvAccessApp => src}/utils/configuration.cpp | 0 {pvAccessApp => src}/utils/configuration.h | 0 {pvAccessApp => src}/utils/hexDump.cpp | 0 {pvAccessApp => src}/utils/hexDump.h | 0 .../utils/inetAddressUtil.cpp | 0 {pvAccessApp => src}/utils/inetAddressUtil.h | 0 .../utils/introspectionRegistry.cpp | 0 .../utils/introspectionRegistry.h | 0 {pvAccessApp => src}/utils/likely.h | 0 {pvAccessApp => src}/utils/logger.cpp | 0 {pvAccessApp => src}/utils/logger.h | 0 {pvAccessApp => src}/utils/namedLockPattern.h | 0 .../utils/referenceCountingLock.cpp | 0 .../utils/referenceCountingLock.h | 0 {pvAccessApp => src}/v3ioc/Makefile | 2 +- .../v3ioc/PVAClientRegister.cpp | 0 .../v3ioc/PVAClientRegister.dbd | 0 .../v3ioc/PVAServerRegister.cpp | 0 .../v3ioc/PVAServerRegister.dbd | 0 {pvAccessApp => src}/v3ioc/syncChannelFind.h | 0 88 files changed, 43 insertions(+), 43 deletions(-) delete mode 100644 pvAccessApp/Makefile create mode 100644 src/Makefile rename {pvAccessApp => src}/ca/Makefile (81%) rename {pvAccessApp => src}/ca/caChannel.cpp (100%) rename {pvAccessApp => src}/ca/caChannel.h (100%) rename {pvAccessApp => src}/ca/caProvider.cpp (100%) rename {pvAccessApp => src}/ca/caProvider.h (100%) rename {pvAccessApp => src}/client/Makefile (72%) rename {pvAccessApp => src}/client/pvAccess.cpp (100%) rename {pvAccessApp => src}/client/pvAccess.h (100%) rename {pvAccessApp => src}/factory/ChannelAccessFactory.cpp (100%) rename {pvAccessApp => src}/factory/CreateRequestFactory.cpp (100%) rename {pvAccessApp => src}/factory/Makefile (77%) rename {pvAccessApp => src}/mb/Makefile (75%) rename {pvAccessApp => src}/mb/pvAccessMB.cpp (100%) rename {pvAccessApp => src}/mb/pvAccessMB.h (100%) rename {pvAccessApp => src}/pva/Makefile (84%) rename {pvAccessApp => src}/pva/clientFactory.cpp (100%) rename {pvAccessApp => src}/pva/clientFactory.h (100%) rename {pvAccessApp => src}/pva/pvaConstants.h (100%) rename {pvAccessApp => src}/pva/pvaVersion.cpp (100%) rename {pvAccessApp => src}/pva/pvaVersion.h (100%) rename {pvAccessApp => src}/remote/Makefile (94%) rename {pvAccessApp => src}/remote/abstractResponseHandler.cpp (100%) rename {pvAccessApp => src}/remote/beaconHandler.cpp (100%) rename {pvAccessApp => src}/remote/beaconHandler.h (100%) rename {pvAccessApp => src}/remote/blockingTCP.h (100%) rename {pvAccessApp => src}/remote/blockingTCPAcceptor.cpp (100%) rename {pvAccessApp => src}/remote/blockingTCPConnector.cpp (100%) rename {pvAccessApp => src}/remote/blockingUDP.h (100%) rename {pvAccessApp => src}/remote/blockingUDPConnector.cpp (100%) rename {pvAccessApp => src}/remote/blockingUDPTransport.cpp (100%) rename {pvAccessApp => src}/remote/channelSearchManager.h (100%) rename {pvAccessApp => src}/remote/codec.cpp (100%) rename {pvAccessApp => src}/remote/codec.h (100%) rename {pvAccessApp => src}/remote/remote.h (100%) rename {pvAccessApp => src}/remote/serializationHelper.cpp (100%) rename {pvAccessApp => src}/remote/serializationHelper.h (100%) rename {pvAccessApp => src}/remote/simpleChannelSearchManagerImpl.cpp (100%) rename {pvAccessApp => src}/remote/simpleChannelSearchManagerImpl.h (100%) rename {pvAccessApp => src}/remote/transportRegistry.cpp (100%) rename {pvAccessApp => src}/remote/transportRegistry.h (100%) rename {pvAccessApp => src}/remoteClient/Makefile (72%) rename {pvAccessApp => src}/remoteClient/clientContextImpl.cpp (100%) rename {pvAccessApp => src}/remoteClient/clientContextImpl.h (100%) rename {pvAccessApp => src}/rpcClient/Makefile (71%) rename {pvAccessApp => src}/rpcClient/rpcClient.cpp (100%) rename {pvAccessApp => src}/rpcClient/rpcClient.h (100%) rename {pvAccessApp => src}/rpcService/Makefile (78%) rename {pvAccessApp => src}/rpcService/rpcServer.cpp (100%) rename {pvAccessApp => src}/rpcService/rpcServer.h (100%) rename {pvAccessApp => src}/rpcService/rpcService.cpp (100%) rename {pvAccessApp => src}/rpcService/rpcService.h (100%) rename {pvAccessApp => src}/server/Makefile (92%) rename {pvAccessApp => src}/server/baseChannelRequester.cpp (100%) rename {pvAccessApp => src}/server/baseChannelRequester.h (100%) rename {pvAccessApp => src}/server/beaconEmitter.cpp (100%) rename {pvAccessApp => src}/server/beaconEmitter.h (100%) rename {pvAccessApp => src}/server/beaconServerStatusProvider.cpp (100%) rename {pvAccessApp => src}/server/beaconServerStatusProvider.h (100%) rename {pvAccessApp => src}/server/responseHandlers.cpp (100%) rename {pvAccessApp => src}/server/responseHandlers.h (100%) rename {pvAccessApp => src}/server/serverChannelImpl.cpp (100%) rename {pvAccessApp => src}/server/serverChannelImpl.h (100%) rename {pvAccessApp => src}/server/serverContext.cpp (100%) rename {pvAccessApp => src}/server/serverContext.h (100%) rename {pvAccessApp => src}/utils/Makefile (92%) rename {pvAccessApp => src}/utils/configuration.cpp (100%) rename {pvAccessApp => src}/utils/configuration.h (100%) rename {pvAccessApp => src}/utils/hexDump.cpp (100%) rename {pvAccessApp => src}/utils/hexDump.h (100%) rename {pvAccessApp => src}/utils/inetAddressUtil.cpp (100%) rename {pvAccessApp => src}/utils/inetAddressUtil.h (100%) rename {pvAccessApp => src}/utils/introspectionRegistry.cpp (100%) rename {pvAccessApp => src}/utils/introspectionRegistry.h (100%) rename {pvAccessApp => src}/utils/likely.h (100%) rename {pvAccessApp => src}/utils/logger.cpp (100%) rename {pvAccessApp => src}/utils/logger.h (100%) rename {pvAccessApp => src}/utils/namedLockPattern.h (100%) rename {pvAccessApp => src}/utils/referenceCountingLock.cpp (100%) rename {pvAccessApp => src}/utils/referenceCountingLock.h (100%) rename {pvAccessApp => src}/v3ioc/Makefile (85%) rename {pvAccessApp => src}/v3ioc/PVAClientRegister.cpp (100%) rename {pvAccessApp => src}/v3ioc/PVAClientRegister.dbd (100%) rename {pvAccessApp => src}/v3ioc/PVAServerRegister.cpp (100%) rename {pvAccessApp => src}/v3ioc/PVAServerRegister.dbd (100%) rename {pvAccessApp => src}/v3ioc/syncChannelFind.h (100%) diff --git a/Makefile b/Makefile index ba1c937..aa35811 100644 --- a/Makefile +++ b/Makefile @@ -5,10 +5,10 @@ include $(TOP)/configure/CONFIG DIRS := configure -DIRS += pvAccessApp -pvAccessApp_DEPEND_DIRS = configure +DIRS += src +src_DEPEND_DIRS = configure DIRS += testApp -testApp_DEPEND_DIRS = pvAccessApp +testApp_DEPEND_DIRS = src include $(TOP)/configure/RULES_TOP diff --git a/pvAccessApp/Makefile b/pvAccessApp/Makefile deleted file mode 100644 index 8a29045..0000000 --- a/pvAccessApp/Makefile +++ /dev/null @@ -1,28 +0,0 @@ -TOP = .. -include $(TOP)/configure/CONFIG - -PVACCESSAPP = $(TOP)/pvAccessApp - -include $(PVACCESSAPP)/pva/Makefile -include $(PVACCESSAPP)/utils/Makefile -include $(PVACCESSAPP)/client/Makefile -include $(PVACCESSAPP)/factory/Makefile -include $(PVACCESSAPP)/remote/Makefile -include $(PVACCESSAPP)/remoteClient/Makefile -include $(PVACCESSAPP)/server/Makefile -include $(PVACCESSAPP)/rpcService/Makefile -include $(PVACCESSAPP)/rpcClient/Makefile -include $(PVACCESSAPP)/ca/Makefile -include $(PVACCESSAPP)/mb/Makefile -include $(PVACCESSAPP)/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/Makefile b/src/Makefile new file mode 100644 index 0000000..3a7328c --- /dev/null +++ b/src/Makefile @@ -0,0 +1,28 @@ +TOP = .. +include $(TOP)/configure/CONFIG + +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/pvAccessApp/ca/Makefile b/src/ca/Makefile similarity index 81% rename from pvAccessApp/ca/Makefile rename to src/ca/Makefile index f76a954..e0d75de 100644 --- a/pvAccessApp/ca/Makefile +++ b/src/ca/Makefile @@ -1,6 +1,6 @@ # This is a Makefile fragment, see ../Makefile -SRC_DIRS += $(PVACCESSAPP)/ca +SRC_DIRS += $(PVACCESS_SRC)/ca INC += caProvider.h INC += caChannel.h 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/pvAccessApp/client/Makefile b/src/client/Makefile similarity index 72% rename from pvAccessApp/client/Makefile rename to src/client/Makefile index 0e5c11c..8f569c8 100644 --- a/pvAccessApp/client/Makefile +++ b/src/client/Makefile @@ -1,6 +1,6 @@ # This is a Makefile fragment, see ../Makefile -SRC_DIRS += $(PVACCESSAPP)/client +SRC_DIRS += $(PVACCESS_SRC)/client INC += pvAccess.h 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/pvAccessApp/factory/Makefile b/src/factory/Makefile similarity index 77% rename from pvAccessApp/factory/Makefile rename to src/factory/Makefile index dc14111..dbd281e 100644 --- a/pvAccessApp/factory/Makefile +++ b/src/factory/Makefile @@ -1,6 +1,6 @@ # This is a Makefile fragment, see ../Makefile -SRC_DIRS += $(PVACCESSAPP)/factory +SRC_DIRS += $(PVACCESS_SRC)/factory LIBSRCS += ChannelAccessFactory.cpp LIBSRCS += CreateRequestFactory.cpp diff --git a/pvAccessApp/mb/Makefile b/src/mb/Makefile similarity index 75% rename from pvAccessApp/mb/Makefile rename to src/mb/Makefile index aba05f4..a9fce30 100644 --- a/pvAccessApp/mb/Makefile +++ b/src/mb/Makefile @@ -1,6 +1,6 @@ # This is a Makefile fragment, see ../Makefile -SRC_DIRS += $(PVACCESSAPP)/mb +SRC_DIRS += $(PVACCESS_SRC)/mb INC += pvAccessMB.h 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/pvAccessApp/pva/Makefile b/src/pva/Makefile similarity index 84% rename from pvAccessApp/pva/Makefile rename to src/pva/Makefile index 83221b9..ae58254 100644 --- a/pvAccessApp/pva/Makefile +++ b/src/pva/Makefile @@ -1,6 +1,6 @@ # This is a Makefile fragment, see ../Makefile -SRC_DIRS += $(PVACCESSAPP)/pva +SRC_DIRS += $(PVACCESS_SRC)/pva INC += pvaConstants.h INC += pvaVersion.h 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/pvAccessApp/remote/Makefile b/src/remote/Makefile similarity index 94% rename from pvAccessApp/remote/Makefile rename to src/remote/Makefile index 88704f2..a0479b6 100644 --- a/pvAccessApp/remote/Makefile +++ b/src/remote/Makefile @@ -1,6 +1,6 @@ # This is a Makefile fragment, see ../Makefile -SRC_DIRS += $(PVACCESSAPP)/remote +SRC_DIRS += $(PVACCESS_SRC)/remote INC += remote.h INC += blockingUDP.h 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/pvAccessApp/remoteClient/Makefile b/src/remoteClient/Makefile similarity index 72% rename from pvAccessApp/remoteClient/Makefile rename to src/remoteClient/Makefile index 2302b3e..2d0f390 100644 --- a/pvAccessApp/remoteClient/Makefile +++ b/src/remoteClient/Makefile @@ -1,6 +1,6 @@ # This is a Makefile fragment, see ../Makefile -SRC_DIRS += $(PVACCESSAPP)/remoteClient +SRC_DIRS += $(PVACCESS_SRC)/remoteClient INC += clientContextImpl.h 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/pvAccessApp/rpcClient/Makefile b/src/rpcClient/Makefile similarity index 71% rename from pvAccessApp/rpcClient/Makefile rename to src/rpcClient/Makefile index f32270a..e41747e 100644 --- a/pvAccessApp/rpcClient/Makefile +++ b/src/rpcClient/Makefile @@ -1,6 +1,6 @@ # This is a Makefile fragment, see ../Makefile -SRC_DIRS += $(PVACCESSAPP)/rpcClient +SRC_DIRS += $(PVACCESS_SRC)/rpcClient INC += rpcClient.h 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/pvAccessApp/rpcService/Makefile b/src/rpcService/Makefile similarity index 78% rename from pvAccessApp/rpcService/Makefile rename to src/rpcService/Makefile index 50b0107..8a236f7 100644 --- a/pvAccessApp/rpcService/Makefile +++ b/src/rpcService/Makefile @@ -1,6 +1,6 @@ # This is a Makefile fragment, see ../Makefile -SRC_DIRS += $(PVACCESSAPP)/rpcService +SRC_DIRS += $(PVACCESS_SRC)/rpcService INC += rpcService.h INC += rpcServer.h 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/pvAccessApp/server/Makefile b/src/server/Makefile similarity index 92% rename from pvAccessApp/server/Makefile rename to src/server/Makefile index 6820075..f8fcdcb 100644 --- a/pvAccessApp/server/Makefile +++ b/src/server/Makefile @@ -1,6 +1,6 @@ # This is a Makefile fragment, see ../Makefile -SRC_DIRS += $(PVACCESSAPP)/server +SRC_DIRS += $(PVACCESS_SRC)/server INC += serverContext.h INC += responseHandlers.h 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/pvAccessApp/utils/Makefile b/src/utils/Makefile similarity index 92% rename from pvAccessApp/utils/Makefile rename to src/utils/Makefile index d02c970..a5d0ac9 100644 --- a/pvAccessApp/utils/Makefile +++ b/src/utils/Makefile @@ -1,6 +1,6 @@ # This is a Makefile fragment, see ../Makefile -SRC_DIRS += $(PVACCESSAPP)/utils +SRC_DIRS += $(PVACCESS_SRC)/utils INC += hexDump.h INC += inetAddressUtil.h 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/pvAccessApp/v3ioc/Makefile b/src/v3ioc/Makefile similarity index 85% rename from pvAccessApp/v3ioc/Makefile rename to src/v3ioc/Makefile index d0cec93..5b0b3ca 100644 --- a/pvAccessApp/v3ioc/Makefile +++ b/src/v3ioc/Makefile @@ -1,6 +1,6 @@ # This is a Makefile fragment, see ../Makefile -SRC_DIRS += $(PVACCESSAPP)/v3ioc +SRC_DIRS += $(PVACCESS_SRC)/v3ioc INC += syncChannelFind.h 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 From e1773538d235abcf4dae01b4c17d8d7451eaf1a4 Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Mon, 31 Mar 2014 17:26:15 -0500 Subject: [PATCH 07/14] Cleaned up CONFIG_SITE file. Introduced WITH_MICROBENCH and WITH_COVERAGE Make variables that control build options. --- configure/CONFIG_SITE | 45 ++++++++++++------------------------------- 1 file changed, 12 insertions(+), 33 deletions(-) diff --git a/configure/CONFIG_SITE b/configure/CONFIG_SITE index 575e348..51f7508 100644 --- a/configure/CONFIG_SITE +++ b/configure/CONFIG_SITE @@ -1,50 +1,29 @@ # CONFIG_SITE # Make any application-specific changes to the EPICS build -# configuration variables in this file. +# configuration variables in this file. # # Host/target specific settings can be specified in files named -# CONFIG_SITE.$(EPICS_HOST_ARCH).Common -# CONFIG_SITE.Common.$(T_A) -# CONFIG_SITE.$(EPICS_HOST_ARCH).$(T_A) +# CONFIG_SITE.$(EPICS_HOST_ARCH).Common +# 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 +# If you don't want to install into $(TOP) then +# define INSTALL_LOCATION here +#INSTALL_LOCATION= -# To install files into a location other than $(TOP) define -# INSTALL_LOCATION here. -#INSTALL_LOCATION= +-include $(TOP)/configure/CONFIG_SITE.local +-include $(TOP)/../CONFIG.local -# 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 = - -ifeq ($(EPICS_TEST_COVERAGE),1) +ifdef WITH_COVERAGE USR_CPPFLAGS += --coverage USR_LDFLAGS += --coverage endif -ifeq ($(EPICS_HOST_ARCH),linux-x86) - USR_LDFLAGS += -lpthread -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 +ifdef WITH_MICROBENCH +USR_CPPFLAGS += -DPV_MB 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 From abdff1573a80ad233bb128c655f89feb4f63ca35 Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Wed, 2 Apr 2014 14:44:17 -0500 Subject: [PATCH 08/14] Enable CHECK_RELEASE warnings --- configure/CONFIG_SITE | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/configure/CONFIG_SITE b/configure/CONFIG_SITE index 51f7508..2320f60 100644 --- a/configure/CONFIG_SITE +++ b/configure/CONFIG_SITE @@ -1,16 +1,24 @@ # CONFIG_SITE # Make any application-specific changes to the EPICS build -# configuration variables in this file. +# configuration variables in this file. # # Host/target specific settings can be specified in files named -# CONFIG_SITE.$(EPICS_HOST_ARCH).Common -# CONFIG_SITE.Common.$(T_A) -# CONFIG_SITE.$(EPICS_HOST_ARCH).$(T_A) +# CONFIG_SITE.$(EPICS_HOST_ARCH).Common +# CONFIG_SITE.Common.$(T_A) +# CONFIG_SITE.$(EPICS_HOST_ARCH).$(T_A) -# If you don't want to install into $(TOP) then -# define INSTALL_LOCATION here -#INSTALL_LOCATION= +# 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 = WARN + +# To install files into a location other than $(TOP) define +# INSTALL_LOCATION here. +#INSTALL_LOCATION= -include $(TOP)/configure/CONFIG_SITE.local -include $(TOP)/../CONFIG.local From 18bc0a03931a66a45ef1437c39626a50a3d6917a Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Wed, 2 Apr 2014 15:19:23 -0500 Subject: [PATCH 09/14] Fix instructions in RELEASE file --- configure/RELEASE | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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 From e574182813f95e3bb77e92a8981335acae6fcf3b Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Thu, 3 Apr 2014 17:00:04 -0500 Subject: [PATCH 10/14] eget: caProvider.h needs pv/ prefix --- testApp/remote/eget.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testApp/remote/eget.cpp b/testApp/remote/eget.cpp index 6d546cb..2781ef8 100644 --- a/testApp/remote/eget.cpp +++ b/testApp/remote/eget.cpp @@ -6,7 +6,7 @@ #include #include -#include +#include #include #include From f654541c9d2543ba828c16949c803c28acb48103 Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Thu, 3 Apr 2014 17:00:25 -0500 Subject: [PATCH 11/14] Unify configure files with the other V4 modules Move include/pv setting into src/Makefile --- configure/CONFIG_SITE | 5 +---- configure/Makefile | 9 +-------- src/Makefile | 6 ++++++ 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/configure/CONFIG_SITE b/configure/CONFIG_SITE index 2320f60..b0a23c3 100644 --- a/configure/CONFIG_SITE +++ b/configure/CONFIG_SITE @@ -14,7 +14,7 @@ # 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 = WARN +CHECK_RELEASE = YES # To install files into a location other than $(TOP) define # INSTALL_LOCATION here. @@ -32,6 +32,3 @@ ifdef WITH_MICROBENCH USR_CPPFLAGS += -DPV_MB endif -INSTALL_INCLUDE = $(INSTALL_LOCATION)/include/pv -USR_INCLUDES += -I $(INSTALL_LOCATION)/include - 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/src/Makefile b/src/Makefile index 3a7328c..5f0d8f4 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,6 +1,11 @@ +# 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 @@ -26,3 +31,4 @@ pvAccess_LIBS += Com pvAccess_SYS_LIBS_WIN32 += ws2_32 include $(TOP)/configure/RULES + From 828bf74c6a8878f527755bdaaf0786cc1a4b377f Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Wed, 16 Apr 2014 15:52:02 -0500 Subject: [PATCH 12/14] Rename PV_MB macro to WITH_MICROBENCH as in pvCommon. --- configure/CONFIG_SITE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure/CONFIG_SITE b/configure/CONFIG_SITE index b0a23c3..ebc5310 100644 --- a/configure/CONFIG_SITE +++ b/configure/CONFIG_SITE @@ -29,6 +29,6 @@ USR_LDFLAGS += --coverage endif ifdef WITH_MICROBENCH -USR_CPPFLAGS += -DPV_MB +USR_CPPFLAGS += -DWITH_MICROBENCH endif From 6402e2ca1b2d90c00fa1bd938890cf7affceaaf0 Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Tue, 22 Apr 2014 10:38:17 -0500 Subject: [PATCH 13/14] Moved pvget/pvput/pvinfo/eget programs into pvtoolsSrc These programs are intended for users, they are not tests. --- Makefile | 3 +++ pvtoolsSrc/Makefile | 24 ++++++++++++++++++++++ {testApp/remote => pvtoolsSrc}/eget.cpp | 0 {testApp/remote => pvtoolsSrc}/pvget.cpp | 0 {testApp/remote => pvtoolsSrc}/pvinfo.cpp | 0 {testApp/remote => pvtoolsSrc}/pvput.cpp | 0 {testApp/remote => pvtoolsSrc}/pvutils.cpp | 0 {testApp/remote => pvtoolsSrc}/pvutils.h | 0 testApp/remote/Makefile | 17 --------------- 9 files changed, 27 insertions(+), 17 deletions(-) create mode 100644 pvtoolsSrc/Makefile rename {testApp/remote => pvtoolsSrc}/eget.cpp (100%) rename {testApp/remote => pvtoolsSrc}/pvget.cpp (100%) rename {testApp/remote => pvtoolsSrc}/pvinfo.cpp (100%) rename {testApp/remote => pvtoolsSrc}/pvput.cpp (100%) rename {testApp/remote => pvtoolsSrc}/pvutils.cpp (100%) rename {testApp/remote => pvtoolsSrc}/pvutils.h (100%) diff --git a/Makefile b/Makefile index aa35811..c005d8f 100644 --- a/Makefile +++ b/Makefile @@ -8,6 +8,9 @@ DIRS := configure DIRS += src src_DEPEND_DIRS = configure +DIRS += pvtoolsSrc +pvtoolsSrc_DEPEND_DIRS = src + DIRS += testApp testApp_DEPEND_DIRS = src 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 100% rename from testApp/remote/eget.cpp rename to pvtoolsSrc/eget.cpp 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/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 From 5770846fd57aeeb7cc504db243d9efc2ced84bce Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Tue, 29 Apr 2014 10:49:09 -0500 Subject: [PATCH 14/14] flow: Closed 'housekeeping'.