have separate PVA variable to select softIocPVA instead of softIoc

This commit is contained in:
2021-07-21 10:18:18 +02:00
parent e2289cfd9b
commit bcd85a8304

View File

@@ -81,6 +81,7 @@ R3_15 = strncmp(EPICS,"R3.15.",6)==0
R3_16 = strncmp(EPICS,"R3.16.",6)==0
R3 = strncmp(EPICS,"R3.",3)==0
R7 = strncmp(EPICS,"R7.",3)==0
PVA = R7&&VX6
# Time server (must be set before loading iocCoreLibrary.munch for 3.14.12)
# Need EPICS_TS_FORCE_NTPTIME for 7.0
@@ -91,7 +92,7 @@ putenv "EPICS_TS_FORCE_NTPTIME=YES"
# 3.13: "iocCore"
# 3.14: "iocCoreLibrary.munch"
# 3.15+: "softIoc.munch" (could do this from 3.14.12 on)
EPICS_APP = R3_13 ? "iocCore" : R3_14 ? "iocCoreLibrary.munch" : R7 ? "softIocPVA.munch" : "softIoc.munch"
EPICS_APP = R3_13 ? "iocCore" : R3_14 ? "iocCoreLibrary.munch" : PVA ? "softIocPVA.munch" : "softIoc.munch"
sprintf STRINGBUFFER, "/epics/base-%s/bin/%s/%s", EPICS+1, EPICS_HOST_ARCH, EPICS_APP
printf "loading %s\n",STRINGBUFFER
ld 0, 0, STRINGBUFFER
@@ -113,10 +114,10 @@ execute STRINGBUFFER
iocLogInit
errlogPrintf "Starting EPICS %s\n", EPICS
sprintf STRINGBUFFER, R3_13||R3_14 ? ";" : "dbLoadDatabase \"/epics/base-%s/dbd/softIoc%s.dbd\"", EPICS+1, R7 ? "PVA" : ""
sprintf STRINGBUFFER, R3_13||R3_14 ? ";" : "dbLoadDatabase \"/epics/base-%s/dbd/softIoc%s.dbd\"", EPICS+1, PVA ? "PVA" : ""
execute STRINGBUFFER
sprintf STRINGBUFFER, R3_13||R3_14 ? ";" : "softIoc%s_registerRecordDeviceDriver pdbbase", R7 ? "PVA" : ""
sprintf STRINGBUFFER, R3_13||R3_14 ? ";" : "softIoc%s_registerRecordDeviceDriver pdbbase", PVA ? "PVA" : ""
execute STRINGBUFFER
# load "require"