From 6bd55da6313f6bce8c52966521d85b19efc187e8 Mon Sep 17 00:00:00 2001
From: Andrew Johnson <anj@aps.anl.gov>
Date: Sat, 19 May 2001 02:42:59 +0000
Subject: [PATCH] Modifications to support architecture-specific template
 files.     vxWorks-specific and Common files for host IOCs

---
 .../top/exampleBoot/ioc/{Makefile => Makefile@Common}     | 0
 src/makeBaseApp/top/exampleBoot/ioc/Makefile@vxWorks      | 8 ++++++++
 src/makeBaseApp/top/exampleBoot/ioc/README                | 3 ---
 src/makeBaseApp/top/exampleBoot/ioc/README@Common         | 3 +++
 src/makeBaseApp/top/exampleBoot/ioc/README@vxWorks        | 0
 .../top/exampleBoot/ioc/{stcmd.host => st.cmd@Common}     | 0
 .../top/exampleBoot/ioc/{st.cmd => st.cmd@vxWorks}        | 4 ++--
 .../top/simpleBoot/ioc/{Makefile => Makefile@Common}      | 0
 src/makeBaseApp/top/simpleBoot/ioc/Makefile@vxWorks       | 8 ++++++++
 src/makeBaseApp/top/simpleBoot/ioc/st.cmd@Common          | 6 ++++++
 .../top/simpleBoot/ioc/{st.cmd => st.cmd@vxWorks}         | 2 +-
 11 files changed, 28 insertions(+), 6 deletions(-)
 rename src/makeBaseApp/top/exampleBoot/ioc/{Makefile => Makefile@Common} (100%)
 create mode 100644 src/makeBaseApp/top/exampleBoot/ioc/Makefile@vxWorks
 delete mode 100644 src/makeBaseApp/top/exampleBoot/ioc/README
 create mode 100644 src/makeBaseApp/top/exampleBoot/ioc/README@Common
 create mode 100644 src/makeBaseApp/top/exampleBoot/ioc/README@vxWorks
 rename src/makeBaseApp/top/exampleBoot/ioc/{stcmd.host => st.cmd@Common} (100%)
 rename src/makeBaseApp/top/exampleBoot/ioc/{st.cmd => st.cmd@vxWorks} (89%)
 rename src/makeBaseApp/top/simpleBoot/ioc/{Makefile => Makefile@Common} (100%)
 create mode 100644 src/makeBaseApp/top/simpleBoot/ioc/Makefile@vxWorks
 create mode 100644 src/makeBaseApp/top/simpleBoot/ioc/st.cmd@Common
 rename src/makeBaseApp/top/simpleBoot/ioc/{st.cmd => st.cmd@vxWorks} (89%)

diff --git a/src/makeBaseApp/top/exampleBoot/ioc/Makefile b/src/makeBaseApp/top/exampleBoot/ioc/Makefile@Common
similarity index 100%
rename from src/makeBaseApp/top/exampleBoot/ioc/Makefile
rename to src/makeBaseApp/top/exampleBoot/ioc/Makefile@Common
diff --git a/src/makeBaseApp/top/exampleBoot/ioc/Makefile@vxWorks b/src/makeBaseApp/top/exampleBoot/ioc/Makefile@vxWorks
new file mode 100644
index 000000000..d5d8ef0cc
--- /dev/null
+++ b/src/makeBaseApp/top/exampleBoot/ioc/Makefile@vxWorks
@@ -0,0 +1,8 @@
+TOP = ../..
+include $(TOP)/configure/CONFIG
+ARCH = _ARCH_
+
+# vxWorks architecture needs a cdCommands file to be built
+buildInstall: cdCommands
+
+include $(TOP)/configure/RULES.ioc
diff --git a/src/makeBaseApp/top/exampleBoot/ioc/README b/src/makeBaseApp/top/exampleBoot/ioc/README
deleted file mode 100644
index e33aca77a..000000000
--- a/src/makeBaseApp/top/exampleBoot/ioc/README
+++ /dev/null
@@ -1,3 +0,0 @@
-On host execute the command
-
-../../bin/<arch>/example stcmd.host
diff --git a/src/makeBaseApp/top/exampleBoot/ioc/README@Common b/src/makeBaseApp/top/exampleBoot/ioc/README@Common
new file mode 100644
index 000000000..7ae9368b7
--- /dev/null
+++ b/src/makeBaseApp/top/exampleBoot/ioc/README@Common
@@ -0,0 +1,3 @@
+To start the ioc from this directory execute the command
+
+    ../../bin/_ARCH_/example st.cmd
diff --git a/src/makeBaseApp/top/exampleBoot/ioc/README@vxWorks b/src/makeBaseApp/top/exampleBoot/ioc/README@vxWorks
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/makeBaseApp/top/exampleBoot/ioc/stcmd.host b/src/makeBaseApp/top/exampleBoot/ioc/st.cmd@Common
similarity index 100%
rename from src/makeBaseApp/top/exampleBoot/ioc/stcmd.host
rename to src/makeBaseApp/top/exampleBoot/ioc/st.cmd@Common
diff --git a/src/makeBaseApp/top/exampleBoot/ioc/st.cmd b/src/makeBaseApp/top/exampleBoot/ioc/st.cmd@vxWorks
similarity index 89%
rename from src/makeBaseApp/top/exampleBoot/ioc/st.cmd
rename to src/makeBaseApp/top/exampleBoot/ioc/st.cmd@vxWorks
index 1302586e9..55ce12efc 100644
--- a/src/makeBaseApp/top/exampleBoot/ioc/st.cmd
+++ b/src/makeBaseApp/top/exampleBoot/ioc/st.cmd@vxWorks
@@ -1,7 +1,7 @@
 # Example vxWorks startup file
 
