From 49058d260beb5f017db6d164fd2b9e1ccf52c638 Mon Sep 17 00:00:00 2001 From: Michael Davidsaver Date: Tue, 26 Jan 2016 15:36:07 -0500 Subject: [PATCH 1/4] move installed headers to pv/ sub-dir --- src/ca/{ => pv}/caChannel.h | 0 src/ca/{ => pv}/caProvider.h | 0 src/ca/{ => pv}/caStatus.h | 0 src/client/{ => pv}/pvAccess.h | 0 src/ioc/{ => pv}/syncChannelFind.h | 0 src/mb/{ => pv}/pvAccessMB.h | 0 src/pipelineService/{ => pv}/pipelineServer.h | 0 src/pipelineService/{ => pv}/pipelineService.h | 0 src/pva/{ => pv}/clientFactory.h | 0 src/pva/{ => pv}/pvaConstants.h | 0 src/pva/{ => pv}/pvaVersion.h | 0 src/remote/{ => pv}/beaconHandler.h | 0 src/remote/{ => pv}/blockingTCP.h | 0 src/remote/{ => pv}/blockingUDP.h | 0 src/remote/{ => pv}/channelSearchManager.h | 0 src/remote/{ => pv}/codec.h | 0 src/remote/{ => pv}/remote.h | 0 src/remote/{ => pv}/security.h | 0 src/remote/{ => pv}/serializationHelper.h | 0 src/remote/{ => pv}/simpleChannelSearchManagerImpl.h | 0 src/remote/{ => pv}/transportRegistry.h | 0 src/remoteClient/{ => pv}/clientContextImpl.h | 0 src/rpcClient/{ => pv}/rpcClient.h | 0 src/rpcService/{ => pv}/rpcServer.h | 0 src/rpcService/{ => pv}/rpcService.h | 0 src/server/{ => pv}/baseChannelRequester.h | 0 src/server/{ => pv}/beaconEmitter.h | 0 src/server/{ => pv}/beaconServerStatusProvider.h | 0 src/server/{ => pv}/responseHandlers.h | 0 src/server/{ => pv}/serverChannelImpl.h | 0 src/server/{ => pv}/serverContext.h | 0 src/utils/{ => pv}/configuration.h | 0 src/utils/{ => pv}/hexDump.h | 0 src/utils/{ => pv}/inetAddressUtil.h | 0 src/utils/{ => pv}/introspectionRegistry.h | 0 src/utils/{ => pv}/likely.h | 0 src/utils/{ => pv}/logger.h | 0 src/utils/{ => pv}/namedLockPattern.h | 0 src/utils/{ => pv}/referenceCountingLock.h | 0 src/utils/{ => pv}/wildcard.h | 0 40 files changed, 0 insertions(+), 0 deletions(-) rename src/ca/{ => pv}/caChannel.h (100%) rename src/ca/{ => pv}/caProvider.h (100%) rename src/ca/{ => pv}/caStatus.h (100%) rename src/client/{ => pv}/pvAccess.h (100%) rename src/ioc/{ => pv}/syncChannelFind.h (100%) rename src/mb/{ => pv}/pvAccessMB.h (100%) rename src/pipelineService/{ => pv}/pipelineServer.h (100%) rename src/pipelineService/{ => pv}/pipelineService.h (100%) rename src/pva/{ => pv}/clientFactory.h (100%) rename src/pva/{ => pv}/pvaConstants.h (100%) rename src/pva/{ => pv}/pvaVersion.h (100%) rename src/remote/{ => pv}/beaconHandler.h (100%) rename src/remote/{ => pv}/blockingTCP.h (100%) rename src/remote/{ => pv}/blockingUDP.h (100%) rename src/remote/{ => pv}/channelSearchManager.h (100%) rename src/remote/{ => pv}/codec.h (100%) rename src/remote/{ => pv}/remote.h (100%) rename src/remote/{ => pv}/security.h (100%) rename src/remote/{ => pv}/serializationHelper.h (100%) rename src/remote/{ => pv}/simpleChannelSearchManagerImpl.h (100%) rename src/remote/{ => pv}/transportRegistry.h (100%) rename src/remoteClient/{ => pv}/clientContextImpl.h (100%) rename src/rpcClient/{ => pv}/rpcClient.h (100%) rename src/rpcService/{ => pv}/rpcServer.h (100%) rename src/rpcService/{ => pv}/rpcService.h (100%) rename src/server/{ => pv}/baseChannelRequester.h (100%) rename src/server/{ => pv}/beaconEmitter.h (100%) rename src/server/{ => pv}/beaconServerStatusProvider.h (100%) rename src/server/{ => pv}/responseHandlers.h (100%) rename src/server/{ => pv}/serverChannelImpl.h (100%) rename src/server/{ => pv}/serverContext.h (100%) rename src/utils/{ => pv}/configuration.h (100%) rename src/utils/{ => pv}/hexDump.h (100%) rename src/utils/{ => pv}/inetAddressUtil.h (100%) rename src/utils/{ => pv}/introspectionRegistry.h (100%) rename src/utils/{ => pv}/likely.h (100%) rename src/utils/{ => pv}/logger.h (100%) rename src/utils/{ => pv}/namedLockPattern.h (100%) rename src/utils/{ => pv}/referenceCountingLock.h (100%) rename src/utils/{ => pv}/wildcard.h (100%) diff --git a/src/ca/caChannel.h b/src/ca/pv/caChannel.h similarity index 100% rename from src/ca/caChannel.h rename to src/ca/pv/caChannel.h diff --git a/src/ca/caProvider.h b/src/ca/pv/caProvider.h similarity index 100% rename from src/ca/caProvider.h rename to src/ca/pv/caProvider.h diff --git a/src/ca/caStatus.h b/src/ca/pv/caStatus.h similarity index 100% rename from src/ca/caStatus.h rename to src/ca/pv/caStatus.h diff --git a/src/client/pvAccess.h b/src/client/pv/pvAccess.h similarity index 100% rename from src/client/pvAccess.h rename to src/client/pv/pvAccess.h diff --git a/src/ioc/syncChannelFind.h b/src/ioc/pv/syncChannelFind.h similarity index 100% rename from src/ioc/syncChannelFind.h rename to src/ioc/pv/syncChannelFind.h diff --git a/src/mb/pvAccessMB.h b/src/mb/pv/pvAccessMB.h similarity index 100% rename from src/mb/pvAccessMB.h rename to src/mb/pv/pvAccessMB.h diff --git a/src/pipelineService/pipelineServer.h b/src/pipelineService/pv/pipelineServer.h similarity index 100% rename from src/pipelineService/pipelineServer.h rename to src/pipelineService/pv/pipelineServer.h diff --git a/src/pipelineService/pipelineService.h b/src/pipelineService/pv/pipelineService.h similarity index 100% rename from src/pipelineService/pipelineService.h rename to src/pipelineService/pv/pipelineService.h diff --git a/src/pva/clientFactory.h b/src/pva/pv/clientFactory.h similarity index 100% rename from src/pva/clientFactory.h rename to src/pva/pv/clientFactory.h diff --git a/src/pva/pvaConstants.h b/src/pva/pv/pvaConstants.h similarity index 100% rename from src/pva/pvaConstants.h rename to src/pva/pv/pvaConstants.h diff --git a/src/pva/pvaVersion.h b/src/pva/pv/pvaVersion.h similarity index 100% rename from src/pva/pvaVersion.h rename to src/pva/pv/pvaVersion.h diff --git a/src/remote/beaconHandler.h b/src/remote/pv/beaconHandler.h similarity index 100% rename from src/remote/beaconHandler.h rename to src/remote/pv/beaconHandler.h diff --git a/src/remote/blockingTCP.h b/src/remote/pv/blockingTCP.h similarity index 100% rename from src/remote/blockingTCP.h rename to src/remote/pv/blockingTCP.h diff --git a/src/remote/blockingUDP.h b/src/remote/pv/blockingUDP.h similarity index 100% rename from src/remote/blockingUDP.h rename to src/remote/pv/blockingUDP.h diff --git a/src/remote/channelSearchManager.h b/src/remote/pv/channelSearchManager.h similarity index 100% rename from src/remote/channelSearchManager.h rename to src/remote/pv/channelSearchManager.h diff --git a/src/remote/codec.h b/src/remote/pv/codec.h similarity index 100% rename from src/remote/codec.h rename to src/remote/pv/codec.h diff --git a/src/remote/remote.h b/src/remote/pv/remote.h similarity index 100% rename from src/remote/remote.h rename to src/remote/pv/remote.h diff --git a/src/remote/security.h b/src/remote/pv/security.h similarity index 100% rename from src/remote/security.h rename to src/remote/pv/security.h diff --git a/src/remote/serializationHelper.h b/src/remote/pv/serializationHelper.h similarity index 100% rename from src/remote/serializationHelper.h rename to src/remote/pv/serializationHelper.h diff --git a/src/remote/simpleChannelSearchManagerImpl.h b/src/remote/pv/simpleChannelSearchManagerImpl.h similarity index 100% rename from src/remote/simpleChannelSearchManagerImpl.h rename to src/remote/pv/simpleChannelSearchManagerImpl.h diff --git a/src/remote/transportRegistry.h b/src/remote/pv/transportRegistry.h similarity index 100% rename from src/remote/transportRegistry.h rename to src/remote/pv/transportRegistry.h diff --git a/src/remoteClient/clientContextImpl.h b/src/remoteClient/pv/clientContextImpl.h similarity index 100% rename from src/remoteClient/clientContextImpl.h rename to src/remoteClient/pv/clientContextImpl.h diff --git a/src/rpcClient/rpcClient.h b/src/rpcClient/pv/rpcClient.h similarity index 100% rename from src/rpcClient/rpcClient.h rename to src/rpcClient/pv/rpcClient.h diff --git a/src/rpcService/rpcServer.h b/src/rpcService/pv/rpcServer.h similarity index 100% rename from src/rpcService/rpcServer.h rename to src/rpcService/pv/rpcServer.h diff --git a/src/rpcService/rpcService.h b/src/rpcService/pv/rpcService.h similarity index 100% rename from src/rpcService/rpcService.h rename to src/rpcService/pv/rpcService.h diff --git a/src/server/baseChannelRequester.h b/src/server/pv/baseChannelRequester.h similarity index 100% rename from src/server/baseChannelRequester.h rename to src/server/pv/baseChannelRequester.h diff --git a/src/server/beaconEmitter.h b/src/server/pv/beaconEmitter.h similarity index 100% rename from src/server/beaconEmitter.h rename to src/server/pv/beaconEmitter.h diff --git a/src/server/beaconServerStatusProvider.h b/src/server/pv/beaconServerStatusProvider.h similarity index 100% rename from src/server/beaconServerStatusProvider.h rename to src/server/pv/beaconServerStatusProvider.h diff --git a/src/server/responseHandlers.h b/src/server/pv/responseHandlers.h similarity index 100% rename from src/server/responseHandlers.h rename to src/server/pv/responseHandlers.h diff --git a/src/server/serverChannelImpl.h b/src/server/pv/serverChannelImpl.h similarity index 100% rename from src/server/serverChannelImpl.h rename to src/server/pv/serverChannelImpl.h diff --git a/src/server/serverContext.h b/src/server/pv/serverContext.h similarity index 100% rename from src/server/serverContext.h rename to src/server/pv/serverContext.h diff --git a/src/utils/configuration.h b/src/utils/pv/configuration.h similarity index 100% rename from src/utils/configuration.h rename to src/utils/pv/configuration.h diff --git a/src/utils/hexDump.h b/src/utils/pv/hexDump.h similarity index 100% rename from src/utils/hexDump.h rename to src/utils/pv/hexDump.h diff --git a/src/utils/inetAddressUtil.h b/src/utils/pv/inetAddressUtil.h similarity index 100% rename from src/utils/inetAddressUtil.h rename to src/utils/pv/inetAddressUtil.h diff --git a/src/utils/introspectionRegistry.h b/src/utils/pv/introspectionRegistry.h similarity index 100% rename from src/utils/introspectionRegistry.h rename to src/utils/pv/introspectionRegistry.h diff --git a/src/utils/likely.h b/src/utils/pv/likely.h similarity index 100% rename from src/utils/likely.h rename to src/utils/pv/likely.h diff --git a/src/utils/logger.h b/src/utils/pv/logger.h similarity index 100% rename from src/utils/logger.h rename to src/utils/pv/logger.h diff --git a/src/utils/namedLockPattern.h b/src/utils/pv/namedLockPattern.h similarity index 100% rename from src/utils/namedLockPattern.h rename to src/utils/pv/namedLockPattern.h diff --git a/src/utils/referenceCountingLock.h b/src/utils/pv/referenceCountingLock.h similarity index 100% rename from src/utils/referenceCountingLock.h rename to src/utils/pv/referenceCountingLock.h diff --git a/src/utils/wildcard.h b/src/utils/pv/wildcard.h similarity index 100% rename from src/utils/wildcard.h rename to src/utils/pv/wildcard.h From 58914fd09367bd577ebaa970fe57697f57be6dcf Mon Sep 17 00:00:00 2001 From: Michael Davidsaver Date: Tue, 26 Jan 2016 15:50:49 -0500 Subject: [PATCH 2/4] update Makefiles for pv/ add pv/ prefix for INC --- src/Makefile | 3 --- src/ca/Makefile | 6 +++--- src/client/Makefile | 2 +- src/ioc/Makefile | 2 +- src/mb/Makefile | 2 +- src/pipelineService/Makefile | 4 ++-- src/pva/Makefile | 8 ++++---- src/remote/Makefile | 20 ++++++++++---------- src/remoteClient/Makefile | 2 +- src/rpcClient/Makefile | 2 +- src/rpcService/Makefile | 4 ++-- src/server/Makefile | 12 ++++++------ src/utils/Makefile | 18 +++++++++--------- 13 files changed, 41 insertions(+), 44 deletions(-) diff --git a/src/Makefile b/src/Makefile index f2c3c63..925acec 100644 --- a/src/Makefile +++ b/src/Makefile @@ -15,9 +15,6 @@ EXPANDVARS += EPICS_PVA_DEVELOPMENT_FLAG EXPANDFLAGS += $(foreach var,$(EXPANDVARS),-D$(var)="$(strip $($(var)))") -INSTALL_INCLUDE = $(INSTALL_LOCATION)/include/pv -USR_INCLUDES += -I$(INSTALL_LOCATION)/include - PVACCESS_SRC = $(TOP)/src include $(PVACCESS_SRC)/pva/Makefile diff --git a/src/ca/Makefile b/src/ca/Makefile index 33aca1e..7ec35a0 100644 --- a/src/ca/Makefile +++ b/src/ca/Makefile @@ -2,9 +2,9 @@ SRC_DIRS += $(PVACCESS_SRC)/ca -INC += caProvider.h -INC += caChannel.h -INC += caStatus.h +INC += pv/caProvider.h +INC += pv/caChannel.h +INC += pv/caStatus.h LIBSRCS += caProvider.cpp LIBSRCS += caChannel.cpp diff --git a/src/client/Makefile b/src/client/Makefile index 8f569c8..a89c26d 100644 --- a/src/client/Makefile +++ b/src/client/Makefile @@ -2,6 +2,6 @@ SRC_DIRS += $(PVACCESS_SRC)/client -INC += pvAccess.h +INC += pv/pvAccess.h LIBSRCS += pvAccess.cpp diff --git a/src/ioc/Makefile b/src/ioc/Makefile index 69fa483..3873271 100644 --- a/src/ioc/Makefile +++ b/src/ioc/Makefile @@ -2,7 +2,7 @@ SRC_DIRS += $(PVACCESS_SRC)/ioc -INC += syncChannelFind.h +INC += pv/syncChannelFind.h DBD += PVAServerRegister.dbd DBD += PVAClientRegister.dbd diff --git a/src/mb/Makefile b/src/mb/Makefile index a9fce30..a239f04 100644 --- a/src/mb/Makefile +++ b/src/mb/Makefile @@ -2,6 +2,6 @@ SRC_DIRS += $(PVACCESS_SRC)/mb -INC += pvAccessMB.h +INC += pv/pvAccessMB.h LIBSRCS += pvAccessMB.cpp diff --git a/src/pipelineService/Makefile b/src/pipelineService/Makefile index 005179c..166dc63 100644 --- a/src/pipelineService/Makefile +++ b/src/pipelineService/Makefile @@ -2,8 +2,8 @@ SRC_DIRS += $(PVACCESS_SRC)/pipelineService -INC += pipelineService.h -INC += pipelineServer.h +INC += pv/pipelineService.h +INC += pv/pipelineServer.h LIBSRCS += pipelineService.cpp LIBSRCS += pipelineServer.cpp diff --git a/src/pva/Makefile b/src/pva/Makefile index e68702d..a1b75dc 100644 --- a/src/pva/Makefile +++ b/src/pva/Makefile @@ -2,10 +2,10 @@ SRC_DIRS += $(PVACCESS_SRC)/pva -INC += pvaConstants.h -INC += pvaVersion.h -INC += pvaVersionNum.h -INC += clientFactory.h +INC += pv/pvaConstants.h +INC += pv/pvaVersion.h +INC += pv/pvaVersionNum.h +INC += pv/clientFactory.h LIBSRCS += pvaVersion.cpp LIBSRCS += clientFactory.cpp diff --git a/src/remote/Makefile b/src/remote/Makefile index 0218986..6b7a417 100644 --- a/src/remote/Makefile +++ b/src/remote/Makefile @@ -2,16 +2,16 @@ SRC_DIRS += $(PVACCESS_SRC)/remote -INC += remote.h -INC += security.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 +INC += pv/remote.h +INC += pv/security.h +INC += pv/blockingUDP.h +INC += pv/beaconHandler.h +INC += pv/blockingTCP.h +INC += pv/channelSearchManager.h +INC += pv/simpleChannelSearchManagerImpl.h +INC += pv/transportRegistry.h +INC += pv/serializationHelper.h +INC += pv/codec.h LIBSRCS += blockingUDPTransport.cpp LIBSRCS += blockingUDPConnector.cpp diff --git a/src/remoteClient/Makefile b/src/remoteClient/Makefile index 2d0f390..494f695 100644 --- a/src/remoteClient/Makefile +++ b/src/remoteClient/Makefile @@ -2,6 +2,6 @@ SRC_DIRS += $(PVACCESS_SRC)/remoteClient -INC += clientContextImpl.h +INC += pv/clientContextImpl.h LIBSRCS += clientContextImpl.cpp diff --git a/src/rpcClient/Makefile b/src/rpcClient/Makefile index e41747e..e7fe68f 100644 --- a/src/rpcClient/Makefile +++ b/src/rpcClient/Makefile @@ -2,6 +2,6 @@ SRC_DIRS += $(PVACCESS_SRC)/rpcClient -INC += rpcClient.h +INC += pv/rpcClient.h LIBSRCS += rpcClient.cpp diff --git a/src/rpcService/Makefile b/src/rpcService/Makefile index 8a236f7..4ce3cc6 100644 --- a/src/rpcService/Makefile +++ b/src/rpcService/Makefile @@ -2,8 +2,8 @@ SRC_DIRS += $(PVACCESS_SRC)/rpcService -INC += rpcService.h -INC += rpcServer.h +INC += pv/rpcService.h +INC += pv/rpcServer.h LIBSRCS += rpcService.cpp LIBSRCS += rpcServer.cpp diff --git a/src/server/Makefile b/src/server/Makefile index f8fcdcb..3334bae 100644 --- a/src/server/Makefile +++ b/src/server/Makefile @@ -2,12 +2,12 @@ SRC_DIRS += $(PVACCESS_SRC)/server -INC += serverContext.h -INC += responseHandlers.h -INC += serverChannelImpl.h -INC += baseChannelRequester.h -INC += beaconEmitter.h -INC += beaconServerStatusProvider.h +INC += pv/serverContext.h +INC += pv/responseHandlers.h +INC += pv/serverChannelImpl.h +INC += pv/baseChannelRequester.h +INC += pv/beaconEmitter.h +INC += pv/beaconServerStatusProvider.h LIBSRCS += responseHandlers.cpp LIBSRCS += serverContext.cpp diff --git a/src/utils/Makefile b/src/utils/Makefile index f7e163c..d34964a 100644 --- a/src/utils/Makefile +++ b/src/utils/Makefile @@ -2,15 +2,15 @@ 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 -INC += wildcard.h +INC += pv/hexDump.h +INC += pv/inetAddressUtil.h +INC += pv/logger.h +INC += pv/introspectionRegistry.h +INC += pv/namedLockPattern.h +INC += pv/referenceCountingLock.h +INC += pv/configuration.h +INC += pv/likely.h +INC += pv/wildcard.h LIBSRCS += hexDump.cpp LIBSRCS += inetAddressUtil.cpp From 2cfcee0e2d0c1060bbe4d4c90faca1ecb7e8cc32 Mon Sep 17 00:00:00 2001 From: Michael Davidsaver Date: Tue, 26 Jan 2016 15:51:10 -0500 Subject: [PATCH 3/4] fixup inconsistent includes --- src/ca/pv/caChannel.h | 2 +- src/mb/pvAccessMB.cpp | 2 +- src/pva/pv/pvaVersion.h | 2 +- src/remote/blockingTCPAcceptor.cpp | 2 +- src/rpcClient/rpcClient.cpp | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/ca/pv/caChannel.h b/src/ca/pv/caChannel.h index ebeb437..46c9304 100644 --- a/src/ca/pv/caChannel.h +++ b/src/ca/pv/caChannel.h @@ -12,7 +12,7 @@ /* for CA */ #include -#include +#include namespace epics { namespace pvAccess { diff --git a/src/mb/pvAccessMB.cpp b/src/mb/pvAccessMB.cpp index 8cd5b96..fb33716 100644 --- a/src/mb/pvAccessMB.cpp +++ b/src/mb/pvAccessMB.cpp @@ -1,3 +1,3 @@ -#include "pvAccessMB.h" +#include "pv/pvAccessMB.h" MB_DECLARE(channelGet, 100000); diff --git a/src/pva/pv/pvaVersion.h b/src/pva/pv/pvaVersion.h index 969c5b2..2ea2f13 100644 --- a/src/pva/pv/pvaVersion.h +++ b/src/pva/pv/pvaVersion.h @@ -22,7 +22,7 @@ #include -#include "pvaVersionNum.h" +#include "pv/pvaVersionNum.h" namespace epics { namespace pvAccess { diff --git a/src/remote/blockingTCPAcceptor.cpp b/src/remote/blockingTCPAcceptor.cpp index 32ce611..940309a 100644 --- a/src/remote/blockingTCPAcceptor.cpp +++ b/src/remote/blockingTCPAcceptor.cpp @@ -5,7 +5,7 @@ */ #include -#include "codec.h" +#include #include #include diff --git a/src/rpcClient/rpcClient.cpp b/src/rpcClient/rpcClient.cpp index 329ac2c..aedab53 100644 --- a/src/rpcClient/rpcClient.cpp +++ b/src/rpcClient/rpcClient.cpp @@ -16,7 +16,7 @@ #include #include -#include "rpcClient.h" +#include "pv/rpcClient.h" using namespace epics::pvData; From a2ef1bee8c469ef69d76c06db659bb31aa5dcfc7 Mon Sep 17 00:00:00 2001 From: Michael Davidsaver Date: Tue, 26 Jan 2016 15:51:53 -0500 Subject: [PATCH 4/4] place generated header in pv/ --- src/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Makefile b/src/Makefile index 925acec..7a304f4 100644 --- a/src/Makefile +++ b/src/Makefile @@ -46,5 +46,6 @@ include $(TOP)/configure/RULES # Can't use EXPAND as generated headers must appear # in O.Common, but EXPAND emits rules for O.$(T_A) -../O.Common/pvaVersionNum.h: ../pva/pvaVersionNum.h@ +../O.Common/pv/pvaVersionNum.h: ../pva/pvaVersionNum.h@ + $(MKDIR) $(COMMON_DIR)/pv $(EXPAND_TOOL) $(EXPANDFLAGS) $($@_EXPANDFLAGS) $< $@