diff --git a/src/makeBaseApp/Makefile b/src/makeBaseApp/Makefile index b2d8c58f3..3bacada5f 100644 --- a/src/makeBaseApp/Makefile +++ b/src/makeBaseApp/Makefile @@ -30,6 +30,8 @@ TEMPLATES += top/exampleApp/Db/Makefile TEMPLATES += top/exampleApp/Db/dbExample1.db TEMPLATES += top/exampleApp/Db/dbExample2.db TEMPLATES += top/exampleApp/Db/dbSubExample.db +TEMPLATES += top/exampleApp/Db/user.substitutions +TEMPLATES += top/exampleApp/Db/userHost.substitutions TEMPLATES += top/exampleApp/src/Makefile TEMPLATES += top/exampleApp/src/xxxRecord.dbd TEMPLATES += top/exampleApp/src/xxxRecord.c @@ -50,7 +52,6 @@ TEMPLATES += top/exampleBoot/nfsCommands@RTEMS TEMPLATES += top/exampleBoot/ioc/Makefile@Common TEMPLATES += top/exampleBoot/ioc/Makefile@vxWorks TEMPLATES += top/exampleBoot/ioc/st.cmd@Common -TEMPLATES += top/exampleBoot/ioc/st.cmd@Cross TEMPLATES += top/exampleBoot/ioc/st.cmd@vxWorks TEMPLATES += top/exampleBoot/ioc/st.cmd@RTEMS TEMPLATES += top/exampleBoot/ioc/README@Common diff --git a/src/makeBaseApp/top/exampleApp/Db/Makefile b/src/makeBaseApp/top/exampleApp/Db/Makefile index 035b9f06e..c285af85a 100644 --- a/src/makeBaseApp/top/exampleApp/Db/Makefile +++ b/src/makeBaseApp/top/exampleApp/Db/Makefile @@ -13,6 +13,8 @@ include $(TOP)/configure/CONFIG DB += dbExample1.db DB += dbExample2.db DB += dbSubExample.db +DB += user.substitutions +DB += userHost.substitutions #---------------------------------------------------- # If .db template is not named *.template add diff --git a/src/makeBaseApp/top/exampleApp/Db/user.substitutions b/src/makeBaseApp/top/exampleApp/Db/user.substitutions new file mode 100644 index 000000000..9eb54e4e5 --- /dev/null +++ b/src/makeBaseApp/top/exampleApp/Db/user.substitutions @@ -0,0 +1,12 @@ +# Example substitutions file + +file "db/dbExample1.db" { + { user = "_USER_" } +} + +file db/dbExample2.db { + pattern { user, no, scan } + { "_USER_", 1, "1 second" } + { "_USER_", 2, "2 second" } + { "_USER_", 3, "5 second" } +} diff --git a/src/makeBaseApp/top/exampleApp/Db/userHost.substitutions b/src/makeBaseApp/top/exampleApp/Db/userHost.substitutions new file mode 100644 index 000000000..5139275c4 --- /dev/null +++ b/src/makeBaseApp/top/exampleApp/Db/userHost.substitutions @@ -0,0 +1,12 @@ +# Example substitutions file + +file "db/dbExample1.db" { + { user = "_USER_Host" } +} + +file db/dbExample2.db { + pattern { user, no, scan } + { "_USER_Host", 1, "1 second" } + { "_USER_Host", 2, "2 second" } + { "_USER_Host", 3, "5 second" } +} diff --git a/src/makeBaseApp/top/exampleBoot/ioc/st.cmd@Common b/src/makeBaseApp/top/exampleBoot/ioc/st.cmd@Common index fa9ab7f09..cf29b046a 100644 --- a/src/makeBaseApp/top/exampleBoot/ioc/st.cmd@Common +++ b/src/makeBaseApp/top/exampleBoot/ioc/st.cmd@Common @@ -12,10 +12,7 @@ dbLoadDatabase("dbd/_APPNAME_.dbd") _CSAFEAPPNAME__registerRecordDeviceDriver(pdbbase) ## Load record instances -dbLoadRecords("db/dbExample1.db","user=_USER_Host") -dbLoadRecords("db/dbExample2.db","user=_USER_Host,no=1,scan=1 second") -dbLoadRecords("db/dbExample2.db","user=_USER_Host,no=2,scan=2 second") -dbLoadRecords("db/dbExample2.db","user=_USER_Host,no=3,scan=5 second") +dbLoadTemplate "db/userHost.substitutions" dbLoadRecords("db/dbSubExample.db","user=_USER_Host") ## Set this to see messages from mySub diff --git a/src/makeBaseApp/top/exampleBoot/ioc/st.cmd@Cross b/src/makeBaseApp/top/exampleBoot/ioc/st.cmd@Cross deleted file mode 100644 index 7f33928bd..000000000 --- a/src/makeBaseApp/top/exampleBoot/ioc/st.cmd@Cross +++ /dev/null @@ -1,26 +0,0 @@ -#!../../bin/_ARCH_/_APPNAME_ - -## You may have to change _APPNAME_ to something else -## everywhere it appears in this file - -#< envPaths - -## Register all support components -dbLoadDatabase("../../dbd/_APPNAME_.dbd",0,0) -_CSAFEAPPNAME__registerRecordDeviceDriver(pdbbase) - -## Load record instances -dbLoadRecords("../../db/dbExample1.db","user=_USER_Host") -dbLoadRecords("../../db/dbExample2.db","user=_USER_Host,no=1,scan=1 second") -dbLoadRecords("../../db/dbExample2.db","user=_USER_Host,no=2,scan=2 second") -dbLoadRecords("../../db/dbExample2.db","user=_USER_Host,no=3,scan=5 second") -dbLoadRecords("../../db/dbSubExample.db","user=_USER_Host") - -## Set this to see messages from mySub -#var mySubDebug 1 - -iocInit() - -## Start any sequence programs -#seq sncExample,"user=_USER_" - diff --git a/src/makeBaseApp/top/exampleBoot/ioc/st.cmd@RTEMS b/src/makeBaseApp/top/exampleBoot/ioc/st.cmd@RTEMS index 061e2e3c9..9d67c1b0a 100644 --- a/src/makeBaseApp/top/exampleBoot/ioc/st.cmd@RTEMS +++ b/src/makeBaseApp/top/exampleBoot/ioc/st.cmd@RTEMS @@ -10,10 +10,7 @@ dbLoadDatabase("dbd/_APPNAME_.dbd") _CSAFEAPPNAME__registerRecordDeviceDriver(pdbbase) ## Load record instances -dbLoadRecords("db/dbExample1.db","user=_USER_") -dbLoadRecords("db/dbExample2.db","user=_USER_,no=1,scan=1 second") -dbLoadRecords("db/dbExample2.db","user=_USER_,no=2,scan=2 second") -dbLoadRecords("db/dbExample2.db","user=_USER_,no=3,scan=5 second") +dbLoadTemplate "db/user.substitutions" dbLoadRecords("db/dbSubExample.db","user=_USER_") ## Set this to see messages from mySub diff --git a/src/makeBaseApp/top/exampleBoot/ioc/st.cmd@vxWorks b/src/makeBaseApp/top/exampleBoot/ioc/st.cmd@vxWorks index 6968ffff4..243fc03ec 100644 --- a/src/makeBaseApp/top/exampleBoot/ioc/st.cmd@vxWorks +++ b/src/makeBaseApp/top/exampleBoot/ioc/st.cmd@vxWorks @@ -22,10 +22,7 @@ dbLoadDatabase("dbd/_APPNAME_.dbd",0,0) _CSAFEAPPNAME__registerRecordDeviceDriver(pdbbase) ## Load record instances -dbLoadRecords("db/dbExample1.db","user=_USER_") -dbLoadRecords("db/dbExample2.db","user=_USER_,no=1,scan=1 second") -dbLoadRecords("db/dbExample2.db","user=_USER_,no=2,scan=2 second") -dbLoadRecords("db/dbExample2.db","user=_USER_,no=3,scan=5 second") +dbLoadTemplate "db/user.substitutions" dbLoadRecords("db/dbSubExample.db","user=_USER_") ## Set this to see messages from mySub