merge feature/changesAfter3_0_2; resolve conflicts

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

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

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

exampleLink/ioc/src/Makefile

@@ -3,22 +3,27 @@ TOP=../..
 include $(TOP)/configure/CONFIG
 #----------------------------------------
 #  ADD MACRO DEFINITIONS AFTER THIS LINE
+#=============================
+
+#==================================================
+# Build an IOC support library
+#
+
+#=============================
+# build an ioc application
+
 
 DBD += exampleLink.dbd
 
-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
 
@@ -27,6 +32,7 @@ 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

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

exampleLink/src/Makefile

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

exampleLink/src/exampleLink.cpp

@@ -9,13 +9,10 @@
  * @date 2013.08.02
  */
 
+#include <pv/exampleLink.h>
 #include <pv/standardPVField.h>
 #include <pv/convert.h>
 
-#define epicsExportSharedSymbols 
-#include <exampleLink.h>
-
-
 namespace epics { namespace pvDatabase { 
 using namespace epics::pvData;
 using namespace epics::pvAccess;

exampleLink/src/exampleLink.h

@@ -8,15 +8,11 @@
  * @author mrk
  * @date 2013.08.02
  */
-#ifndef EXAMPLELINK_H
-#define EXAMPLELINK_H
+#ifndef EXAMPLEPVADOUBLEARRAYGET_H
+#define EXAMPLEPVADOUBLEARRAYGET_H
 
-#ifdef epicsExportSharedSymbols
-#   define examplelinkEpicsExportSharedSymbols
-#   undef epicsExportSharedSymbols
-#endif
+#include <shareLib.h>
 
-//#include <shareLib.h>
 #include <pv/timeStamp.h>
 #include <pv/pvTimeStamp.h>
 #include <pv/alarm.h>
@@ -26,14 +22,6 @@
 #include <pv/pvAccess.h>
 #include <pv/serverContext.h>
 
-
-#ifdef examplelinkEpicsExportSharedSymbols
-#   define epicsExportSharedSymbols
-#	undef examplelinkEpicsExportSharedSymbols
-#   include <shareLib.h>
-#endif
-
-
 namespace epics { namespace pvDatabase { 
 
 
@@ -102,4 +90,4 @@ private:
 
 }}
 
-#endif  /* EXAMPLELINK_H */
+#endif  /* EXAMPLEPVADOUBLEARRAYGET_H */

exampleLink/src/exampleLinkInclude.dbd

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

exampleLink/src/exampleLinkRegister.cpp

@@ -27,16 +27,15 @@
 #include <epicsThread.h>
 #include <iocsh.h>
 
+#include <epicsExport.h>
+
 #include <pv/pvIntrospect.h>
 #include <pv/pvData.h>
 #include <pv/standardField.h>
 #include <pv/standardPVField.h>
 #include <pv/pvAccess.h>
 #include <pv/pvDatabase.h>
-
-#include <epicsExport.h>
-
-#include <exampleLink.h>
+#include <pv/exampleLink.h>
 
 using namespace epics::pvData;
 using namespace epics::pvAccess;
@@ -83,7 +82,4 @@ static void exampleLinkRegister(void)
         iocshRegister(&exampleLinkFuncDef, exampleLinkCallFunc);
     }
 }
-
-extern "C" {
-    epicsExportRegistrar(exampleLinkRegister);
-}
+epicsExportRegistrar(exampleLinkRegister);