flow: Merged <feature> 'housekeeping' to <develop> ('default').

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
-
-

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=</path/name/to/install/top>
 
-# 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 = </IOC/path/to/application/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

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
+

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

pvAccessApp/Makefile

@@ -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

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
+

pvtoolsSrc/eget.cpp

@@ -6,7 +6,7 @@
 #include <pv/clientFactory.h>
 #include <pv/pvAccess.h>
 
-#include <caProvider.h>
+#include <pv/caProvider.h>
 
 #include <stdio.h>
 #include <epicsStdlib.h>

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
+

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

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

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

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

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

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

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

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

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

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

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

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

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