Minor changes to makeBaseApp templates

modules/database/src/template/top/exampleApp/Makefile

@@ -1,8 +1,14 @@
+# Makefile at top of application tree
 TOP = ..
 include $(TOP)/configure/CONFIG
-DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *src*))
-DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *Src*))
-DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *db*))
-DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *Db*))
-include $(TOP)/configure/RULES_DIRS
 
+# Directories to be built, in any order.
+# You can replace these wildcards with an explicit list
+DIRS += $(wildcard src* *Src*)
+DIRS += $(wildcard db* *Db*)
+
+# If the build order matters, add dependency rules like this,
+# which specifies that xxxSrc must be built after src:
+#xxxSrc_DEPEND_DIRS += src
+
+include $(TOP)/configure/RULES_DIRS

modules/database/src/template/top/exampleApp/src/dev_APPNAME_Version.c

@@ -33,6 +33,6 @@ static long read_string(lsiRecord *prec)
 }
 
 static lsidset dev_CSAFEAPPNAME_Version = {
-    5, NULL, NULL, NULL, NULL, read_string
+	{5, NULL, NULL, NULL, NULL}, read_string
 };
 epicsExportAddress(dset,dev_CSAFEAPPNAME_Version);

modules/database/src/template/top/exampleBoot/ioc/st.cmd@Common

@@ -17,10 +17,10 @@ dbLoadRecords "db/_APPNAME_Version.db", "user=_USER_"
 dbLoadRecords "db/dbSubExample.db", "user=_USER_"
 
 #- Set this to see messages from mySub
-#var mySubDebug 1
+#-var mySubDebug 1
 
 #- Run this to trace the stages of iocInit
-#traceIocInit
+#-traceIocInit
 
 cd "${TOP}/iocBoot/${IOC}"
 iocInit

modules/database/src/template/top/exampleBoot/ioc/st.cmd@RTEMS

@@ -15,10 +15,10 @@ dbLoadRecords("db/_APPNAME_Version.db", "user=_USER_")
 dbLoadRecords("db/dbSubExample.db", "user=_USER_")
 
 #- Set this to see messages from mySub
-#var mySubDebug 1
+#-var mySubDebug 1
 
 #- Run this to trace the stages of iocInit
-#traceIocInit
+#-traceIocInit
 
 iocInit
 

modules/database/src/template/top/exampleBoot/ioc/st.cmd@vxWorks

@@ -24,10 +24,10 @@ dbLoadRecords "db/_APPNAME_Version.db", "user=_USER_"
 dbLoadRecords "db/dbSubExample.db", "user=_USER_"
 
 #- Set this to see messages from mySub
-#mySubDebug = 1
+#-mySubDebug = 1
 
 #- Run this to trace the stages of iocInit
-#traceIocInit
+#-traceIocInit
 
 cd startup
 iocInit

modules/database/src/template/top/iocApp/Makefile

@@ -1,8 +1,14 @@
+# Makefile at top of application tree
 TOP = ..
 include $(TOP)/configure/CONFIG
-DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *src*))
-DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *Src*))
-DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *db*))
-DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *Db*))
-include $(TOP)/configure/RULES_DIRS
 
+# Directories to be built, in any order.
+# You can replace these wildcards with an explicit list
+DIRS += $(wildcard src* *Src*)
+DIRS += $(wildcard db* *Db*)
+
+# If the build order matters, add dependency rules like this,
+# which specifies that xxxSrc must be built after src:
+#xxxSrc_DEPEND_DIRS += src
+
+include $(TOP)/configure/RULES_DIRS

modules/database/src/template/top/iocBoot/ioc/st.cmd@Common

@@ -12,7 +12,7 @@ dbLoadDatabase "dbd/_APPNAME_.dbd"
 _CSAFEAPPNAME__registerRecordDeviceDriver pdbbase
 
 ## Load record instances
-#dbLoadRecords("db/xxx.db","user=_USER_")
+#dbLoadRecords("db/_APPNAME_.db","user=_USER_")
 
 cd "${TOP}/iocBoot/${IOC}"
 iocInit

modules/database/src/template/top/iocBoot/ioc/st.cmd@Cross

@@ -10,7 +10,7 @@ dbLoadDatabase "../../dbd/_APPNAME_.dbd"
 _CSAFEAPPNAME__registerRecordDeviceDriver(pdbbase) 
 
 ## Load record instances
-dbLoadRecords("../../db/_APPNAME_.db","user=_USER_")
+#dbLoadRecords("../../db/_APPNAME_.db","user=_USER_")
 
 iocInit()
 

modules/database/src/template/top/supportApp/Makefile

@@ -1,7 +1,14 @@
+# Makefile at top of application tree
 TOP = ..
 include $(TOP)/configure/CONFIG
-DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *src*))
-DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *Src*))
-DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *db*))
-DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *Db*))
+
+# Directories to be built, in any order.
+# You can replace these wildcards with an explicit list
+DIRS += $(wildcard src* *Src*)
+DIRS += $(wildcard db* *Db*)
+
+# If the build order matters, add dependency rules like this,
+# which specifies that xxxSrc must be built after src:
+#xxxSrc_DEPEND_DIRS += src
+
 include $(TOP)/configure/RULES_DIRS