Skip to content
Snippets Groups Projects
Commit b350c920 authored by Lucas Magalhães's avatar Lucas Magalhães
Browse files

Merge branch 'E3-927' into 'master'

E3-927: Remove IOCNAME:exit PV from standard E3 iocs

See merge request e3/e3-require!97
parents 3c89a585 799e9870
No related branches found
No related tags found
No related merge requests found
...@@ -17,6 +17,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ...@@ -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. * Fixed issue where updated dependencies of substitution files did not retrigger a .db expansion.
### Other changes ### 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, * Patch system now applies all patches in the `patch/` directory. Versioning for patches should be handled by git,
not by require. not by require.
* The loop over `EPICSVERSION` in `driver.makefile` has been removed; various other cleanup has been performed. * The loop over `EPICSVERSION` in `driver.makefile` has been removed; various other cleanup has been performed.
......
...@@ -28,3 +28,12 @@ record (stringin, "$(REQUIRE_IOC):$(MODULE)_VER") ...@@ -28,3 +28,12 @@ record (stringin, "$(REQUIRE_IOC):$(MODULE)_VER")
field (VAL, "$(VERSION)") field (VAL, "$(VERSION)")
field (PINI, "YES") 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)
}
...@@ -118,9 +118,6 @@ trap "softIoc_end ${IOC_STARTUP}" EXIT HUP INT TERM ...@@ -118,9 +118,6 @@ trap "softIoc_end ${IOC_STARTUP}" EXIT HUP INT TERM
printf "# // Set REQUIRE_IOC for its internal PVs\n" printf "# // Set REQUIRE_IOC for its internal PVs\n"
printf "epicsEnvSet REQUIRE_IOC \"%s\"\n" "${REQUIRE_IOC}" printf "epicsEnvSet REQUIRE_IOC \"%s\"\n" "${REQUIRE_IOC}"
printf "#\n" 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 "# // 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 "epicsEnvSet E3_IOCSH_TOP \"%s\"\n" "${IOCSH_TOP}"
printf "#\n" printf "#\n"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment