merge feature/changesAfter3_0_2; resolve conflicts

exampleServer/Makefile

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

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

exampleServer/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
@@ -28,14 +27,14 @@
 # use the following definitions:
 
 PVDATABASE = $(TOP)/..
-
--include $(TOP)/../configure/RELEASE.local
 -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:
+# standalone TOP, define
+#   PVDATABASE = /path/to/epics/pvDatabaseCPP
+# in the appropriate RELEASE[.local],
+# and use the following definitions instead:
 
-#PVDATABASE = /path/to/epics/pvDatabaseCPP
-
-#-include $(TOP)/configure/RELEASE.local
 #-include $(TOP)/../RELEASE.local
+#-include $(TOP)/configure/RELEASE.local

exampleServer/ioc/src/Makefile

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

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

exampleServer/src/Makefile

@@ -3,8 +3,14 @@ TOP=..
 include $(TOP)/configure/CONFIG
 #----------------------------------------
 #  ADD MACRO DEFINITIONS AFTER THIS LINE
+#=============================
 
-DBD += exampleServerRegister.dbd
+#==================================================
+# Build an IOC support library
+#
+
+
+DBD += exampleServer.dbd
 
 INC += exampleServer.h
 
@@ -14,6 +20,7 @@ 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

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

exampleServer/src/exampleServer.h

@@ -8,26 +8,15 @@
  * @author mrk
  * @date 2013.04.02
  */
-#ifndef EXAMPLESERVER_H
-#define EXAMPLESERVER_H
-
-#ifdef epicsExportSharedSymbols
-#   define exampleServerEpicsExportSharedSymbols
-#   undef epicsExportSharedSymbols
-#endif
+#ifndef EXAMPLECOUNTER_H
+#define EXAMPLECOUNTER_H
 
 #include <shareLib.h>
+
 #include <pv/pvDatabase.h>
 #include <pv/timeStamp.h>
 #include <pv/pvTimeStamp.h>
 
-#ifdef exampleServerEpicsExportSharedSymbols
-#   define epicsExportSharedSymbols
-#	undef exampleServerEpicsExportSharedSymbols
-#   include <shareLib.h>
-#endif
-
-
 namespace epics { namespace exampleServer { 
 
 
@@ -58,4 +47,4 @@ private:
 
 }}
 
-#endif  /* EXAMPLESERVER_H */
+#endif  /* EXAMPLECOUNTER_H */

exampleServer/src/exampleServerInclude.dbd

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

exampleServer/src/exampleServerMain.cpp

@@ -20,12 +20,11 @@
 
 #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,14 +27,13 @@
 #include <epicsThread.h>
 #include <iocsh.h>
 
+#include <epicsExport.h>
+
 #include <pv/pvIntrospect.h>
 #include <pv/pvData.h>
 #include <pv/pvAccess.h>
 #include <pv/pvDatabase.h>
-
-#include <epicsExport.h>
-
-#include <exampleServer.h>
+#include <pv/exampleServer.h>
 
 using namespace epics::pvData;
 using namespace epics::pvAccess;
@@ -65,7 +64,4 @@ static void exampleServerRegister(void)
         iocshRegister(&exampleServerFuncDef, exampleServerCallFunc);
     }
 }
-
-extern "C" {
-    epicsExportRegistrar(exampleServerRegister);
-}
+epicsExportRegistrar(exampleServerRegister);