From 2c577b33914f92d27106457bf87eada4b2576556 Mon Sep 17 00:00:00 2001
From: Marty Kraimer <mrkraimer@comcast.net>
Date: Fri, 23 Feb 2001 20:17:22 +0000
Subject: [PATCH] changes for seq support

---
 src/makeBaseApp/top/configure/Makefile           | 10 +---------
 src/makeBaseApp/top/configure/RELEASE            |  2 +-
 src/makeBaseApp/top/exampleApp/src/Makefile      | 11 ++++++-----
 src/makeBaseApp/top/exampleApp/src/sncExample.st |  2 +-
 src/makeBaseApp/top/exampleBoot/ioc/st.cmd       |  1 +
 src/makeBaseApp/top/exampleBoot/ioc/stcmd.host   |  1 +
 6 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/src/makeBaseApp/top/configure/Makefile b/src/makeBaseApp/top/configure/Makefile
index fd63e6dea..3938e38ad 100644
--- a/src/makeBaseApp/top/configure/Makefile
+++ b/src/makeBaseApp/top/configure/Makefile
@@ -4,16 +4,8 @@ TOP=..
 
 include $(TOP)/configure/CONFIG
 
-TARGETS = CONFIG_APP_INCLUDE
+TARGETS = $(CONFIG_TARGETS)
 
 include $(TOP)/configure/RULES
 
-ifeq ($(wildcard $(TOP)/configure/RELEASE.$(EPICS_HOST_ARCH)),$(TOP)/configure/RELEASE.$(HOST_ARCH))
-CONFIG_APP_INCLUDE: $(TOP)/configure/RELEASE.$(EPICS_HOST_ARCH)
-endif
-
-CONFIG_APP_INCLUDE: $(TOP)/configure/RELEASE $(TOP)/configure/CONFIG_APP
-	@$(RM) $@
-	@$(PERL) $(TOOLS)/makeConfigAppInclude.pl $(EPICS_HOST_ARCH) $(T_A) $@ $(TOP)
-
 depends: install
diff --git a/src/makeBaseApp/top/configure/RELEASE b/src/makeBaseApp/top/configure/RELEASE
index 00e507293..4990b5858 100644
--- a/src/makeBaseApp/top/configure/RELEASE
+++ b/src/makeBaseApp/top/configure/RELEASE
@@ -7,4 +7,4 @@
 EPICS_BASE=_EPICS_BASE_
 TEMPLATE_TOP=_TEMPLATE_TOP_
 MSI=/home/epics/CLS/epics/extensions/bin/$(EPICS_HOST_ARCH)/msi
-#SEQ=<full path to sequencer>
+#SNCSEQ=<full path to sequencer>
diff --git a/src/makeBaseApp/top/exampleApp/src/Makefile b/src/makeBaseApp/top/exampleApp/src/Makefile
index c4ced32f6..3c6ca599a 100644
--- a/src/makeBaseApp/top/exampleApp/src/Makefile
+++ b/src/makeBaseApp/top/exampleApp/src/Makefile
@@ -62,15 +62,16 @@ example_SRCS_vxWorks += -nil-
 
 example_OBJS_vxWorks += $(EPICS_BASE_BIN)/iocCoreLibrary
 
-#example_SRCS_vxWorks += sncExample.c
-#example_OBJS_vxWorks += $(SEQ_BIN)/seqLibrary
+#example_SRCS += sncExample.st
+
+#seq_DIR    = $(SNCSEQ_LIB)
+#example_OBJS_vxWorks += $(SNCSEQ_BIN)/seqLibrary
+#example_OBJS_vxWorks += $(SNCSEQ_BIN)/pvLibrary
+#example_OBJS_vxWorks += $(SNCSEQ_BIN)/pvCaLibrary
 #example_LIBS += seq
 #example_LIBS += pv
-#seq_DIR    = $(SEQ_LIB)
 #example_LIBS += pvCa
 
-
-
 -include ../baseLIBOBJS
 example_OBJS += $(LIBOBJS)
 
diff --git a/src/makeBaseApp/top/exampleApp/src/sncExample.st b/src/makeBaseApp/top/exampleApp/src/sncExample.st
index 68c46485a..1e0a9861f 100644
--- a/src/makeBaseApp/top/exampleApp/src/sncExample.st
+++ b/src/makeBaseApp/top/exampleApp/src/sncExample.st
@@ -1,6 +1,6 @@
 program snctest
 float v;
-assign v to "_USER_:xxxExample";
+assign v to "{user}:xxxExample";
 monitor v;
 
 ss ss1
diff --git a/src/makeBaseApp/top/exampleBoot/ioc/st.cmd b/src/makeBaseApp/top/exampleBoot/ioc/st.cmd
index dc8398c7d..1b23723a4 100644
--- a/src/makeBaseApp/top/exampleBoot/ioc/st.cmd
+++ b/src/makeBaseApp/top/exampleBoot/ioc/st.cmd
@@ -30,3 +30,4 @@ dbLoadRecords("db/dbExample2.db","user=_USER_,no=3,scan=5 second")
 
 cd startup
 iocInit
+#seq &snctest,"user=_USER_"
diff --git a/src/makeBaseApp/top/exampleBoot/ioc/stcmd.host b/src/makeBaseApp/top/exampleBoot/ioc/stcmd.host
index 6ebc0239d..aae0b3e57 100644
--- a/src/makeBaseApp/top/exampleBoot/ioc/stcmd.host
+++ b/src/makeBaseApp/top/exampleBoot/ioc/stcmd.host
@@ -5,3 +5,4 @@ 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")
 iocInit()
+#seq snctest,"user=_USER_Host"