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

Makefile

@@ -1,27 +1,25 @@
-#Makefile at top of application tree
+# Makefile for the EPICS V4 pvDatabase module
+
 TOP = .
 include $(TOP)/configure/CONFIG
-DIRS := $(DIRS) $(filter-out $(DIRS), configure)
-DIRS := $(DIRS) $(filter-out $(DIRS), src)
-DIRS := $(DIRS) $(filter-out $(DIRS), test)
-DIRS := $(DIRS) $(filter-out $(DIRS), arrayPerformance)
-DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard example*))
 
-EMBEDDED_TOPS := $(EMBEDDED_TOPS) $(filter-out $(EMBEDDED_TOPS), test)
-EMBEDDED_TOPS := $(EMBEDDED_TOPS) $(filter-out $(EMBEDDED_TOPS), arrayPerformance)
-EMBEDDED_TOPS := $(EMBEDDED_TOPS) $(filter-out $(EMBEDDED_TOPS), $(wildcard example*))
+DIRS := configure
 
-define DIR_template
- $(1)_DEPEND_DIRS = configure
-endef
-$(foreach dir, $(filter-out configure,$(DIRS)),$(eval $(call DIR_template,$(dir))))
+DIRS += src
+src_DEPEND_DIRS = configure
 
-define EMB_template
+EMBEDDED_TOPS := $(wildcard *Top)
+EMBEDDED_TOPS += $(wildcard example*)
+
+DIRS += $(EMBEDDED_TOPS)
+
+define dir_DEP
  $(1)_DEPEND_DIRS = src
 endef
-$(foreach dir, $(EMBEDDED_TOPS),$(eval $(call EMB_template,$(dir))))
 
-#exampleDatabase_DEPEND_DIRS += test
-#examplePowerSupply_DEPEND_DIRS += test
+$(foreach dir, $(EMBEDDED_TOPS), $(eval $(call dir_DEP,$(dir))))
+
+exampleDatabase_DEPEND_DIRS += testTop
+examplePowerSupply_DEPEND_DIRS += testTop
 
 include $(TOP)/configure/RULES_TOP

arrayPerfTop/Makefile

@@ -1,6 +1,8 @@
-#Makefile at top of application tree
+# Makefile at top of application tree
+
 TOP = .
 include $(TOP)/configure/CONFIG
+
 DIRS += configure
 
 DIRS += src

arrayPerfTop/configure/CONFIG_SITE

@@ -14,26 +14,11 @@
 # 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
-
-# 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 = WARN
 
 # 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>
-
-INSTALL_INCLUDE = $(INSTALL_LOCATION)/include/pv
-USR_INCLUDES += -I $(INSTALL_LOCATION)/include
-
--include $(TOP)/configure/CONFIG_SITE.local
--include $(TOP)/../CONFIG.local
+-include $(TOP)/../configure/CONFIG_SITE.local
+-include $(TOP)/../../CONFIG_SITE.local

arrayPerfTop/configure/RELEASE

@@ -1,4 +1,4 @@
-# pvDatabaseCPP/arrayPerformance RELEASE - Location of external support modules
+# pvDatabaseCPP/arrayPerfTop RELEASE - Location of external support modules
 #
 # IF YOU CHANGE this file or any file it includes you must
 # subsequently do a "gnumake rebuild" in the application's
@@ -16,8 +16,9 @@
 
 # EPICS V4 Developers: Do not edit the locations in this file!
 #
-# Create a file RELEASE.local pointing to your places
-# for the dependencies, e.g.
+# Create a file RELEASE.local pointing to your PVASRV, PVACCESS,
+# PVDATA, PVCOMMON and EPICS_BASE build directories, e.g.
+#   PVASRV   = /path/to/epics/pvaSrvCPP
 #   PVACCESS = /path/to/epics/pvAccessCPP
 #   PVDATA   = /path/to/epics/pvDataCPP
 #   PVCOMMON = /path/to/epics/pvCommonCPP
@@ -27,14 +28,14 @@
 # use the following definitions:
 
 PVDATABASE = $(TOP)/..
--include $(TOP)/../../RELEASE.local
+
 -include $(TOP)/../configure/RELEASE.local
+-include $(TOP)/../../RELEASE.local
 
 # If you copied this example from pvDatabaseCPP to be built as a
-# standalone TOP, define
-#   PVDATABASE = /path/to/epics/pvDatabaseCPP
-# in the appropriate RELEASE[.local],
-# and use the following definitions instead:
+# standalone TOP, adjust and use the following definitions:
+
+#PVDATABASE = /path/to/epics/pvDatabaseCPP
 
-#-include $(TOP)/../RELEASE.local
 #-include $(TOP)/configure/RELEASE.local
+#-include $(TOP)/../RELEASE.local

arrayPerfTop/src/arrayPerformance.cpp

@@ -12,7 +12,7 @@
 #include <pv/lock.h>
 
 #define epicsExportSharedSymbols
-#include <pv/arrayPerformance.h>
+#include <arrayPerformance.h>
 
 
 

arrayPerfTop/src/arrayPerformanceMain.cpp

@@ -22,13 +22,14 @@
 
 #include <pv/standardField.h>
 #include <pv/standardPVField.h>
-#include <pv/arrayPerformance.h>
-#include <pv/longArrayMonitor.h>
 #include <pv/traceRecord.h>
 #include <pv/channelProviderLocal.h>
 #include <pv/serverContext.h>
 #include <pv/clientFactory.h>
 
