merge feature/changesAfter3_0_2; resolve conflicts

examplePowerSupply/configure/CONFIG_SITE

@@ -14,11 +14,26 @@
 # 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
+
+# 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
 
 # To install files into a location other than $(TOP) define
 #   INSTALL_LOCATION here.
 #INSTALL_LOCATION=</path/name/to/install/top>
 
--include $(TOP)/../configure/CONFIG_SITE.local
--include $(TOP)/../../CONFIG_SITE.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 = </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

examplePowerSupply/configure/RELEASE

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

examplePowerSupply/ioc/src/Makefile

@@ -3,22 +3,26 @@ TOP=../..
 include $(TOP)/configure/CONFIG
 #----------------------------------------
 #  ADD MACRO DEFINITIONS AFTER THIS LINE
+#=============================
+
+#==================================================
+# Build an IOC support library
+#
 
 DBD += powerSupply.dbd
 
-powerSupply_DBD += base.dbd
-powerSupply_DBD += PVAServerRegister.dbd
-powerSupply_DBD += registerChannelProviderLocal.dbd
-powerSupply_DBD += dbPv.dbd
-powerSupply_DBD += powerSupplyRegister.dbd
+#=============================
+# build an ioc application
 
 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

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

examplePowerSupply/src/Makefile

@@ -3,14 +3,21 @@ 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,12 +20,11 @@
 
 #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

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