diff --git a/CHANGELOG.md b/CHANGELOG.md index 0210157cc3ea09ba22b3575d7cc1238e2c9afdf6..091964fb76adc46492045af248628073dc0ede8a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 * Fixed issue where updated dependencies of substitution files did not retrigger a .db expansion. ### Other changes +* Remove `IOCNAME:exit` PV. Stop loading `softIocExit.db` and now it's require that exposes the `BaseVersion` PV. * Patch system now applies all patches in the `patch/` directory. Versioning for patches should be handled by git, not by require. * The loop over `EPICSVERSION` in `driver.makefile` has been removed; various other cleanup has been performed. diff --git a/require-ess/Db/moduleversion.template b/require-ess/Db/moduleversion.template index 51955964a7ee450620d4be678a2925ae5b786fa7..985de7aeb3a6b49dca5d1af0136117eef39529a2 100644 --- a/require-ess/Db/moduleversion.template +++ b/require-ess/Db/moduleversion.template @@ -28,3 +28,12 @@ record (stringin, "$(REQUIRE_IOC):$(MODULE)_VER") field (VAL, "$(VERSION)") field (PINI, "YES") } + +record(stringin,"$(REQUIRE_IOC):BaseVersion") +{ + field (DESC,"EPICS Base Version") + field (DTYP,"getenv") + field (INP,"@EPICS_VERSION_FULL") + field (PINI,"YES") + field (DISP,1) +} diff --git a/require-ess/tools/iocsh b/require-ess/tools/iocsh index c14f76e9977310bf03cf75b2c64b80d5f8f52f13..a23ad25ab8acb75e24b5d4b4bbe47b68050913b6 100644 --- a/require-ess/tools/iocsh +++ b/require-ess/tools/iocsh @@ -118,9 +118,6 @@ trap "softIoc_end ${IOC_STARTUP}" EXIT HUP INT TERM printf "# // Set REQUIRE_IOC for its internal PVs\n" printf "epicsEnvSet REQUIRE_IOC \"%s\"\n" "${REQUIRE_IOC}" printf "#\n" - printf "# // Enable an exit subroutine for sotfioc\n" - printf "dbLoadRecords \"%s/db/softIocExit.db\" \"IOC=%s\"\n" "${EPICS_BASE}" "${REQUIRE_IOC}" - printf "#\n" printf "# // Set E3_IOCSH_TOP for the absolute path where %s is executed.\n" "${SC_SCRIPTNAME}" printf "epicsEnvSet E3_IOCSH_TOP \"%s\"\n" "${IOCSH_TOP}" printf "#\n"