From 5dff3bc23b9bd2ef5df8cd5b654a89233d00bcc2 Mon Sep 17 00:00:00 2001 From: Koennecke Mark Date: Fri, 3 Jun 2016 16:52:02 +0200 Subject: [PATCH] First compile on the ESS EPICS environment. Success for the motor code. Still missing: * scaler support * cleanup of Makefile --- configure/CONFIG_SITE | 2 ++ configure/RELEASE | 18 +++++++++--------- sinqEPICSApp/src/Makefile | 14 ++++++++++---- sinqEPICSApp/src/sinq.dbd | 29 ++++++++++++++--------------- 4 files changed, 35 insertions(+), 28 deletions(-) diff --git a/configure/CONFIG_SITE b/configure/CONFIG_SITE index aa5f0b5..1afa2e0 100644 --- a/configure/CONFIG_SITE +++ b/configure/CONFIG_SITE @@ -32,3 +32,5 @@ INSTALL_LOCATION=/afs/psi.ch/project/sinqdev/sinqepicsapp # You must rebuild in the iocBoot directory for this to # take effect. #IOCS_APPL_TOP = +STATIC_BUILD=NO +SHARED_LIBRARIES=YES diff --git a/configure/RELEASE b/configure/RELEASE index d80c2fd..bf0eebc 100644 --- a/configure/RELEASE +++ b/configure/RELEASE @@ -25,16 +25,16 @@ TEMPLATE_TOP=$(EPICS_BASE)/templates/makeBaseApp/top #SNCSEQ=$(EPICS_BASE)/../modules/soft/seq # EPICS_BASE usually appears last so other apps can override stuff: -EPICS_BASE=/usr/local/epics +EPICS_BASE=/opt/epics/bases/base-3.14.12.5 # Set RULES here if you want to take build rules from somewhere # other than EPICS_BASE: #RULES=/path/to/epics/support/module/rules/x-y -MOTOR=/usr/local/epics/support/motor-6-7 -ASYN=/usr/local/epics/support/asyn-4-18 -STD=/usr/local/epics/support/std-3-1 -ANC=/usr/local/epics/anc350v17 -STREAMS=/usr/local/epics/support/StreamDevice-2-6 -LAKESHORE336=/usr/local/epics/support/lakeshore336 -BUSY=/usr/local/epics/support/busy-1-4 -OXINSTCRYOJET=/usr/local/epics/support/OxInstCryojet-2-18-3 +MOTOR=/opt/epics/modules/motor/6.10.0/3.14.12.5 +ASYN=/opt/epics/modules/asyn/4.27.0/3.14.12.5 +#STD=/usr/local/epics/support/std-3-1 +#ANC=/usr/local/epics/anc350v17 +#STREAMS=/opt/epics/modules/streamdevice/2.6.0/3.14.12.5 +#LAKESHORE336=/usr/local/epics/support/lakeshore336 +BUSY=/opt/epics/modules/busy/1.6.0/3.14.12.5 +#OXINSTCRYOJET=/usr/local/epics/support/OxInstCryojet-2-18-3 diff --git a/sinqEPICSApp/src/Makefile b/sinqEPICSApp/src/Makefile index 9324de3..c14dfb9 100644 --- a/sinqEPICSApp/src/Makefile +++ b/sinqEPICSApp/src/Makefile @@ -17,15 +17,21 @@ sinqEPICS_DBD += base.dbd # Include dbd files from all support applications: sinqEPICS_DBD += sinq.dbd -sinqEPICS_DBD += pmacAsynIPPort.dbd pmacAsynMotorPort.dbd +#sinqEPICS_DBD += pmacAsynIPPort.dbd pmacAsynMotorPort.dbd # Add all the support libraries needed by this IOC -sinqEPICS_LIBS += motor asyn std anc350 anc350AsynMotor stream busy +sinqEPICS_LIBS += motor asyn busy + +# Add to the include paths +USR_INCLUDES += -I /opt/epics/modules/asyn/4.21.0/3.14.12.5/include +USR_INCLUDES += -I /opt/epics/modules/motor/6.10.0/3.14.12.5/include + +USR_LDFLAGS += -L /opt/epics/modules/motor/6.10.0/3.14.12.5/lib # sinqEPICS_registerRecordDeviceDriver.cpp derives from sinqEPICS.dbd sinqEPICS_SRCS += sinqEPICS_registerRecordDeviceDriver.cpp -sinqEPICS_SRCS += EL734Driver.cpp devScalerEL737.c pmacAsynIPPort.c -sinqEPICS_SRCS += pmacController.cpp pmacAxis.cpp +sinqEPICS_SRCS += EL734Driver.cpp +#sinqEPICS_SRCS += devScalerEL737.c sinqEPICS_SRCS += NanotecDriver.cpp stptok.cpp diff --git a/sinqEPICSApp/src/sinq.dbd b/sinqEPICSApp/src/sinq.dbd index f844a03..948278a 100644 --- a/sinqEPICSApp/src/sinq.dbd +++ b/sinqEPICSApp/src/sinq.dbd @@ -3,21 +3,20 @@ #--------------------------------------------- registrar(EL734Register) registrar(NanotecRegister) -addpath "/usr/local/epics/support/asyn-4-18/dbd" -addpath "/usr/local/epics/dbd" -addpath "/usr/local/epics/support/motor-6-7/dbd" -addpath "/usr/local/epics/support/std-3-1/dbd" -addpath "/usr/local/epics/anc350v17/dbd" -include "drvAsynIPPort.dbd" -include "motorRecord.dbd" -include "motorSupport.dbd" -include "anc350AsynMotor.dbd" +addpath "/opt/epics/modules/asyn/4.27.0/3.14.12.5/dbd" +addpath "/opt/epics/bases/base-3.14.12.5/dbd" +addpath "/opt/epics/modules/motor/6.10.0/3.14.12.5/dbd" +#addpath "/usr/local/epics/support/std-3-1/dbd" +#addpath "/usr/local/epics/anc350v17/dbd" +include "asyn.dbd" +include "motor.dbd" +#include "motorSupport.dbd" -include "scalerRecord.dbd" -device(scaler,INST_IO,devScalerEL737,"asynScalerEL737") +#include "scalerRecord.dbd" +#device(scaler,INST_IO,devScalerEL737,"asynScalerEL737") #--------- For lakeshore -addpath "/usr/local/epics/support/StreamDevice-2-6/dbd" -include "stream.dbd" -addpath "/usr/local/epics/support/busy-1-4/dbd" -include "busySupport.dbd" +#addpath "/opt/epics/modules/streamdevice/2.6.0/3.14.12.5/dbd" +#include "streamdevice.dbd" +addpath "/opt/epics/modules/busy/1.6.0/3.14.12.5/dbd" +include "busy.dbd"