Simplify virtual-linac build procedure. Sequence programs are now enabled

simply by adding a SNCSEQ entry to configure/RELEASE.

src/makeBaseApp/Makefile

@@ -84,7 +84,8 @@ TEMPLATES += top/vlinacApp/src/Makefile
 TEMPLATES += top/vlinacApp/src/autoControl.st
 TEMPLATES += top/vlinacApp/src/beamTrajectory.st
 TEMPLATES += top/vlinacApp/src/stabilizer.st
-TEMPLATES += top/vlinacApp/src/vlinacInclude.dbd
+TEMPLATES += top/vlinacApp/src/vlinacBase.dbd
+TEMPLATES += top/vlinacApp/src/vlinacSeq.dbd
 TEMPLATES += top/vlinacApp/src/vlinacMain.cpp
 TEMPLATES += top/vlinacApp/Db/Makefile
 TEMPLATES += top/vlinacApp/Db/xxMedmDemo.db

src/makeBaseApp/top/vlinacApp/misc/README

@@ -13,19 +13,6 @@ part of base. The following steps must be accomplished:
     configure/RELEASE and define the link to the location
     where the sequencer was installed.
 
-  - Uncomment the following lines in src/Makefile
-      vlinac_SRCS += beamTrajectory.st
-      vlinac_SRCS += autoControl.st
-      vlinac_LIBS += seq pv
-
-  - Uncomment the following lines in src/vlinacInclude.dbd
-      registrar(beamTrajectoryRegistrar)
-      registrar(autoControlRegistrar)
-
-  - Uncomment the following lines in iocBoot/iocvlinac/st.cmd
-      seq &beamTrajectory, "user=xxx"
-      seq &autoControl, "user=xxx"
-
   - Rebuild the entire application and start (reboot) the ioc
 
 This directory (misc) contains additional files to compliment

src/makeBaseApp/top/vlinacApp/src/Makefile

@@ -8,8 +8,8 @@ include $(TOP)/configure/CONFIG
 # build an ioc application
 
 PROD_IOC = vlinac
-# <name>.dbd will be created from <name>Include.dbd
 DBD += vlinac.dbd
+vlinac_DBD = vlinacBase.dbd
 
 # <name>_registerRecordDeviceDriver.cpp will be created from <name>.dbd
 vlinac_SRCS += vlinac_registerRecordDeviceDriver.cpp
@@ -21,11 +21,13 @@ vlinac_OBJS_vxWorks += $(EPICS_BASE_BIN)/vxComLibrary
 
 # The following builds sequence programs as a component of vlinac
 # To build .st files, SNCSEQ must be defined in <top>/configure/RELEASE
-# Also in _APPNAME_Include.dbd uncomment #registrar(<name>Registrar) lines
-#vlinac_SRCS += beamTrajectory.st
-#vlinac_SRCS += autoControl.st
-#vlinac_SRCS += stabilizer.st
-#vlinac_LIBS += seq pv
+ifdef SNCSEQ
+vlinac_SRCS += beamTrajectory.st
+vlinac_SRCS += autoControl.st
+vlinac_SRCS += stabilizer.st
+vlinac_LIBS += seq pv
+vlinac_DBD += vlinacSeq.dbd
+endif
 
 vlinac_LIBS += $(EPICS_BASE_IOC_LIBS)
 

src/makeBaseApp/top/vlinacApp/src/vlinacBase.dbd

@@ -0,0 +1 @@
+include "base.dbd"

src/makeBaseApp/top/vlinacApp/src/vlinacInclude.dbd

@@ -1,4 +0,0 @@
-include "base.dbd"
-#registrar(beamTrajectoryRegistrar)
-#registrar(autoControlRegistrar)
-#registrar(stabilizerRegistrar)

src/makeBaseApp/top/vlinacApp/src/vlinacSeq.dbd

@@ -0,0 +1,3 @@
+registrar(beamTrajectoryRegistrar)
+registrar(autoControlRegistrar)
+registrar(stabilizerRegistrar)

src/makeBaseApp/top/vlinacBoot/ioc/st.cmd@Common

@@ -19,7 +19,7 @@ cd ${TOP}/iocBoot/${IOC}
 iocInit()
 
 ## Start any sequence programs
-#seq &beamTrajectory, "user=_USER_"
-#seq &autoControl, "user=_USER_"
-#seq &stabilizer, "user=_USER_"
+seq &beamTrajectory, "user=_USER_"
+seq &autoControl, "user=_USER_"
+seq &stabilizer, "user=_USER_"