-# Following must be added for many board support packages
-#cd <full path to target bin directory>
+# Following will be needed for many board support packages
+#cd _TOP_/iocBoot/_IOC_
 
 < cdCommands
 
diff --git a/src/makeBaseApp/top/simpleBoot/ioc/Makefile b/src/makeBaseApp/top/simpleBoot/ioc/Makefile@Common
similarity index 100%
rename from src/makeBaseApp/top/simpleBoot/ioc/Makefile
rename to src/makeBaseApp/top/simpleBoot/ioc/Makefile@Common
diff --git a/src/makeBaseApp/top/simpleBoot/ioc/Makefile@vxWorks b/src/makeBaseApp/top/simpleBoot/ioc/Makefile@vxWorks
new file mode 100644
index 000000000..61e9c9602
--- /dev/null
+++ b/src/makeBaseApp/top/simpleBoot/ioc/Makefile@vxWorks
@@ -0,0 +1,8 @@
+TOP = ../..
+include $(TOP)/configure/CONFIG
+ARCH = _ARCH_
+
+# vxWorks architecture needs a cdCommands file
+buildInstall: cdCommands
+
+include $(TOP)/configure/RULES.ioc
diff --git a/src/makeBaseApp/top/simpleBoot/ioc/st.cmd@Common b/src/makeBaseApp/top/simpleBoot/ioc/st.cmd@Common
new file mode 100644
index 000000000..5884c168b
--- /dev/null
+++ b/src/makeBaseApp/top/simpleBoot/ioc/st.cmd@Common
@@ -0,0 +1,6 @@
+# Simple startup script
+dbLoadDatabase("../../dbd/_APPNAME_.dbd",0,0)
+registerRecordDeviceDriver(pdbbase) 
+dbLoadRecords("../../db/_APPNAME_.db","user=_USER_Host")
+iocInit()
+#seq snc_APPNAME_,"user=_USER_Host"
diff --git a/src/makeBaseApp/top/simpleBoot/ioc/st.cmd b/src/makeBaseApp/top/simpleBoot/ioc/st.cmd@vxWorks
similarity index 89%
rename from src/makeBaseApp/top/simpleBoot/ioc/st.cmd
rename to src/makeBaseApp/top/simpleBoot/ioc/st.cmd@vxWorks
index 5e9017794..c9ba214de 100644
--- a/src/makeBaseApp/top/simpleBoot/ioc/st.cmd
+++ b/src/makeBaseApp/top/simpleBoot/ioc/st.cmd@vxWorks
@@ -1,6 +1,6 @@
 # Example vxWorks startup file
 #Following must be added for many board support packages
-#cd <full path to target bin directory>
+#cd _TOP_/iocBoot/_IOC_
 
 < cdCommands