+#include <arrayPerformance.h>
+#include <longArrayMonitor.h>
+
 using namespace std;
 using std::tr1::static_pointer_cast;
 using namespace epics::pvData;

arrayPerfTop/src/longArrayGet.cpp

@@ -13,7 +13,7 @@
 #include <pv/caProvider.h>
 
 #define epicsExportSharedSymbols
-#include <pv/longArrayGet.h>
+#include <longArrayGet.h>
 
 namespace epics { namespace pvDatabase { 
 

arrayPerfTop/src/longArrayGetMain.cpp

@@ -22,13 +22,14 @@
 
 #include <pv/standardField.h>
 #include <pv/standardPVField.h>
-#include <pv/arrayPerformance.h>
-#include <pv/longArrayGet.h>
 #include <pv/traceRecord.h>
 #include <pv/channelProviderLocal.h>
 #include <pv/serverContext.h>
 #include <pv/clientFactory.h>
 
+#include <arrayPerformance.h>
+#include <longArrayGet.h>
+
 using namespace std;
 using std::tr1::static_pointer_cast;
 using namespace epics::pvData;

arrayPerfTop/src/longArrayMonitor.cpp

@@ -14,7 +14,7 @@
 #include <pv/caProvider.h>
 
 #define epicsExportSharedSymbols
-#include <pv/longArrayMonitor.h>
+#include <longArrayMonitor.h>
 
 
 namespace epics { namespace pvDatabase { 

arrayPerfTop/src/longArrayMonitorMain.cpp

@@ -22,13 +22,14 @@
 
 #include <pv/standardField.h>
 #include <pv/standardPVField.h>
-#include <pv/arrayPerformance.h>
-#include <pv/longArrayMonitor.h>
 #include <pv/traceRecord.h>
 #include <pv/channelProviderLocal.h>
 #include <pv/serverContext.h>
 #include <pv/clientFactory.h>
 
+#include <arrayPerformance.h>
+#include <longArrayMonitor.h>
+
 using namespace std;
 using std::tr1::static_pointer_cast;
 using namespace epics::pvData;

arrayPerfTop/src/longArrayPut.cpp

@@ -13,7 +13,7 @@
 #include <pv/caProvider.h>
 
 #define epicsExportSharedSymbols
-#include <pv/longArrayPut.h>
+#include <longArrayPut.h>
 
 namespace epics { namespace pvDatabase { 
 

arrayPerfTop/src/longArrayPutMain.cpp

@@ -22,13 +22,14 @@
 
 #include <pv/standardField.h>
 #include <pv/standardPVField.h>
-#include <pv/arrayPerformance.h>
-#include <pv/longArrayPut.h>
 #include <pv/traceRecord.h>
 #include <pv/channelProviderLocal.h>
 #include <pv/serverContext.h>
 #include <pv/clientFactory.h>
 
+#include <arrayPerformance.h>
+#include <longArrayPut.h>
+
 using namespace std;
 using std::tr1::static_pointer_cast;
 using namespace epics::pvData;

configure/CONFIG_SITE

@@ -14,26 +14,11 @@
 # 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
-
-# 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 = 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>
-
-INSTALL_INCLUDE = $(INSTALL_LOCATION)/include/pv
-USR_INCLUDES += -I $(INSTALL_LOCATION)/include
-
--include $(TOP)/../CONFIG_SITE.local
 -include $(TOP)/configure/CONFIG_SITE.local
+-include $(TOP)/../CONFIG.local

configure/ExampleRELEASE.local

@@ -1,8 +1,11 @@
+# Sample RELEASE.local file
 
-TEMPLATE_TOP=$(EPICS_BASE)/templates/makeBaseApp/top
+V4 = /home/install/epics/v4
+
+PVASRV   = $(V4)/pvaSrv
+PVACCESS = $(V4)/pvAccessCPP
+PVDATA   = $(V4)/pvDataCPP
+PVCOMMON = $(V4)/pvCommonCPP
+
+EPICS_BASE = /home/install/epics/base-3.14.12.3
 
-EPICS_BASE=/home/install/epics/base
-PVCOMMON=/home/hg/pvCommonCPP
-PVDATA=/home/hg/pvDataCPP
-PVACCESS=/home/hg/pvAccessCPP
-PVASRV=/home/hg/pvaSrv

configure/Makefile

@@ -6,3 +6,4 @@ TARGETS = $(CONFIG_TARGETS)
 CONFIGS += $(subst ../,,$(wildcard $(CONFIG_INSTALLS)))
 
 include $(TOP)/configure/RULES
+

configure/RELEASE

@@ -16,14 +16,13 @@
 
 # EPICS V4 Developers: Do not edit the locations in this file!
 #
-# Create a file RELEASE.local pointing to your PVCOMMON, PVDATA,
-# PVACCESS, and EPICS_BASE build directories,
-# and optionally GTEST e.g.
-#   PVCOMMON = /home/install/epicsV4/pvCommonCPP
-#   PVDATA   = /home/install/epicsV4/pvDataCPP
-#   PVACCESS = /home/install/epicsV4/pvAccessCPP
-#   EPICS_BASE = /home/install/epics/base
-#   # GTEST not used
+# Create a file RELEASE.local pointing to your PVASRV, PVACCESS,
+# PVDATA, PVCOMMON and EPICS_BASE build directories, e.g.
+#   PVASRV   = /path/to/epics/pvaSrvCPP
+#   PVACCESS = /path/to/epics/pvAccessCPP
+#   PVDATA   = /path/to/epics/pvDataCPP
+#   PVCOMMON = /path/to/epics/pvCommonCPP
+#   EPICS_BASE = /path/to/epics/base
 
--include $(TOP)/../RELEASE.local
 -include $(TOP)/configure/RELEASE.local
+-include $(TOP)/../RELEASE.local

exampleDatabase/Makefile

@@ -1,15 +1,18 @@
-#Makefile at top of application tree
+# Makefile at top of application tree
+
 TOP = .
 include $(TOP)/configure/CONFIG
+
 DIRS += configure
 
 DIRS += src
 src_DEPEND_DIRS = configure
 
 DIRS += ioc
-test_DEPEND_DIRS = src
+ioc_DEPEND_DIRS = src
 
 DIRS += iocBoot
+iocBoot_DEPEND_DIRS = src
 
 include $(TOP)/configure/RULES_TOP
 

exampleDatabase/configure/CONFIG_SITE

@@ -14,27 +14,11 @@
 # 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
-
-# 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 = WARN
 
 # 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>
-
-INSTALL_INCLUDE = $(INSTALL_LOCATION)/include/pv
-USR_INCLUDES += -I $(INSTALL_LOCATION)/include
-
--include $(TOP)/configure/CONFIG_SITE.local
 -include $(TOP)/../configure/CONFIG_SITE.local
--include $(TOP)/../CONFIG.local
+-include $(TOP)/../../CONFIG_SITE.local

exampleDatabase/configure/RELEASE

@@ -16,8 +16,9 @@
 
 # EPICS V4 Developers: Do not edit the locations in this file!
 #
-# Create a file RELEASE.local pointing to your places
-# for the dependencies, e.g.
+# Create a file RELEASE.local pointing to your PVASRV, PVACCESS,
+# PVDATA, PVCOMMON and EPICS_BASE build directories, e.g.
+#   PVASRV   = /path/to/epics/pvaSrvCPP
 #   PVACCESS = /path/to/epics/pvAccessCPP
 #   PVDATA   = /path/to/epics/pvDataCPP
 #   PVCOMMON = /path/to/epics/pvCommonCPP
@@ -26,17 +27,17 @@
 # If this example is built in a directory under pvDatabaseCPP,
 # use the following definitions:
 
+PVDATABASETEST = $(TOP)/../testTop
 PVDATABASE = $(TOP)/..
-PVDATABASETEST = $(TOP)/../test
--include $(TOP)/../../RELEASE.local
+
 -include $(TOP)/../configure/RELEASE.local
+-include $(TOP)/../../RELEASE.local
 
 # If you copied this example from pvDatabaseCPP to be built as a
-# standalone TOP, define
-#   PVDATABASE = /path/to/epics/pvDatabaseCPP
-#   PVDATABASETEST = /path/to/epics/pvDatabaseCPP/test
-# in the appropriate RELEASE[.local],
-# and use the following definitions instead:
+# standalone TOP, adjust and use the following definitions:
+
+#PVDATABASETEST = /path/to/epics/pvDatabaseCPP/testTop
+#PVDATABASE = /path/to/epics/pvDatabaseCPP
 
 #-include $(TOP)/../RELEASE.local
 #-include $(TOP)/configure/RELEASE.local

exampleDatabase/ioc/src/Makefile

@@ -3,26 +3,23 @@ TOP=../..
 include $(TOP)/configure/CONFIG
 #----------------------------------------
 #  ADD MACRO DEFINITIONS AFTER THIS LINE
-#=============================
-
-#==================================================
-# Build an IOC support library
-#
 
 DBD += exampleDatabase.dbd
 
-#=============================
-# build an ioc application
+exampleDatabase_DBD += base.dbd
+exampleDatabase_DBD += PVAServerRegister.dbd
+exampleDatabase_DBD += registerChannelProviderLocal.dbd
+exampleDatabase_DBD += dbPv.dbd
+exampleDatabase_DBD += powerSupplyRegister.dbd
+exampleDatabase_DBD += exampleDatabaseRegister.dbd
 
 PROD_IOC += exampleDatabase
 
-
 # <name>_registerRecordDeviceDriver.cpp will be created from <name>.dbd
 exampleDatabase_SRCS += exampleDatabase_registerRecordDeviceDriver.cpp
 exampleDatabase_SRCS_DEFAULT += exampleDatabaseMain.cpp
 exampleDatabase_SRCS_vxWorks += -nil-
 
-
 # The following adds support from base/src/vxWorks
 exampleDatabase_OBJS_vxWorks += $(EPICS_BASE_BIN)/vxComLibrary
 

exampleDatabase/ioc/src/exampleDatabaseInclude.dbd

@@ -1,6 +0,0 @@
-include "base.dbd"
-include "PVAServerRegister.dbd"
-include "registerChannelProviderLocal.dbd"
-include "dbPv.dbd"
-include "powerSupplyRegister.dbd"
-registrar("exampleDatabaseRegister")

exampleDatabase/src/Makefile

@@ -3,12 +3,19 @@ TOP=..
 include $(TOP)/configure/CONFIG
 #----------------------------------------
 #  ADD MACRO DEFINITIONS AFTER THIS LINE
-#=============================
 
-#==================================================
-# Build an IOC support library
-#
+DBD += exampleDatabaseRegister.dbd
 
+INC += exampleDatabase.h
+
+LIBRARY += exampleDatabase
+exampleDatabase_SRCS += exampleDatabase.cpp
+exampleDatabase_SRCS += exampleDatabaseRegister.cpp
+exampleDatabase_LIBS += powerSupply
+exampleDatabase_LIBS += pvDatabase
+exampleDatabase_LIBS += pvAccess
+exampleDatabase_LIBS += pvData
+exampleDatabase_LIBS += $(EPICS_BASE_IOC_LIBS)
 
 PROD_HOST += exampleDatabaseMain
 exampleDatabaseMain_SRCS += exampleDatabaseMain.cpp
@@ -19,20 +26,6 @@ exampleDatabaseMain_LIBS += pvAccess
 exampleDatabaseMain_LIBS += pvData
 exampleDatabaseMain_LIBS += Com
 
-DBD += exampleDatabase.dbd
-
-INC += exampleDatabase.h
-
-LIBRARY_IOC += exampleDatabase
-exampleDatabase_SRCS += exampleDatabase.cpp
-exampleDatabase_SRCS += exampleDatabaseRegister.cpp
-exampleDatabase_LIBS += powerSupply
-exampleDatabase_LIBS += pvDatabase
-exampleDatabase_LIBS += pvAccess
-exampleDatabase_LIBS += pvData
-exampleDatabase_LIBS += Com
-exampleDatabase_LIBS += $(EPICS_BASE_IOC_LIBS)
-
 #===========================
 
 include $(TOP)/configure/RULES

exampleDatabase/src/exampleDatabase.cpp

@@ -22,11 +22,12 @@
 
 #include <pv/standardField.h>
 #include <pv/standardPVField.h>
-#include <pv/powerSupply.h>
 #include <pv/channelProviderLocal.h>
 #include <pv/recordList.h>
 #include <pv/traceRecord.h>
-#include <pv/exampleDatabase.h>
+
+#include <powerSupply.h>
+#include <exampleDatabase.h>
 
 using namespace std;
 using std::tr1::static_pointer_cast;

exampleDatabase/src/exampleDatabaseMain.cpp

@@ -20,9 +20,10 @@
 #include <iostream>
 
 #include <pv/channelProviderLocal.h>
-#include <pv/exampleDatabase.h>
 #include <pv/serverContext.h>
 
+#include <exampleDatabase.h>
+
 using namespace std;
 using std::tr1::static_pointer_cast;
 using namespace epics::pvData;

exampleDatabase/src/exampleDatabaseRegister.cpp

@@ -31,9 +31,9 @@
 #include <pv/pvAccess.h>
 #include <pv/pvDatabase.h>
 
-#define epicsExportSharedSymbols
 #include <epicsExport.h>
-#include <pv/exampleDatabase.h>
+
+#include <exampleDatabase.h>
 
 using namespace epics::pvData;
 using namespace epics::pvAccess;

exampleLink/Makefile

@@ -1,6 +1,8 @@
-#Makefile at top of application tree
+# Makefile at top of application tree
+
 TOP = .
 include $(TOP)/configure/CONFIG
+
 DIRS += configure
 
 DIRS += src
@@ -10,6 +12,7 @@ DIRS += ioc
 ioc_DEPEND_DIRS = src
 
 DIRS += iocBoot
+iocBoot_DEPEND_DIRS = src
 
 include $(TOP)/configure/RULES_TOP
 

exampleLink/configure/CONFIG_SITE

@@ -14,26 +14,11 @@
 # 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
-
-# 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 = WARN
 
 # 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>
-
-INSTALL_INCLUDE = $(INSTALL_LOCATION)/include/pv
-USR_INCLUDES += -I $(INSTALL_LOCATION)/include
-
--include $(TOP)/configure/CONFIG_SITE.local
--include $(TOP)/../CONFIG.local
+-include $(TOP)/../configure/CONFIG_SITE.local
+-include $(TOP)/../../CONFIG_SITE.local

exampleLink/configure/RELEASE

@@ -16,8 +16,9 @@
 
 # EPICS V4 Developers: Do not edit the locations in this file!
 #
-# Create a file RELEASE.local pointing to your places
-# for the dependencies, e.g.
+# Create a file RELEASE.local pointing to your PVASRV, PVACCESS,
+# PVDATA, PVCOMMON and EPICS_BASE build directories, e.g.
+#   PVASRV   = /path/to/epics/pvaSrvCPP
 #   PVACCESS = /path/to/epics/pvAccessCPP
 #   PVDATA   = /path/to/epics/pvDataCPP
 #   PVCOMMON = /path/to/epics/pvCommonCPP
@@ -27,14 +28,14 @@
 # use the following definitions:
 
 PVDATABASE = $(TOP)/..
--include $(TOP)/../../RELEASE.local
+
 -include $(TOP)/../configure/RELEASE.local
+-include $(TOP)/../../RELEASE.local
 
 # If you copied this example from pvDatabaseCPP to be built as a
-# standalone TOP, define
-#   PVDATABASE = /path/to/epics/pvDatabaseCPP
-# in the appropriate RELEASE[.local],
-# and use the following definitions instead:
+# standalone TOP, adjust and use the following definitions:
+
+#PVDATABASE = /path/to/epics/pvDatabaseCPP
 
-#-include $(TOP)/../RELEASE.local
 #-include $(TOP)/configure/RELEASE.local
+#-include $(TOP)/../RELEASE.local

exampleLink/ioc/src/Makefile

@@ -3,27 +3,22 @@ TOP=../..
 include $(TOP)/configure/CONFIG
 #----------------------------------------
 #  ADD MACRO DEFINITIONS AFTER THIS LINE
-#=============================
-
-#==================================================
-# Build an IOC support library
-#
-
-#=============================
-# build an ioc application
-
 
 DBD += exampleLink.dbd
 
-PROD_IOC += exampleLink
+exampleLink_DBD += base.dbd
+exampleLink_DBD += PVAServerRegister.dbd
+exampleLink_DBD += PVAClientRegister.dbd
+exampleLink_DBD += registerChannelProviderLocal.dbd
+exampleLink_DBD += exampleLinkRegister.dbd
 
+PROD_IOC += exampleLink
 
 # <name>_registerRecordDeviceDriver.cpp will be created from <name>.dbd
 exampleLink_SRCS += exampleLink_registerRecordDeviceDriver.cpp
 exampleLink_SRCS_DEFAULT += exampleLinkMain.cpp
 exampleLink_SRCS_vxWorks += -nil-
 
-
 # The following adds support from base/src/vxWorks
 exampleLink_OBJS_vxWorks += $(EPICS_BASE_BIN)/vxComLibrary
 
@@ -32,7 +27,6 @@ exampleLink_LIBS += pvDatabase
 exampleLink_LIBS += pvaSrv
 exampleLink_LIBS += pvAccess
 exampleLink_LIBS += pvData
-exampleLink_LIBS += Com
 exampleLink_LIBS += $(EPICS_BASE_IOC_LIBS)
 
 #===========================

exampleLink/ioc/src/exampleLinkInclude.dbd

@@ -1,5 +0,0 @@
-include "base.dbd"
-include "PVAServerRegister.dbd"
-include "PVAClientRegister.dbd"
-include "registerChannelProviderLocal.dbd"
-registrar("exampleLinkRegister")

exampleLink/src/Makefile

@@ -3,13 +3,8 @@ TOP=..
 include $(TOP)/configure/CONFIG
 #----------------------------------------
 #  ADD MACRO DEFINITIONS AFTER THIS LINE
-#=============================
 
-#==================================================
-# Build an IOC support library
-#
-
-DBD += exampleLink.dbd
+DBD += exampleLinkRegister.dbd
 
 INC += exampleLink.h
 

exampleLink/src/exampleLink.cpp

@@ -13,7 +13,7 @@
 #include <pv/convert.h>
 
 #define epicsExportSharedSymbols 
-#include <pv/exampleLink.h>
+#include <exampleLink.h>
 
 
 namespace epics { namespace pvDatabase { 

exampleLink/src/exampleLinkRegister.cpp

@@ -27,7 +27,6 @@
 #include <epicsThread.h>
 #include <iocsh.h>
 
-
 #include <pv/pvIntrospect.h>
 #include <pv/pvData.h>
 #include <pv/standardField.h>
@@ -35,9 +34,9 @@
 #include <pv/pvAccess.h>
 #include <pv/pvDatabase.h>
 
-#define epicsExportSharedSymbols 
 #include <epicsExport.h>
-#include <pv/exampleLink.h>
+
+#include <exampleLink.h>
 
 using namespace epics::pvData;
 using namespace epics::pvAccess;

examplePowerSupply/Makefile

@@ -1,6 +1,8 @@
-#Makefile at top of application tree
+# Makefile at top of application tree
+
 TOP = .
 include $(TOP)/configure/CONFIG
+
 DIRS += configure
 
 DIRS += src
@@ -10,6 +12,7 @@ DIRS += ioc
 ioc_DEPEND_DIRS = src
 
 DIRS += iocBoot
+iocBoot_DEPEND_DIRS = src
 
 include $(TOP)/configure/RULES_TOP
 

examplePowerSupply/configure/CONFIG_SITE

@@ -14,26 +14,11 @@
 # 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
-
-# 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 = WARN
 
 # 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>
-
-INSTALL_INCLUDE = $(INSTALL_LOCATION)/include/pv
-USR_INCLUDES += -I $(INSTALL_LOCATION)/include
-
--include $(TOP)/configure/CONFIG_SITE.local
--include $(TOP)/../CONFIG.local
+-include $(TOP)/../configure/CONFIG_SITE.local
+-include $(TOP)/../../CONFIG_SITE.local

examplePowerSupply/configure/RELEASE

@@ -16,8 +16,9 @@
 
 # EPICS V4 Developers: Do not edit the locations in this file!
 #
-# Create a file RELEASE.local pointing to your places
-# for the dependencies, e.g.
+# Create a file RELEASE.local pointing to your PVASRV, PVACCESS,
+# PVDATA, PVCOMMON and EPICS_BASE build directories, e.g.
+#   PVASRV   = /path/to/epics/pvaSrvCPP
 #   PVACCESS = /path/to/epics/pvAccessCPP
 #   PVDATA   = /path/to/epics/pvDataCPP
 #   PVCOMMON = /path/to/epics/pvCommonCPP
@@ -26,17 +27,17 @@
 # If this example is built in a directory under pvDatabaseCPP,
 # use the following definitions:
 
+PVDATABASETEST = $(TOP)/../testTop
 PVDATABASE = $(TOP)/..
-PVDATABASETEST = $(TOP)/../test
--include $(TOP)/../../RELEASE.local
+
 -include $(TOP)/../configure/RELEASE.local
+-include $(TOP)/../../RELEASE.local
 
 # If you copied this example from pvDatabaseCPP to be built as a
-# standalone TOP, define
-#   PVDATABASE = /path/to/epics/pvDatabaseCPP
-#   PVDATABASETEST = /path/to/epics/pvDatabaseCPP/test
-# in the appropriate RELEASE[.local],
-# and use the following definitions instead:
+# standalone TOP, adjust and use the following definitions:
+
+#PVDATABASETEST = /path/to/epics/pvDatabaseCPP/testTop
+#PVDATABASE = /path/to/epics/pvDatabaseCPP
 
 #-include $(TOP)/../RELEASE.local
 #-include $(TOP)/configure/RELEASE.local

examplePowerSupply/ioc/src/Makefile

@@ -3,26 +3,22 @@ TOP=../..
 include $(TOP)/configure/CONFIG
 #----------------------------------------
 #  ADD MACRO DEFINITIONS AFTER THIS LINE
-#=============================
-
-#==================================================
-# Build an IOC support library
-#
 
 DBD += powerSupply.dbd
 
-#=============================
-# build an ioc application
+powerSupply_DBD += base.dbd
+powerSupply_DBD += PVAServerRegister.dbd
+powerSupply_DBD += registerChannelProviderLocal.dbd
+powerSupply_DBD += dbPv.dbd
+powerSupply_DBD += powerSupplyRegister.dbd
 
 PROD_IOC += powerSupply
 
-
 # <name>_registerRecordDeviceDriver.cpp will be created from <name>.dbd
 powerSupply_SRCS += powerSupply_registerRecordDeviceDriver.cpp
 powerSupply_SRCS_DEFAULT += powerSupplyMain.cpp
 powerSupply_SRCS_vxWorks += -nil-
 
-
 # The following adds support from base/src/vxWorks
 powerSupply_OBJS_vxWorks += $(EPICS_BASE_BIN)/vxComLibrary
 

examplePowerSupply/ioc/src/powerSupplyInclude.dbd

@@ -1,5 +0,0 @@
-include "base.dbd"
-include "PVAServerRegister.dbd"
-include "registerChannelProviderLocal.dbd"
-include "dbPv.dbd"
-include "powerSupplyRegister.dbd"

examplePowerSupply/src/Makefile

@@ -3,21 +3,14 @@ TOP=..
 include $(TOP)/configure/CONFIG
 #----------------------------------------
 #  ADD MACRO DEFINITIONS AFTER THIS LINE
-#=============================
-
-#==================================================
-# Build an IOC support library
-#
-
 
 PROD_HOST += powerSupplyMain
 powerSupplyMain_SRCS += powerSupplyMain.cpp
-
+powerSupplyMain_LIBS += powerSupply
 powerSupplyMain_LIBS += pvDatabase
 powerSupplyMain_LIBS += pvAccess
 powerSupplyMain_LIBS += pvData
 powerSupplyMain_LIBS += Com
-powerSupplyMain_LIBS += powerSupply
 
 #===========================
 

examplePowerSupply/src/powerSupplyMain.cpp

@@ -20,11 +20,12 @@
 
 #include <pv/standardField.h>
 #include <pv/standardPVField.h>
-#include <pv/powerSupply.h>
 #include <pv/traceRecord.h>
 #include <pv/channelProviderLocal.h>
 #include <pv/serverContext.h>
 
+#include <powerSupply.h>
+
 using namespace std;
 using std::tr1::static_pointer_cast;
 using namespace epics::pvData;

examplePowerSupply/src/powerSupplyRegisterInclude.dbd

@@ -1 +0,0 @@
-registrar("powerSupplyRegister")

exampleServer/Makefile

@@ -1,6 +1,8 @@
-#Makefile at top of application tree
+# Makefile at top of application tree
+
 TOP = .
 include $(TOP)/configure/CONFIG
+
 DIRS += configure
 
 DIRS += src
@@ -10,6 +12,7 @@ DIRS += ioc
 ioc_DEPEND_DIRS = src
 
 DIRS += iocBoot
+iocBoot_DEPEND_DIRS = src
 
 include $(TOP)/configure/RULES_TOP
 

exampleServer/configure/CONFIG_SITE

@@ -14,26 +14,11 @@
 # 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
-
-# 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 = WARN
 
 # 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>
-
-INSTALL_INCLUDE = $(INSTALL_LOCATION)/include/pv
-USR_INCLUDES += -I $(INSTALL_LOCATION)/include
-
--include $(TOP)/configure/CONFIG_SITE.local
--include $(TOP)/../CONFIG.local
+-include $(TOP)/../configure/CONFIG_SITE.local
+-include $(TOP)/../../CONFIG_SITE.local

exampleServer/configure/RELEASE

@@ -16,8 +16,9 @@
 
 # EPICS V4 Developers: Do not edit the locations in this file!
 #
-# Create a file RELEASE.local pointing to your places
-# for the dependencies, e.g.
+# Create a file RELEASE.local pointing to your PVASRV, PVACCESS,
+# PVDATA, PVCOMMON and EPICS_BASE build directories, e.g.
+#   PVASRV   = /path/to/epics/pvaSrvCPP
 #   PVACCESS = /path/to/epics/pvAccessCPP
 #   PVDATA   = /path/to/epics/pvDataCPP
 #   PVCOMMON = /path/to/epics/pvCommonCPP
@@ -27,14 +28,14 @@
 # use the following definitions:
 
 PVDATABASE = $(TOP)/..
--include $(TOP)/../../RELEASE.local
+
 -include $(TOP)/../configure/RELEASE.local
+-include $(TOP)/../../RELEASE.local
 
 # If you copied this example from pvDatabaseCPP to be built as a
-# standalone TOP, define
-#   PVDATABASE = /path/to/epics/pvDatabaseCPP
-# in the appropriate RELEASE[.local],
-# and use the following definitions instead:
+# standalone TOP, adjust and use the following definitions:
+
+#PVDATABASE = /path/to/epics/pvDatabaseCPP
 
-#-include $(TOP)/../RELEASE.local
 #-include $(TOP)/configure/RELEASE.local
+#-include $(TOP)/../RELEASE.local

exampleServer/ioc/src/Makefile

@@ -3,26 +3,22 @@ TOP=../..
 include $(TOP)/configure/CONFIG
 #----------------------------------------
 #  ADD MACRO DEFINITIONS AFTER THIS LINE
-#=============================
-
-#==================================================
-# Build an IOC support library
-#
 
 DBD += exampleServer.dbd
 
-#=============================
-# build an ioc application
+exampleServer_DBD += base.dbd
+exampleServer_DBD += PVAServerRegister.dbd
+exampleServer_DBD += registerChannelProviderLocal.dbd
+exampleServer_DBD += dbPv.dbd
+exampleServer_DBD += exampleServerRegister.dbd
 
 PROD_IOC += exampleServer
 
-
 # <name>_registerRecordDeviceDriver.cpp will be created from <name>.dbd
 exampleServer_SRCS += exampleServer_registerRecordDeviceDriver.cpp
 exampleServer_SRCS_DEFAULT += exampleServerMain.cpp
 exampleServer_SRCS_vxWorks += -nil-
 
-
 # The following adds support from base/src/vxWorks
 exampleServer_OBJS_vxWorks += $(EPICS_BASE_BIN)/vxComLibrary
 

exampleServer/ioc/src/exampleServerInclude.dbd

@@ -1,5 +0,0 @@
-include "base.dbd"
-include "PVAServerRegister.dbd"
-include "registerChannelProviderLocal.dbd"
-include "dbPv.dbd"
-include "exampleServer.dbd"

exampleServer/src/Makefile

@@ -3,14 +3,8 @@ TOP=..
 include $(TOP)/configure/CONFIG
 #----------------------------------------
 #  ADD MACRO DEFINITIONS AFTER THIS LINE
-#=============================
 
-#==================================================
-# Build an IOC support library
-#
-
-
-DBD += exampleServer.dbd
+DBD += exampleServerRegister.dbd
 
 INC += exampleServer.h
 
@@ -20,7 +14,6 @@ exampleServer_SRCS += exampleServerRegister.cpp
 exampleServer_LIBS += pvDatabase
 exampleServer_LIBS += pvAccess
 exampleServer_LIBS += pvData
-exampleServer_LIBS += Com
 exampleServer_LIBS += $(EPICS_BASE_IOC_LIBS)
 
 PROD_HOST += exampleServerMain

exampleServer/src/exampleServer.cpp

@@ -12,7 +12,8 @@
 #include <pv/standardPVField.h>
 
 #define epicsExportSharedSymbols
-#include <pv/exampleServer.h>
+
+#include <exampleServer.h>
 
 namespace epics { namespace exampleServer { 
 using namespace epics::pvData;

exampleServer/src/exampleServerMain.cpp

@@ -20,11 +20,12 @@
 
 #include <pv/standardField.h>
 #include <pv/standardPVField.h>
-#include <pv/exampleServer.h>
 #include <pv/traceRecord.h>
 #include <pv/channelProviderLocal.h>
 #include <pv/serverContext.h>
 
+#include <exampleServer.h>
+
 using namespace std;
 using std::tr1::static_pointer_cast;
 using namespace epics::pvData;

exampleServer/src/exampleServerRegister.cpp

@@ -27,15 +27,14 @@
 #include <epicsThread.h>
 #include <iocsh.h>
 
-
 #include <pv/pvIntrospect.h>
 #include <pv/pvData.h>
 #include <pv/pvAccess.h>
 #include <pv/pvDatabase.h>
 
-#define epicsExportSharedSymbols
 #include <epicsExport.h>
-#include <pv/exampleServer.h>
+
+#include <exampleServer.h>
 
 using namespace epics::pvData;
 using namespace epics::pvAccess;

src/Makefile

@@ -1,33 +1,21 @@
+# Makefile for the pvDatabase library
+
 TOP = ..
 include $(TOP)/configure/CONFIG
 
-DATABASE = $(TOP)/src/
+INSTALL_INCLUDE = $(INSTALL_LOCATION)/include/pv
+USR_INCLUDES += -I$(INSTALL_LOCATION)/include
+
+PVDATABASE_SRC = $(TOP)/src
+
+LIBRARY += pvDatabase
+
+include $(PVDATABASE_SRC)/database/Makefile
+include $(PVDATABASE_SRC)/pvAccess/Makefile
+include $(PVDATABASE_SRC)/special/Makefile
 
-LIBRARY_IOC += pvDatabase
 pvDatabase_LIBS += pvAccess pvData Com
 pvDatabase_LIBS += $(EPICS_BASE_IOC_LIBS)
 
-SRC_DIRS += $(DATABASE)/database
-INC += pvDatabase.h
-LIBSRCS += pvRecord.cpp
-LIBSRCS += pvDatabase.cpp
-
-SRC_DIRS += $(DATABASE)/pvAccess
-INC += channelProviderLocal.h
-INC += pvCopy.h
-INC += monitorAlgorithm.h
-DBD += registerChannelProviderLocal.dbd
-LIBSRCS += channelProviderLocal.cpp
-LIBSRCS += pvCopy.cpp
-LIBSRCS += monitorFactory.cpp
-LIBSRCS += channelLocal.cpp
-LIBSRCS += registerChannelProviderLocal.cpp
-
-SRC_DIRS += $(DATABASE)/special
-INC += recordList.h
-INC += traceRecord.h
-LIBSRCS += recordList.cpp
-LIBSRCS += traceRecord.cpp
-
 include $(TOP)/configure/RULES
 

src/database/Makefile

@@ -0,0 +1,8 @@
+# This is a Makefile fragment, see ../Makefile
+
+SRC_DIRS += $(PVDATABASE_SRC)/database
+
+INC += pvDatabase.h
+
+LIBSRCS += pvRecord.cpp
+LIBSRCS += pvDatabase.cpp

src/pvAccess/Makefile

@@ -0,0 +1,15 @@
+# This is a Makefile fragment, see ../Makefile
+
+SRC_DIRS += $(PVDATABASE_SRC)/pvAccess
+
+INC += channelProviderLocal.h
+INC += pvCopy.h
+INC += monitorAlgorithm.h
+
+DBD += registerChannelProviderLocal.dbd
+
+LIBSRCS += channelProviderLocal.cpp
+LIBSRCS += pvCopy.cpp
+LIBSRCS += monitorFactory.cpp
+LIBSRCS += channelLocal.cpp
+LIBSRCS += registerChannelProviderLocal.cpp

src/special/Makefile

@@ -0,0 +1,9 @@
+# This is a Makefile fragment, see ../Makefile
+
+SRC_DIRS += $(PVDATABASE_SRC)/special
+
+INC += recordList.h
+INC += traceRecord.h
+
+LIBSRCS += recordList.cpp
+LIBSRCS += traceRecord.cpp

testTop/Makefile

@@ -1,6 +1,8 @@
-#Makefile at top of application tree
+# Makefile at top of application tree
+
 TOP = .
 include $(TOP)/configure/CONFIG
+
 DIRS += configure
 
 DIRS += src

testTop/configure/CONFIG_SITE

@@ -14,26 +14,11 @@
 # 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
-
-# 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 = 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>
-
-INSTALL_INCLUDE = $(INSTALL_LOCATION)/include/pv
-USR_INCLUDES += -I $(INSTALL_LOCATION)/include
-
--include $(TOP)/configure/CONFIG_SITE.local
--include $(TOP)/../CONFIG.local
+-include $(TOP)/../configure/CONFIG_SITE.local
+-include $(TOP)/../../CONFIG.local

testTop/configure/Makefile

@@ -6,3 +6,4 @@ TARGETS = $(CONFIG_TARGETS)
 CONFIGS += $(subst ../,,$(wildcard $(CONFIG_INSTALLS)))
 
 include $(TOP)/configure/RULES
+

testTop/configure/RELEASE

@@ -1,4 +1,4 @@
-# pvDatabaseCPP/test RELEASE - Location of external support modules
+# pvDatabaseCPP/testTop RELEASE - Location of external support modules
 #
 # IF YOU CHANGE this file or any file it includes you must
 # subsequently do a "gnumake rebuild" in the application's
@@ -16,8 +16,9 @@
 
 # EPICS V4 Developers: Do not edit the locations in this file!
 #
-# Create a file RELEASE.local pointing to your places
-# for the dependencies, e.g.
+# Create a file RELEASE.local pointing to your PVASRV, PVACCESS,
+# PVDATA, PVCOMMON and EPICS_BASE build directories, e.g.
+#   PVASRV   = /path/to/epics/pvaSrvCPP
 #   PVACCESS = /path/to/epics/pvAccessCPP
 #   PVDATA   = /path/to/epics/pvDataCPP
 #   PVCOMMON = /path/to/epics/pvCommonCPP
@@ -27,14 +28,14 @@
 # use the following definitions:
 
 PVDATABASE = $(TOP)/..
--include $(TOP)/../../RELEASE.local
+
 -include $(TOP)/../configure/RELEASE.local
+-include $(TOP)/../../RELEASE.local
 
 # If you copied these tests from pvDatabaseCPP to be built as a
-# standalone TOP, define
-#   PVDATABASE = /path/to/epics/pvDatabaseCPP
-# in the appropriate RELEASE[.local],
-# and use the following definitions instead:
+# standalone TOP, adjust and use the following definitions:
+
+#PVDATABASE = /path/to/epics/pvDatabaseCPP
 
-#-include $(TOP)/../RELEASE.local
 #-include $(TOP)/configure/RELEASE.local
+#-include $(TOP)/../RELEASE.local

testTop/src/powerSupplyRegister.cpp

@@ -27,16 +27,14 @@
 #include <epicsThread.h>
 #include <iocsh.h>
 
-
 #include <pv/pvIntrospect.h>
 #include <pv/pvData.h>
 #include <pv/pvAccess.h>
 #include <pv/pvDatabase.h>
 
-#define epicsExportSharedSymbols
-
 #include <epicsExport.h>
-#include <pv/powerSupply.h>
+
+#include <powerSupply.h>
 
 using namespace epics::pvData;
 using namespace epics::pvAccess;