From 81cf6f10641f3544d0b46b46ddd7203942962bc1 Mon Sep 17 00:00:00 2001
From: timmmooney <mooney@aps.anl.gov>
Date: Thu, 6 Nov 2003 18:13:05 +0000
Subject: [PATCH] *** empty log message ***
---
iocBoot/Makefile | 5 ++---
iocBoot/iocxxx/st.cmd | 3 +--
iocBoot/nfsCommands | 4 ++--
xxxApp/src/Makefile | 2 +-
xxxApp/src/xxxInclude.dbd | 2 ++
xxxApp/src/xxxVXInclude.dbd | 26 +++++++++++++++++---------
6 files changed, 25 insertions(+), 17 deletions(-)
diff --git a/iocBoot/Makefile b/iocBoot/Makefile
index d64511f..252a137 100644
--- a/iocBoot/Makefile
+++ b/iocBoot/Makefile
@@ -1,4 +1,3 @@
TOP = ..
-include $(TOP)/config/CONFIG_APP
-DIRS += $(wildcard *ioc*)
-include $(TOP)/config/RULES.iocBoot
+include $(TOP)/configure/CONFIG
+include $(TOP)/configure/RULES.iocBoot
diff --git a/iocBoot/iocxxx/st.cmd b/iocBoot/iocxxx/st.cmd
index 701b14d..22fdb9f 100644
--- a/iocBoot/iocxxx/st.cmd
+++ b/iocBoot/iocxxx/st.cmd
@@ -94,7 +94,7 @@ xxxVX_registerRecordDeviceDriver(pdbbase)
#dbLoadRecords("$(STD)/stdApp/Db/interp.db", "P=xxx:")
# 4-step measurement
-#dbLoadRecords("$(STD)/stdApp/Db/4step.db", "P=xxx:")
+dbLoadRecords("$(STD)/stdApp/Db/4step.db", "P=xxx:")
# X-ray Instrumentation Associates Huber Slit Controller
# supported by a customized version of the SNL program written by Pete Jemian
@@ -456,7 +456,6 @@ dbLoadRecords("$(STD)/stdApp/Db/misc.db","P=xxx:")
###############################################################################
# Set shell prompt (otherwise it is left at mv167 or mv162)
shellPromptSet "iocxxx> "
-#reboot_restoreDebug=5
iocLogDisable=1
iocInit
diff --git a/iocBoot/nfsCommands b/iocBoot/nfsCommands
index a7db82c..eeb7086 100644
--- a/iocBoot/nfsCommands
+++ b/iocBoot/nfsCommands
@@ -13,8 +13,8 @@ routeShow
# rather than FTP, for booting the VME crate, and generally for reading
# and writing files on the server.
#
-#hostAdd("beams","164.54.100.5")
-#nfsMount("beams","/export/homeb","/home/beams")
+hostAdd("beams","164.54.100.5")
+nfsMount("beams","/export/homeb","/home/beams")
hostAdd("oxygen","164.54.52.4")
nfsMount("oxygen","/home/oxygen","/home/oxygen")
nfsMount("oxygen","/home/oxygen4","/home/oxygen4")
diff --git a/xxxApp/src/Makefile b/xxxApp/src/Makefile
index 42d9efd..d1e8078 100644
--- a/xxxApp/src/Makefile
+++ b/xxxApp/src/Makefile
@@ -112,7 +112,7 @@ seqDev_DIR = $(SEQ_LIB)
xxx_LIBS += std
std_DIR = $(STD_LIB)
-xxx_LIBS += mpf mpfEpics mpfSerial
+xxx_LIBS += mpfSerial mpf mpfEpics
mpf_DIR = $(MPF_LIB)
mpfEpics_DIR = $(MPF_LIB)
mpfSerial_DIR = $(MPF_LIB)
diff --git a/xxxApp/src/xxxInclude.dbd b/xxxApp/src/xxxInclude.dbd
index 19fc3c2..4481115 100644
--- a/xxxApp/src/xxxInclude.dbd
+++ b/xxxApp/src/xxxInclude.dbd
@@ -1,5 +1,7 @@
+# stuff for non-vxWorks ioc
include "shareBase.dbd"
include "stdSupport.dbd"
+include "mpf.dbd"
include "mpfSerial.dbd"
include "motorRecord.dbd"
include "devSoftMotor.dbd"
diff --git a/xxxApp/src/xxxVXInclude.dbd b/xxxApp/src/xxxVXInclude.dbd
index de8b9c9..4ca5d2c 100644
--- a/xxxApp/src/xxxVXInclude.dbd
+++ b/xxxApp/src/xxxVXInclude.dbd
@@ -1,5 +1,15 @@
-# stuff to be added only for vxWorks ioc
-include "xxxInclude.dbd"
+# stuff for vxWorks ioc
+include "shareBase.dbd"
+include "stdSupport.dbd"
+
+include "motorRecord.dbd"
+include "devSoftMotor.dbd"
+include "devOms.dbd"
+#include "devAcsMotor.dbd"
+#include "devImsMotor.dbd"
+#include "devMclennanMotor.dbd"
+#include "devNewport.dbd"
+
include "stdVXSupport.dbd"
@@ -15,20 +25,18 @@ include "devAoDAC128V.dbd"
include "devIp330.dbd"
-include "devOms.dbd"
-#include "devAcsMotor.dbd"
-#include "devImsMotor.dbd"
-#include "devMXmotor.dbd"
-#include "devMclennanMotor.dbd"
-#include "devNewport.dbd"
-
#include "camacSupport.dbd"
#include "devCamacSupport.dbd"
#include "dxpCamacSupport.dbd"
+
#include "allenBradley.dbd"
include "devLove.dbd"
include "drvIpac.dbd"
+include "mpf.dbd"
+include "devStringMpf.dbd"
+include "mpfSerialVx.dbd"
+
# Locally defined stuff that needs to be registered
#registrar(myRegistrar)
#variable(myDebug)
--
GitLab