From ce4a72a83a4a9b16f54cbab18765ecd3d2540f0b Mon Sep 17 00:00:00 2001
From: Dirk Zimoch <dirk.zimoch@psi.ch>
Date: Wed, 8 Feb 2023 17:28:14 +0100
Subject: [PATCH] use softIoc for 3.14 too

---
 startup.script_common | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/startup.script_common b/startup.script_common
index 40d9a62..1ff331c 100644
--- a/startup.script_common
+++ b/startup.script_common
@@ -49,9 +49,8 @@ putenv "EPICS_TS_FORCE_NTPTIME=YES"
 
 # Load EPICS system core (different names for different EPICS versions)
 # 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" : PVA ? "softIocPVA.munch" : "softIoc.munch"
+# 3.14+: "softIoc.munch"
+EPICS_APP = R3_13 ? "iocCore" : 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
@@ -74,10 +73,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, PVA ? "PVA" : ""
+sprintf STRINGBUFFER, R3_13 ? ";" : "dbLoadDatabase \"/epics/base-%s/dbd/softIoc%s.dbd\"", EPICS+1, PVA ? "PVA" : ""
 execute STRINGBUFFER
 
-sprintf STRINGBUFFER, R3_13||R3_14 ? ";" : "softIoc%s_registerRecordDeviceDriver pdbbase", PVA ? "PVA" : ""
+sprintf STRINGBUFFER, R3_13 ? ";" : "softIoc%s_registerRecordDeviceDriver pdbbase", PVA ? "PVA" : ""
 execute STRINGBUFFER
 
 # load "require"
@@ -89,7 +88,8 @@ sprintf STRINGBUFFER, "%s/lib/%s/requireLib.munch", getenv("require_DIR"), EPICS
 ld 0, 0, STRINGBUFFER
 
 #load standard drivers (allow user to specify version in environment variable)
-require "base", getenv("base_VERSION") ? getenv("base_VERSION") : "ifexists"
+require "base", getenv("base_VERSION") ? getenv("base_VERSION") : R3_13 ? "ifexists" : "none"
+
 registerModule "require", getenv("require_VERSION"), getenv("require_DIR")
 sprintf STRINGBUFFER, R3_13 ? ";" : "require_registerRecordDeviceDriver pdbbase"
 execute STRINGBUFFER
@@ -97,7 +97,7 @@ require "utilities", getenv("utilities_VERSION")
 require "misc", getenv("misc_VERSION")
 
 # caPutLog
-require "caPutLog", getenv("caPutLog_VERSION")?getenv("caPutLog_VERSION"):"ifexists"
+require "caPutLog", getenv("caPutLog_VERSION") ? getenv("caPutLog_VERSION") : "ifexists"
 
 # EPICS 3.13 needs this to not use synchronized timestamps
 sprintf STRINGBUFFER, R3_13 ? "TSconfigure(0,10,10,18323,18322,250,1)" : ";"