From 720f6ba418d0bd933e09b860e64ab266d9c5a63a Mon Sep 17 00:00:00 2001
From: "W. Eric Norum" <wenorum@lbl.gov>
Date: Sat, 22 May 2004 16:55:17 +0000
Subject: [PATCH] Simplify virtual-linac build procedure.  Sequence programs
 are now enabled simply by adding a SNCSEQ entry to configure/RELEASE.

---
 src/makeBaseApp/Makefile                           |  3 ++-
 src/makeBaseApp/top/vlinacApp/misc/README          | 13 -------------
 src/makeBaseApp/top/vlinacApp/src/Makefile         | 14 ++++++++------
 src/makeBaseApp/top/vlinacApp/src/vlinacBase.dbd   |  1 +
 .../top/vlinacApp/src/vlinacInclude.dbd            |  4 ----
 src/makeBaseApp/top/vlinacApp/src/vlinacSeq.dbd    |  3 +++
 src/makeBaseApp/top/vlinacBoot/ioc/st.cmd@Common   |  6 +++---
 7 files changed, 17 insertions(+), 27 deletions(-)
 create mode 100644 src/makeBaseApp/top/vlinacApp/src/vlinacBase.dbd
 delete mode 100644 src/makeBaseApp/top/vlinacApp/src/vlinacInclude.dbd
 create mode 100644 src/makeBaseApp/top/vlinacApp/src/vlinacSeq.dbd

diff --git a/src/makeBaseApp/Makefile b/src/makeBaseApp/Makefile
index bf6e64dd4..9fc86c030 100644
--- a/src/makeBaseApp/Makefile
+++ b/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
diff --git a/src/makeBaseApp/top/vlinacApp/misc/README b/src/makeBaseApp/top/vlinacApp/misc/README
index 05c51bd25..0fdff1e2b 100644
--- a/src/makeBaseApp/top/vlinacApp/misc/README
+++ b/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
diff --git a/src/makeBaseApp/top/vlinacApp/src/Makefile b/src/makeBaseApp/top/vlinacApp/src/Makefile
index 3ef10b924..7e4f6caf3 100644
--- a/src/makeBaseApp/top/vlinacApp/src/Makefile
+++ b/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)
 
diff --git a/src/makeBaseApp/top/vlinacApp/src/vlinacBase.dbd b/src/makeBaseApp/top/vlinacApp/src/vlinacBase.dbd
new file mode 100644
index 000000000..ec6ea3f38
--- /dev/null
+++ b/src/makeBaseApp/top/vlinacApp/src/vlinacBase.dbd
@@ -0,0 +1 @@
+include "base.dbd"
diff --git a/src/makeBaseApp/top/vlinacApp/src/vlinacInclude.dbd b/src/makeBaseApp/top/vlinacApp/src/vlinacInclude.dbd
deleted file mode 100644
index 303a4ec25..000000000
--- a/src/makeBaseApp/top/vlinacApp/src/vlinacInclude.dbd
+++ /dev/null
@@ -1,4 +0,0 @@
-include "base.dbd"
-#registrar(beamTrajectoryRegistrar)
-#registrar(autoControlRegistrar)
-#registrar(stabilizerRegistrar)
diff --git a/src/makeBaseApp/top/vlinacApp/src/vlinacSeq.dbd b/src/makeBaseApp/top/vlinacApp/src/vlinacSeq.dbd
new file mode 100644
index 000000000..7af39aacf
--- /dev/null
+++ b/src/makeBaseApp/top/vlinacApp/src/vlinacSeq.dbd
@@ -0,0 +1,3 @@
+registrar(beamTrajectoryRegistrar)
+registrar(autoControlRegistrar)
+registrar(stabilizerRegistrar)
diff --git a/src/makeBaseApp/top/vlinacBoot/ioc/st.cmd@Common b/src/makeBaseApp/top/vlinacBoot/ioc/st.cmd@Common
index 11e27334b..aa1da06a3 100644
--- a/src/makeBaseApp/top/vlinacBoot/ioc/st.cmd@Common
+++ b/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_"