Fetch epicsEnvVars data from CONFIG_ENV in EPICS base

RELEASE_NOTES

@@ -4,6 +4,20 @@ Release Notes for iocStats
 
 # Releases
 
+## Unreleased
+
+**DEPRECATION NOTE** Due to fetching variables directly from CONFIG_ENV from EPICS base, some
+PV names have changes. For example, we are changing `$(IOCNAME):CA_CONN_TIME` to
+`$(IOCNAME):CA_CONN_TMO` in order to match the name of the environment variable that
+is the origin of the PV; see `siteEnvVarAliases.template` for the full list.
+
+These PVs are to be considered deprecated and will be removed entirely in a future
+release.
+
+* Changes by Simon Rose:
+  - Fetch CONFIG_ENV variables from EPICS base for record population in
+    `iocAdminSoft*` .db files
+
 ## iocStats-R3-2-0:
 
 **NOTE** Please note that as of 3-2-0, there is a pre-commit (https://pre-commit.com/) workflow that

iocAdmin/Db/Makefile

@@ -12,7 +12,6 @@ include $(TOP)/configure/CONFIG
 # databases, templates, substitutions like this
 #
 DB += siteEnvVars.db
-DB += epicsEnvVars.db
 DB += iocAdminScanMon.db
 DB += ioc.db
 DB += iocRTOS.db
@@ -38,17 +37,17 @@ include $(TOP)/configure/RULES
 #----------------------------------------
 #  ADD RULES AFTER THIS LINE
 
-$(COMMON_DIR)/iocAdminRTEMS.db:   $(COMMON_DIR)/iocAdminScanMon.db $(COMMON_DIR)/epicsEnvVars.db $(COMMON_DIR)/siteEnvVars.db
+$(COMMON_DIR)/iocAdminRTEMS.db:   $(COMMON_DIR)/iocAdminScanMon.db $(COMMON_DIR)/siteEnvVars.db
 
-$(COMMON_DIR)/iocAdminSoft.db:    $(COMMON_DIR)/iocAdminScanMon.db $(COMMON_DIR)/epicsEnvVars.db $(COMMON_DIR)/siteEnvVars.db
+$(COMMON_DIR)/iocAdminSoft.db:    $(COMMON_DIR)/iocAdminScanMon.db $(COMMON_DIR)/siteEnvVars.db
 
-$(COMMON_DIR)/iocAdminVxWorks.db: $(COMMON_DIR)/iocAdminScanMon.db $(COMMON_DIR)/epicsEnvVars.db $(COMMON_DIR)/siteEnvVars.db
+$(COMMON_DIR)/iocAdminVxWorks.db: $(COMMON_DIR)/iocAdminScanMon.db $(COMMON_DIR)/siteEnvVars.db
 
-$(COMMON_DIR)/siteEnvVars.substitutions: $(EPICS_BASE)/configure/CONFIG_SITE_ENV
-	@echo Expanding siteEnvVars.substitutions from CONFIG_SITE_ENV....
+$(COMMON_DIR)/siteEnvVars.substitutions: $(EPICS_BASE)/configure/CONFIG_SITE_ENV $(EPICS_BASE)/configure/CONFIG_ENV
+	@echo Expanding siteEnvVars.substitutions from $^....
 	@echo file iocEnvVar.template > $@
 	@echo { >> $@
 	@echo pattern >> $@
 	@echo { ENVNAME, ENVVAR, ENVTYPE } >> $@
-	@sed -n "s/^EPICS_\([A-Z_]*\).*/{\1, EPICS_\1, epics}/p" $< >> $@
+	@sed -n "s/^EPICS_\([A-Z_]*\).*/{\1, EPICS_\1, epics}/p" $^ >> $@
 	@echo } >> $@

iocAdmin/Db/iocAdminRTEMS.substitutions

@@ -32,11 +32,16 @@ file iocRTEMSOnly.template
 pattern { IOCNAME }
         { "$(IOC)"  }
 }
-file epicsEnvVars.db
+file siteEnvVars.db
 {
 pattern { IOCNAME, }
         { "$(IOC)" }
 }
+file siteEnvVarAliases.template
+{
+pattern { IOCNAME  }
+        { "$(IOC)" }
+}
 file iocCluster.template
 {
 #                   Pool   Size

iocAdmin/Db/iocAdminSoft.substitutions

@@ -22,14 +22,15 @@ file iocAdminScanMon.db
         { IOCNAME }
         { "$(IOC)" }
 }
-file epicsEnvVars.db
+
+file siteEnvVars.db
 {
 pattern { IOCNAME, }
-	{ "$(IOC)" }
+        { "$(IOC)" }
 }
 
-file siteEnvVars.db
+file siteEnvVarAliases.template
 {
-pattern { IOCNAME, }
-	{ "$(IOC)" }
+pattern { IOCNAME  }
+        { "$(IOC)" }
 }

iocAdmin/Db/iocAdminVxWorks.substitutions

@@ -32,11 +32,16 @@ file iocVxWorksOnly.template
 pattern { IOCNAME , DAT_MBUF_FLNK     }
         { "$(IOC)"  , "$(IOC):CLUST_0_0_0"}
 }
-file epicsEnvVars.db
+file siteEnvVars.db
 {
 pattern { IOCNAME, }
         { "$(IOC)" }
 }
+file siteEnvVarAliases.template
+{
+pattern { IOCNAME  }
+        { "$(IOC)" }
+}
 file iocCluster.template
 {
 #                   Pool   Size

iocAdmin/Db/siteEnvVarAliases.template

@@ -0,0 +1,14 @@
+# These are deprecated aliases to maintain consistency with old record names
+
+alias("$(IOCNAME):CA_CONN_TMO", "$(IOCNAME):CA_CONN_TIME")
+alias("$(IOCNAME):CA_AUTO_ADDR_LIST", "$(IOCNAME):CA_AUTO_ADDR")
+alias("$(IOCNAME):CA_REPEATER_PORT", "$(IOCNAME):CA_RPTR_PORT")
+alias("$(IOCNAME):CA_SERVER_PORT", "$(IOCNAME):CA_SRVR_PORT")
+alias("$(IOCNAME):CA_MAX_ARRAY_BYTES", "$(IOCNAME):CA_MAX_ARRAY")
+alias("$(IOCNAME):CA_MAX_SEARCH_PERIOD", "$(IOCNAME):CA_SRCH_TIME")
+alias("$(IOCNAME):CA_BEACON_PERIOD", "$(IOCNAME):CA_BEAC_TIME")
+alias("$(IOCNAME):CAS_SERVER_PORT", "$(IOCNAME):CAS_SRVR_PORT")
+alias("$(IOCNAME):CAS_AUTO_BEACON_ADDR_LIST", "$(IOCNAME):CAS_AUTO_ADDR")
+alias("$(IOCNAME):CAS_BEACON_ADDR_LIST", "$(IOCNAME):CAS_ADDR_LIST")
+alias("$(IOCNAME):CAS_INTF_ADDR_LIST", "$(IOCNAME):CAS_ADDR_INTF_LIST")
+alias("$(IOCNAME):CAS_IGNORE_ADDR_LIST", "$(IOCNAME):CAS_ADDR_IGNORE_LIST")