From 219f08788e28042fb2be757ea260031b15bc91aa Mon Sep 17 00:00:00 2001 From: ChrisColeExpControl Date: Tue, 16 Jun 2020 14:45:23 +0100 Subject: [PATCH 01/23] added AG33220A-02 --- AG33220A/AG33220A-IOC-02App/Db/Makefile | 18 +++++++++++++++ AG33220A/AG33220A-IOC-02App/Makefile | 9 ++++++++ .../src/AG33220A-IOC-02Main.cpp | 23 +++++++++++++++++++ AG33220A/AG33220A-IOC-02App/src/Makefile | 9 ++++++++ AG33220A/iocBoot/iocAG33220A-IOC-02/st.cmd | 18 +++++++++++++++ 5 files changed, 77 insertions(+) create mode 100644 AG33220A/AG33220A-IOC-02App/Db/Makefile create mode 100644 AG33220A/AG33220A-IOC-02App/Makefile create mode 100644 AG33220A/AG33220A-IOC-02App/src/AG33220A-IOC-02Main.cpp create mode 100644 AG33220A/AG33220A-IOC-02App/src/Makefile create mode 100644 AG33220A/iocBoot/iocAG33220A-IOC-02/st.cmd diff --git a/AG33220A/AG33220A-IOC-02App/Db/Makefile b/AG33220A/AG33220A-IOC-02App/Db/Makefile new file mode 100644 index 000000000..8eb97279d --- /dev/null +++ b/AG33220A/AG33220A-IOC-02App/Db/Makefile @@ -0,0 +1,18 @@ +TOP=../.. +include $(TOP)/configure/CONFIG +#---------------------------------------- +# ADD MACRO DEFINITIONS AFTER THIS LINE + +#---------------------------------------------------- +# Create and install (or just install) into /db +# databases, templates, substitutions like this +#DB += xxx.db + +#---------------------------------------------------- +# If .db template is not named *.template add +# _template = + +include $(TOP)/configure/RULES +#---------------------------------------- +# ADD RULES AFTER THIS LINE + diff --git a/AG33220A/AG33220A-IOC-02App/Makefile b/AG33220A/AG33220A-IOC-02App/Makefile new file mode 100644 index 000000000..373b86bfc --- /dev/null +++ b/AG33220A/AG33220A-IOC-02App/Makefile @@ -0,0 +1,9 @@ +TOP = .. +include $(TOP)/configure/CONFIG +DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *src*)) +DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *Src*)) +DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *db*)) +DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *Db*)) +DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *protocol*)) +include $(TOP)/configure/RULES_DIRS + diff --git a/AG33220A/AG33220A-IOC-02App/src/AG33220A-IOC-02Main.cpp b/AG33220A/AG33220A-IOC-02App/src/AG33220A-IOC-02Main.cpp new file mode 100644 index 000000000..af390da0d --- /dev/null +++ b/AG33220A/AG33220A-IOC-02App/src/AG33220A-IOC-02Main.cpp @@ -0,0 +1,23 @@ +/* AG33220A-IOC-02Main.cpp */ +/* Author: Marty Kraimer Date: 17MAR2000 */ + +#include +#include +#include +#include +#include + +#include "epicsExit.h" +#include "epicsThread.h" +#include "iocsh.h" + +int main(int argc,char *argv[]) +{ + if(argc>=2) { + iocsh(argv[1]); + epicsThreadSleep(.2); + } + iocsh(NULL); + epicsExit(0); + return(0); +} diff --git a/AG33220A/AG33220A-IOC-02App/src/Makefile b/AG33220A/AG33220A-IOC-02App/src/Makefile new file mode 100644 index 000000000..789376c30 --- /dev/null +++ b/AG33220A/AG33220A-IOC-02App/src/Makefile @@ -0,0 +1,9 @@ +TOP=../.. +# This file should do very little - it's purpose is to set the APPNAME and then load build.mak + +# this definition is used in build.mak +APPNAME=AG33220A-IOC-02 + +# If we are ###-IOC-01 leave this as is, if we are ###-IOC-02 or higher change to ###-IOC-01 and delete build.mak from this directory +# there should only be a single build.mak for all IOCs of a given family and it is located in the ###-IOC-01 directory +include $(TOP)/AG33220A-IOC-01App/src/build.mak diff --git a/AG33220A/iocBoot/iocAG33220A-IOC-02/st.cmd b/AG33220A/iocBoot/iocAG33220A-IOC-02/st.cmd new file mode 100644 index 000000000..bc562181b --- /dev/null +++ b/AG33220A/iocBoot/iocAG33220A-IOC-02/st.cmd @@ -0,0 +1,18 @@ +#!../../bin/Windows-x64/AG33220A-IOC-02 + +#- You may have to change AG33220A-IOC-02 to something else +#- everywhere it appears in this file + +#< envPaths + +## Register all support components +dbLoadDatabase("../../dbd/AG33220A-IOC-02.dbd",0,0) +AG33220A_IOC_02_registerRecordDeviceDriver(pdbbase) + +## Load record instances +dbLoadRecords("../../db/AG33220A-IOC-02.db","user=xup33938") + +iocInit() + +## Start any sequence programs +#seq sncAG33220A-IOC-02,"user=xup33938" From 6670ba096655962ef8f8dfecf2b6208bfde5ad29 Mon Sep 17 00:00:00 2001 From: ChrisColeExpControl Date: Tue, 16 Jun 2020 14:53:57 +0100 Subject: [PATCH 02/23] Revert "added AG33220A-02" This reverts commit 219f08788e28042fb2be757ea260031b15bc91aa. --- AG33220A/AG33220A-IOC-02App/Db/Makefile | 18 --------------- AG33220A/AG33220A-IOC-02App/Makefile | 9 -------- .../src/AG33220A-IOC-02Main.cpp | 23 ------------------- AG33220A/AG33220A-IOC-02App/src/Makefile | 9 -------- AG33220A/iocBoot/iocAG33220A-IOC-02/st.cmd | 18 --------------- 5 files changed, 77 deletions(-) delete mode 100644 AG33220A/AG33220A-IOC-02App/Db/Makefile delete mode 100644 AG33220A/AG33220A-IOC-02App/Makefile delete mode 100644 AG33220A/AG33220A-IOC-02App/src/AG33220A-IOC-02Main.cpp delete mode 100644 AG33220A/AG33220A-IOC-02App/src/Makefile delete mode 100644 AG33220A/iocBoot/iocAG33220A-IOC-02/st.cmd diff --git a/AG33220A/AG33220A-IOC-02App/Db/Makefile b/AG33220A/AG33220A-IOC-02App/Db/Makefile deleted file mode 100644 index 8eb97279d..000000000 --- a/AG33220A/AG33220A-IOC-02App/Db/Makefile +++ /dev/null @@ -1,18 +0,0 @@ -TOP=../.. -include $(TOP)/configure/CONFIG -#---------------------------------------- -# ADD MACRO DEFINITIONS AFTER THIS LINE - -#---------------------------------------------------- -# Create and install (or just install) into /db -# databases, templates, substitutions like this -#DB += xxx.db - -#---------------------------------------------------- -# If .db template is not named *.template add -# _template = - -include $(TOP)/configure/RULES -#---------------------------------------- -# ADD RULES AFTER THIS LINE - diff --git a/AG33220A/AG33220A-IOC-02App/Makefile b/AG33220A/AG33220A-IOC-02App/Makefile deleted file mode 100644 index 373b86bfc..000000000 --- a/AG33220A/AG33220A-IOC-02App/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -TOP = .. -include $(TOP)/configure/CONFIG -DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *src*)) -DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *Src*)) -DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *db*)) -DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *Db*)) -DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *protocol*)) -include $(TOP)/configure/RULES_DIRS - diff --git a/AG33220A/AG33220A-IOC-02App/src/AG33220A-IOC-02Main.cpp b/AG33220A/AG33220A-IOC-02App/src/AG33220A-IOC-02Main.cpp deleted file mode 100644 index af390da0d..000000000 --- a/AG33220A/AG33220A-IOC-02App/src/AG33220A-IOC-02Main.cpp +++ /dev/null @@ -1,23 +0,0 @@ -/* AG33220A-IOC-02Main.cpp */ -/* Author: Marty Kraimer Date: 17MAR2000 */ - -#include -#include -#include -#include -#include - -#include "epicsExit.h" -#include "epicsThread.h" -#include "iocsh.h" - -int main(int argc,char *argv[]) -{ - if(argc>=2) { - iocsh(argv[1]); - epicsThreadSleep(.2); - } - iocsh(NULL); - epicsExit(0); - return(0); -} diff --git a/AG33220A/AG33220A-IOC-02App/src/Makefile b/AG33220A/AG33220A-IOC-02App/src/Makefile deleted file mode 100644 index 789376c30..000000000 --- a/AG33220A/AG33220A-IOC-02App/src/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -TOP=../.. -# This file should do very little - it's purpose is to set the APPNAME and then load build.mak - -# this definition is used in build.mak -APPNAME=AG33220A-IOC-02 - -# If we are ###-IOC-01 leave this as is, if we are ###-IOC-02 or higher change to ###-IOC-01 and delete build.mak from this directory -# there should only be a single build.mak for all IOCs of a given family and it is located in the ###-IOC-01 directory -include $(TOP)/AG33220A-IOC-01App/src/build.mak diff --git a/AG33220A/iocBoot/iocAG33220A-IOC-02/st.cmd b/AG33220A/iocBoot/iocAG33220A-IOC-02/st.cmd deleted file mode 100644 index bc562181b..000000000 --- a/AG33220A/iocBoot/iocAG33220A-IOC-02/st.cmd +++ /dev/null @@ -1,18 +0,0 @@ -#!../../bin/Windows-x64/AG33220A-IOC-02 - -#- You may have to change AG33220A-IOC-02 to something else -#- everywhere it appears in this file - -#< envPaths - -## Register all support components -dbLoadDatabase("../../dbd/AG33220A-IOC-02.dbd",0,0) -AG33220A_IOC_02_registerRecordDeviceDriver(pdbbase) - -## Load record instances -dbLoadRecords("../../db/AG33220A-IOC-02.db","user=xup33938") - -iocInit() - -## Start any sequence programs -#seq sncAG33220A-IOC-02,"user=xup33938" From f540de720c483b92abd7801b976f32d8b2a5037c Mon Sep 17 00:00:00 2001 From: ChrisColeExpControl Date: Tue, 16 Jun 2020 15:13:57 +0100 Subject: [PATCH 03/23] added secondd AG33220A --- AG33220A/AG33220A-IOC-02App/Db/Makefile | 18 +++++++++++++++ AG33220A/AG33220A-IOC-02App/Makefile | 9 ++++++++ .../src/AG33220A-IOC-02Main.cpp | 23 +++++++++++++++++++ AG33220A/AG33220A-IOC-02App/src/Makefile | 9 ++++++++ AG33220A/iocBoot/iocAG33220A-IOC-02/Makefile | 6 +++++ AG33220A/iocBoot/iocAG33220A-IOC-02/st.cmd | 18 +++++++++++++++ 6 files changed, 83 insertions(+) create mode 100644 AG33220A/AG33220A-IOC-02App/Db/Makefile create mode 100644 AG33220A/AG33220A-IOC-02App/Makefile create mode 100644 AG33220A/AG33220A-IOC-02App/src/AG33220A-IOC-02Main.cpp create mode 100644 AG33220A/AG33220A-IOC-02App/src/Makefile create mode 100644 AG33220A/iocBoot/iocAG33220A-IOC-02/Makefile create mode 100644 AG33220A/iocBoot/iocAG33220A-IOC-02/st.cmd diff --git a/AG33220A/AG33220A-IOC-02App/Db/Makefile b/AG33220A/AG33220A-IOC-02App/Db/Makefile new file mode 100644 index 000000000..8eb97279d --- /dev/null +++ b/AG33220A/AG33220A-IOC-02App/Db/Makefile @@ -0,0 +1,18 @@ +TOP=../.. +include $(TOP)/configure/CONFIG +#---------------------------------------- +# ADD MACRO DEFINITIONS AFTER THIS LINE + +#---------------------------------------------------- +# Create and install (or just install) into /db +# databases, templates, substitutions like this +#DB += xxx.db + +#---------------------------------------------------- +# If .db template is not named *.template add +# _template = + +include $(TOP)/configure/RULES +#---------------------------------------- +# ADD RULES AFTER THIS LINE + diff --git a/AG33220A/AG33220A-IOC-02App/Makefile b/AG33220A/AG33220A-IOC-02App/Makefile new file mode 100644 index 000000000..373b86bfc --- /dev/null +++ b/AG33220A/AG33220A-IOC-02App/Makefile @@ -0,0 +1,9 @@ +TOP = .. +include $(TOP)/configure/CONFIG +DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *src*)) +DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *Src*)) +DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *db*)) +DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *Db*)) +DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *protocol*)) +include $(TOP)/configure/RULES_DIRS + diff --git a/AG33220A/AG33220A-IOC-02App/src/AG33220A-IOC-02Main.cpp b/AG33220A/AG33220A-IOC-02App/src/AG33220A-IOC-02Main.cpp new file mode 100644 index 000000000..af390da0d --- /dev/null +++ b/AG33220A/AG33220A-IOC-02App/src/AG33220A-IOC-02Main.cpp @@ -0,0 +1,23 @@ +/* AG33220A-IOC-02Main.cpp */ +/* Author: Marty Kraimer Date: 17MAR2000 */ + +#include +#include +#include +#include +#include + +#include "epicsExit.h" +#include "epicsThread.h" +#include "iocsh.h" + +int main(int argc,char *argv[]) +{ + if(argc>=2) { + iocsh(argv[1]); + epicsThreadSleep(.2); + } + iocsh(NULL); + epicsExit(0); + return(0); +} diff --git a/AG33220A/AG33220A-IOC-02App/src/Makefile b/AG33220A/AG33220A-IOC-02App/src/Makefile new file mode 100644 index 000000000..789376c30 --- /dev/null +++ b/AG33220A/AG33220A-IOC-02App/src/Makefile @@ -0,0 +1,9 @@ +TOP=../.. +# This file should do very little - it's purpose is to set the APPNAME and then load build.mak + +# this definition is used in build.mak +APPNAME=AG33220A-IOC-02 + +# If we are ###-IOC-01 leave this as is, if we are ###-IOC-02 or higher change to ###-IOC-01 and delete build.mak from this directory +# there should only be a single build.mak for all IOCs of a given family and it is located in the ###-IOC-01 directory +include $(TOP)/AG33220A-IOC-01App/src/build.mak diff --git a/AG33220A/iocBoot/iocAG33220A-IOC-02/Makefile b/AG33220A/iocBoot/iocAG33220A-IOC-02/Makefile new file mode 100644 index 000000000..d5e26aae9 --- /dev/null +++ b/AG33220A/iocBoot/iocAG33220A-IOC-02/Makefile @@ -0,0 +1,6 @@ +TOP = ../.. +include $(TOP)/configure/CONFIG +#ARCH = windows-x64-debug +ARCH = $(EPICS_HOST_ARCH) +TARGETS = envPaths dllPath.bat relPaths.sh runIOC.bat runIOC.sh +include $(TOP)/configure/RULES.ioc diff --git a/AG33220A/iocBoot/iocAG33220A-IOC-02/st.cmd b/AG33220A/iocBoot/iocAG33220A-IOC-02/st.cmd new file mode 100644 index 000000000..89a5a3d85 --- /dev/null +++ b/AG33220A/iocBoot/iocAG33220A-IOC-02/st.cmd @@ -0,0 +1,18 @@ +#!../../bin/windows-x64-debug/AG33220A-IOC-02 + +## You may have to change AG33220A-IOC-02 to something else +## everywhere it appears in this file + +# Increase this if you get <> or discarded messages warnings in your errlog output +errlogInit2(65536, 256) + +< envPaths + +cd "${TOP}" + +## Register all support components +dbLoadDatabase "dbd/AG33220A-IOC-02.dbd" +AG33220A_IOC_02_registerRecordDeviceDriver pdbbase + +## calling common command file in ioc 01 boot dir +< ${TOP}/iocBoot/ioc_01_APP_NAME_/st-common.cmd From f7f08f2bdc825a21673c8d07077954425e37c4f0 Mon Sep 17 00:00:00 2001 From: ChrisColeExpControl Date: Tue, 16 Jun 2020 15:59:54 +0100 Subject: [PATCH 04/23] added secondd AG53220A --- AG53220A/AG53220A-IOC-02App/Db/Makefile | 18 +++++++++++++++ AG53220A/AG53220A-IOC-02App/Makefile | 9 ++++++++ .../src/AG53220A-IOC-02Main.cpp | 23 +++++++++++++++++++ AG53220A/AG53220A-IOC-02App/src/Makefile | 9 ++++++++ AG53220A/iocBoot/iocAG53220A-IOC-02/Makefile | 6 +++++ AG53220A/iocBoot/iocAG53220A-IOC-02/st.cmd | 18 +++++++++++++++ 6 files changed, 83 insertions(+) create mode 100644 AG53220A/AG53220A-IOC-02App/Db/Makefile create mode 100644 AG53220A/AG53220A-IOC-02App/Makefile create mode 100644 AG53220A/AG53220A-IOC-02App/src/AG53220A-IOC-02Main.cpp create mode 100644 AG53220A/AG53220A-IOC-02App/src/Makefile create mode 100644 AG53220A/iocBoot/iocAG53220A-IOC-02/Makefile create mode 100644 AG53220A/iocBoot/iocAG53220A-IOC-02/st.cmd diff --git a/AG53220A/AG53220A-IOC-02App/Db/Makefile b/AG53220A/AG53220A-IOC-02App/Db/Makefile new file mode 100644 index 000000000..8eb97279d --- /dev/null +++ b/AG53220A/AG53220A-IOC-02App/Db/Makefile @@ -0,0 +1,18 @@ +TOP=../.. +include $(TOP)/configure/CONFIG +#---------------------------------------- +# ADD MACRO DEFINITIONS AFTER THIS LINE + +#---------------------------------------------------- +# Create and install (or just install) into /db +# databases, templates, substitutions like this +#DB += xxx.db + +#---------------------------------------------------- +# If .db template is not named *.template add +# _template = + +include $(TOP)/configure/RULES +#---------------------------------------- +# ADD RULES AFTER THIS LINE + diff --git a/AG53220A/AG53220A-IOC-02App/Makefile b/AG53220A/AG53220A-IOC-02App/Makefile new file mode 100644 index 000000000..373b86bfc --- /dev/null +++ b/AG53220A/AG53220A-IOC-02App/Makefile @@ -0,0 +1,9 @@ +TOP = .. +include $(TOP)/configure/CONFIG +DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *src*)) +DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *Src*)) +DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *db*)) +DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *Db*)) +DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *protocol*)) +include $(TOP)/configure/RULES_DIRS + diff --git a/AG53220A/AG53220A-IOC-02App/src/AG53220A-IOC-02Main.cpp b/AG53220A/AG53220A-IOC-02App/src/AG53220A-IOC-02Main.cpp new file mode 100644 index 000000000..a3e8e7b47 --- /dev/null +++ b/AG53220A/AG53220A-IOC-02App/src/AG53220A-IOC-02Main.cpp @@ -0,0 +1,23 @@ +/* AG53220A-IOC-02Main.cpp */ +/* Author: Marty Kraimer Date: 17MAR2000 */ + +#include +#include +#include +#include +#include + +#include "epicsExit.h" +#include "epicsThread.h" +#include "iocsh.h" + +int main(int argc,char *argv[]) +{ + if(argc>=2) { + iocsh(argv[1]); + epicsThreadSleep(.2); + } + iocsh(NULL); + epicsExit(0); + return(0); +} diff --git a/AG53220A/AG53220A-IOC-02App/src/Makefile b/AG53220A/AG53220A-IOC-02App/src/Makefile new file mode 100644 index 000000000..9cedfc3b8 --- /dev/null +++ b/AG53220A/AG53220A-IOC-02App/src/Makefile @@ -0,0 +1,9 @@ +TOP=../.. +# This file should do very little - it's purpose is to set the APPNAME and then load build.mak + +# this definition is used in build.mak +APPNAME=AG53220A-IOC-02 + +# If we are ###-IOC-01 leave this as is, if we are ###-IOC-02 or higher change to ###-IOC-01 and delete build.mak from this directory +# there should only be a single build.mak for all IOCs of a given family and it is located in the ###-IOC-01 directory +include $(TOP)/AG53220A-IOC-01App/src/build.mak diff --git a/AG53220A/iocBoot/iocAG53220A-IOC-02/Makefile b/AG53220A/iocBoot/iocAG53220A-IOC-02/Makefile new file mode 100644 index 000000000..d5e26aae9 --- /dev/null +++ b/AG53220A/iocBoot/iocAG53220A-IOC-02/Makefile @@ -0,0 +1,6 @@ +TOP = ../.. +include $(TOP)/configure/CONFIG +#ARCH = windows-x64-debug +ARCH = $(EPICS_HOST_ARCH) +TARGETS = envPaths dllPath.bat relPaths.sh runIOC.bat runIOC.sh +include $(TOP)/configure/RULES.ioc diff --git a/AG53220A/iocBoot/iocAG53220A-IOC-02/st.cmd b/AG53220A/iocBoot/iocAG53220A-IOC-02/st.cmd new file mode 100644 index 000000000..6ffe40870 --- /dev/null +++ b/AG53220A/iocBoot/iocAG53220A-IOC-02/st.cmd @@ -0,0 +1,18 @@ +#!../../bin/windows-x64-debug/AG53220A-IOC-02 + +## You may have to change AG53220A-IOC-02 to something else +## everywhere it appears in this file + +# Increase this if you get <> or discarded messages warnings in your errlog output +errlogInit2(65536, 256) + +< envPaths + +cd "${TOP}" + +## Register all support components +dbLoadDatabase "dbd/AG53220A-IOC-02.dbd" +AG53220A_IOC_02_registerRecordDeviceDriver pdbbase + +## calling common command file in ioc 01 boot dir +< ${TOP}/iocBoot/ioc_01_APP_NAME_/st-common.cmd From 6eeafdffa1e991e7db3bc5a0c04cf828f688a69f Mon Sep 17 00:00:00 2001 From: ChrisColeExpControl Date: Tue, 16 Jun 2020 16:15:37 +0100 Subject: [PATCH 05/23] second CAENMCA IOC --- CAENMCA/CAENMCA-IOC-02App/Db/Makefile | 18 +++++++++++++++ CAENMCA/CAENMCA-IOC-02App/Makefile | 9 ++++++++ .../src/CAENMCA-IOC-02Main.cpp | 23 +++++++++++++++++++ CAENMCA/CAENMCA-IOC-02App/src/Makefile | 9 ++++++++ CAENMCA/iocBoot/iocCAENMCA-IOC-02/Makefile | 6 +++++ CAENMCA/iocBoot/iocCAENMCA-IOC-02/st.cmd | 18 +++++++++++++++ 6 files changed, 83 insertions(+) create mode 100644 CAENMCA/CAENMCA-IOC-02App/Db/Makefile create mode 100644 CAENMCA/CAENMCA-IOC-02App/Makefile create mode 100644 CAENMCA/CAENMCA-IOC-02App/src/CAENMCA-IOC-02Main.cpp create mode 100644 CAENMCA/CAENMCA-IOC-02App/src/Makefile create mode 100644 CAENMCA/iocBoot/iocCAENMCA-IOC-02/Makefile create mode 100644 CAENMCA/iocBoot/iocCAENMCA-IOC-02/st.cmd diff --git a/CAENMCA/CAENMCA-IOC-02App/Db/Makefile b/CAENMCA/CAENMCA-IOC-02App/Db/Makefile new file mode 100644 index 000000000..8eb97279d --- /dev/null +++ b/CAENMCA/CAENMCA-IOC-02App/Db/Makefile @@ -0,0 +1,18 @@ +TOP=../.. +include $(TOP)/configure/CONFIG +#---------------------------------------- +# ADD MACRO DEFINITIONS AFTER THIS LINE + +#---------------------------------------------------- +# Create and install (or just install) into /db +# databases, templates, substitutions like this +#DB += xxx.db + +#---------------------------------------------------- +# If .db template is not named *.template add +# _template = + +include $(TOP)/configure/RULES +#---------------------------------------- +# ADD RULES AFTER THIS LINE + diff --git a/CAENMCA/CAENMCA-IOC-02App/Makefile b/CAENMCA/CAENMCA-IOC-02App/Makefile new file mode 100644 index 000000000..373b86bfc --- /dev/null +++ b/CAENMCA/CAENMCA-IOC-02App/Makefile @@ -0,0 +1,9 @@ +TOP = .. +include $(TOP)/configure/CONFIG +DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *src*)) +DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *Src*)) +DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *db*)) +DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *Db*)) +DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *protocol*)) +include $(TOP)/configure/RULES_DIRS + diff --git a/CAENMCA/CAENMCA-IOC-02App/src/CAENMCA-IOC-02Main.cpp b/CAENMCA/CAENMCA-IOC-02App/src/CAENMCA-IOC-02Main.cpp new file mode 100644 index 000000000..39bab336b --- /dev/null +++ b/CAENMCA/CAENMCA-IOC-02App/src/CAENMCA-IOC-02Main.cpp @@ -0,0 +1,23 @@ +/* CAENMCA-IOC-02Main.cpp */ +/* Author: Marty Kraimer Date: 17MAR2000 */ + +#include +#include +#include +#include +#include + +#include "epicsExit.h" +#include "epicsThread.h" +#include "iocsh.h" + +int main(int argc,char *argv[]) +{ + if(argc>=2) { + iocsh(argv[1]); + epicsThreadSleep(.2); + } + iocsh(NULL); + epicsExit(0); + return(0); +} diff --git a/CAENMCA/CAENMCA-IOC-02App/src/Makefile b/CAENMCA/CAENMCA-IOC-02App/src/Makefile new file mode 100644 index 000000000..5f28521de --- /dev/null +++ b/CAENMCA/CAENMCA-IOC-02App/src/Makefile @@ -0,0 +1,9 @@ +TOP=../.. +# This file should do very little - it's purpose is to set the APPNAME and then load build.mak + +# this definition is used in build.mak +APPNAME=CAENMCA-IOC-02 + +# If we are ###-IOC-01 leave this as is, if we are ###-IOC-02 or higher change to ###-IOC-01 and delete build.mak from this directory +# there should only be a single build.mak for all IOCs of a given family and it is located in the ###-IOC-01 directory +include $(TOP)/CAENMCA-IOC-01App/src/build.mak diff --git a/CAENMCA/iocBoot/iocCAENMCA-IOC-02/Makefile b/CAENMCA/iocBoot/iocCAENMCA-IOC-02/Makefile new file mode 100644 index 000000000..d5e26aae9 --- /dev/null +++ b/CAENMCA/iocBoot/iocCAENMCA-IOC-02/Makefile @@ -0,0 +1,6 @@ +TOP = ../.. +include $(TOP)/configure/CONFIG +#ARCH = windows-x64-debug +ARCH = $(EPICS_HOST_ARCH) +TARGETS = envPaths dllPath.bat relPaths.sh runIOC.bat runIOC.sh +include $(TOP)/configure/RULES.ioc diff --git a/CAENMCA/iocBoot/iocCAENMCA-IOC-02/st.cmd b/CAENMCA/iocBoot/iocCAENMCA-IOC-02/st.cmd new file mode 100644 index 000000000..45fd24e4b --- /dev/null +++ b/CAENMCA/iocBoot/iocCAENMCA-IOC-02/st.cmd @@ -0,0 +1,18 @@ +#!../../bin/windows-x64-debug/CAENMCA-IOC-02 + +## You may have to change CAENMCA-IOC-02 to something else +## everywhere it appears in this file + +# Increase this if you get <> or discarded messages warnings in your errlog output +errlogInit2(65536, 256) + +< envPaths + +cd "${TOP}" + +## Register all support components +dbLoadDatabase "dbd/CAENMCA-IOC-02.dbd" +CAENMCA_IOC_02_registerRecordDeviceDriver pdbbase + +## calling common command file in ioc 01 boot dir +< ${TOP}/iocBoot/ioc_01_APP_NAME_/st-common.cmd From ef08d94572f7ac860ab68234c88a156ec48c003b Mon Sep 17 00:00:00 2001 From: ChrisColeExpControl Date: Tue, 16 Jun 2020 16:20:53 +0100 Subject: [PATCH 06/23] added second CONEXAGP --- CAENV895/CAENV895-IOC-02App/Db/Makefile | 18 +++++++++++++++ CAENV895/CAENV895-IOC-02App/Makefile | 9 ++++++++ .../src/CAENV895-IOC-02Main.cpp | 23 +++++++++++++++++++ CAENV895/CAENV895-IOC-02App/src/Makefile | 9 ++++++++ CAENV895/iocBoot/iocCAENV895-IOC-02/Makefile | 6 +++++ CAENV895/iocBoot/iocCAENV895-IOC-02/st.cmd | 18 +++++++++++++++ CONEXAGP/CONEXAGP-IOC-02App/Db/Makefile | 18 +++++++++++++++ CONEXAGP/CONEXAGP-IOC-02App/Makefile | 9 ++++++++ .../src/CONEXAGP-IOC-02Main.cpp | 23 +++++++++++++++++++ CONEXAGP/CONEXAGP-IOC-02App/src/Makefile | 9 ++++++++ CONEXAGP/iocBoot/iocCONEXAGP-IOC-02/Makefile | 6 +++++ CONEXAGP/iocBoot/iocCONEXAGP-IOC-02/st.cmd | 18 +++++++++++++++ 12 files changed, 166 insertions(+) create mode 100644 CAENV895/CAENV895-IOC-02App/Db/Makefile create mode 100644 CAENV895/CAENV895-IOC-02App/Makefile create mode 100644 CAENV895/CAENV895-IOC-02App/src/CAENV895-IOC-02Main.cpp create mode 100644 CAENV895/CAENV895-IOC-02App/src/Makefile create mode 100644 CAENV895/iocBoot/iocCAENV895-IOC-02/Makefile create mode 100644 CAENV895/iocBoot/iocCAENV895-IOC-02/st.cmd create mode 100644 CONEXAGP/CONEXAGP-IOC-02App/Db/Makefile create mode 100644 CONEXAGP/CONEXAGP-IOC-02App/Makefile create mode 100644 CONEXAGP/CONEXAGP-IOC-02App/src/CONEXAGP-IOC-02Main.cpp create mode 100644 CONEXAGP/CONEXAGP-IOC-02App/src/Makefile create mode 100644 CONEXAGP/iocBoot/iocCONEXAGP-IOC-02/Makefile create mode 100644 CONEXAGP/iocBoot/iocCONEXAGP-IOC-02/st.cmd diff --git a/CAENV895/CAENV895-IOC-02App/Db/Makefile b/CAENV895/CAENV895-IOC-02App/Db/Makefile new file mode 100644 index 000000000..8eb97279d --- /dev/null +++ b/CAENV895/CAENV895-IOC-02App/Db/Makefile @@ -0,0 +1,18 @@ +TOP=../.. +include $(TOP)/configure/CONFIG +#---------------------------------------- +# ADD MACRO DEFINITIONS AFTER THIS LINE + +#---------------------------------------------------- +# Create and install (or just install) into /db +# databases, templates, substitutions like this +#DB += xxx.db + +#---------------------------------------------------- +# If .db template is not named *.template add +# _template = + +include $(TOP)/configure/RULES +#---------------------------------------- +# ADD RULES AFTER THIS LINE + diff --git a/CAENV895/CAENV895-IOC-02App/Makefile b/CAENV895/CAENV895-IOC-02App/Makefile new file mode 100644 index 000000000..373b86bfc --- /dev/null +++ b/CAENV895/CAENV895-IOC-02App/Makefile @@ -0,0 +1,9 @@ +TOP = .. +include $(TOP)/configure/CONFIG +DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *src*)) +DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *Src*)) +DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *db*)) +DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *Db*)) +DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *protocol*)) +include $(TOP)/configure/RULES_DIRS + diff --git a/CAENV895/CAENV895-IOC-02App/src/CAENV895-IOC-02Main.cpp b/CAENV895/CAENV895-IOC-02App/src/CAENV895-IOC-02Main.cpp new file mode 100644 index 000000000..c4a7dd49e --- /dev/null +++ b/CAENV895/CAENV895-IOC-02App/src/CAENV895-IOC-02Main.cpp @@ -0,0 +1,23 @@ +/* CAENV895-IOC-02Main.cpp */ +/* Author: Marty Kraimer Date: 17MAR2000 */ + +#include +#include +#include +#include +#include + +#include "epicsExit.h" +#include "epicsThread.h" +#include "iocsh.h" + +int main(int argc,char *argv[]) +{ + if(argc>=2) { + iocsh(argv[1]); + epicsThreadSleep(.2); + } + iocsh(NULL); + epicsExit(0); + return(0); +} diff --git a/CAENV895/CAENV895-IOC-02App/src/Makefile b/CAENV895/CAENV895-IOC-02App/src/Makefile new file mode 100644 index 000000000..bd84bfa0d --- /dev/null +++ b/CAENV895/CAENV895-IOC-02App/src/Makefile @@ -0,0 +1,9 @@ +TOP=../.. +# This file should do very little - it's purpose is to set the APPNAME and then load build.mak + +# this definition is used in build.mak +APPNAME=CAENV895-IOC-02 + +# If we are ###-IOC-01 leave this as is, if we are ###-IOC-02 or higher change to ###-IOC-01 and delete build.mak from this directory +# there should only be a single build.mak for all IOCs of a given family and it is located in the ###-IOC-01 directory +include $(TOP)/CAENV895-IOC-01App/src/build.mak diff --git a/CAENV895/iocBoot/iocCAENV895-IOC-02/Makefile b/CAENV895/iocBoot/iocCAENV895-IOC-02/Makefile new file mode 100644 index 000000000..d5e26aae9 --- /dev/null +++ b/CAENV895/iocBoot/iocCAENV895-IOC-02/Makefile @@ -0,0 +1,6 @@ +TOP = ../.. +include $(TOP)/configure/CONFIG +#ARCH = windows-x64-debug +ARCH = $(EPICS_HOST_ARCH) +TARGETS = envPaths dllPath.bat relPaths.sh runIOC.bat runIOC.sh +include $(TOP)/configure/RULES.ioc diff --git a/CAENV895/iocBoot/iocCAENV895-IOC-02/st.cmd b/CAENV895/iocBoot/iocCAENV895-IOC-02/st.cmd new file mode 100644 index 000000000..35ab7adbc --- /dev/null +++ b/CAENV895/iocBoot/iocCAENV895-IOC-02/st.cmd @@ -0,0 +1,18 @@ +#!../../bin/windows-x64-debug/CAENV895-IOC-02 + +## You may have to change CAENV895-IOC-02 to something else +## everywhere it appears in this file + +# Increase this if you get <> or discarded messages warnings in your errlog output +errlogInit2(65536, 256) + +< envPaths + +cd "${TOP}" + +## Register all support components +dbLoadDatabase "dbd/CAENV895-IOC-02.dbd" +CAENV895_IOC_02_registerRecordDeviceDriver pdbbase + +## calling common command file in ioc 01 boot dir +< ${TOP}/iocBoot/ioc_01_APP_NAME_/st-common.cmd diff --git a/CONEXAGP/CONEXAGP-IOC-02App/Db/Makefile b/CONEXAGP/CONEXAGP-IOC-02App/Db/Makefile new file mode 100644 index 000000000..8eb97279d --- /dev/null +++ b/CONEXAGP/CONEXAGP-IOC-02App/Db/Makefile @@ -0,0 +1,18 @@ +TOP=../.. +include $(TOP)/configure/CONFIG +#---------------------------------------- +# ADD MACRO DEFINITIONS AFTER THIS LINE + +#---------------------------------------------------- +# Create and install (or just install) into /db +# databases, templates, substitutions like this +#DB += xxx.db + +#---------------------------------------------------- +# If .db template is not named *.template add +# _template = + +include $(TOP)/configure/RULES +#---------------------------------------- +# ADD RULES AFTER THIS LINE + diff --git a/CONEXAGP/CONEXAGP-IOC-02App/Makefile b/CONEXAGP/CONEXAGP-IOC-02App/Makefile new file mode 100644 index 000000000..373b86bfc --- /dev/null +++ b/CONEXAGP/CONEXAGP-IOC-02App/Makefile @@ -0,0 +1,9 @@ +TOP = .. +include $(TOP)/configure/CONFIG +DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *src*)) +DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *Src*)) +DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *db*)) +DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *Db*)) +DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *protocol*)) +include $(TOP)/configure/RULES_DIRS + diff --git a/CONEXAGP/CONEXAGP-IOC-02App/src/CONEXAGP-IOC-02Main.cpp b/CONEXAGP/CONEXAGP-IOC-02App/src/CONEXAGP-IOC-02Main.cpp new file mode 100644 index 000000000..722ec2cc0 --- /dev/null +++ b/CONEXAGP/CONEXAGP-IOC-02App/src/CONEXAGP-IOC-02Main.cpp @@ -0,0 +1,23 @@ +/* CONEXAGP-IOC-02Main.cpp */ +/* Author: Marty Kraimer Date: 17MAR2000 */ + +#include +#include +#include +#include +#include + +#include "epicsExit.h" +#include "epicsThread.h" +#include "iocsh.h" + +int main(int argc,char *argv[]) +{ + if(argc>=2) { + iocsh(argv[1]); + epicsThreadSleep(.2); + } + iocsh(NULL); + epicsExit(0); + return(0); +} diff --git a/CONEXAGP/CONEXAGP-IOC-02App/src/Makefile b/CONEXAGP/CONEXAGP-IOC-02App/src/Makefile new file mode 100644 index 000000000..ed84567a8 --- /dev/null +++ b/CONEXAGP/CONEXAGP-IOC-02App/src/Makefile @@ -0,0 +1,9 @@ +TOP=../.. +# This file should do very little - it's purpose is to set the APPNAME and then load build.mak + +# this definition is used in build.mak +APPNAME=CONEXAGP-IOC-02 + +# If we are ###-IOC-01 leave this as is, if we are ###-IOC-02 or higher change to ###-IOC-01 and delete build.mak from this directory +# there should only be a single build.mak for all IOCs of a given family and it is located in the ###-IOC-01 directory +include $(TOP)/CONEXAGP-IOC-01App/src/build.mak diff --git a/CONEXAGP/iocBoot/iocCONEXAGP-IOC-02/Makefile b/CONEXAGP/iocBoot/iocCONEXAGP-IOC-02/Makefile new file mode 100644 index 000000000..d5e26aae9 --- /dev/null +++ b/CONEXAGP/iocBoot/iocCONEXAGP-IOC-02/Makefile @@ -0,0 +1,6 @@ +TOP = ../.. +include $(TOP)/configure/CONFIG +#ARCH = windows-x64-debug +ARCH = $(EPICS_HOST_ARCH) +TARGETS = envPaths dllPath.bat relPaths.sh runIOC.bat runIOC.sh +include $(TOP)/configure/RULES.ioc diff --git a/CONEXAGP/iocBoot/iocCONEXAGP-IOC-02/st.cmd b/CONEXAGP/iocBoot/iocCONEXAGP-IOC-02/st.cmd new file mode 100644 index 000000000..678975ff7 --- /dev/null +++ b/CONEXAGP/iocBoot/iocCONEXAGP-IOC-02/st.cmd @@ -0,0 +1,18 @@ +#!../../bin/windows-x64-debug/CONEXAGP-IOC-02 + +## You may have to change CONEXAGP-IOC-02 to something else +## everywhere it appears in this file + +# Increase this if you get <> or discarded messages warnings in your errlog output +errlogInit2(65536, 256) + +< envPaths + +cd "${TOP}" + +## Register all support components +dbLoadDatabase "dbd/CONEXAGP-IOC-02.dbd" +CONEXAGP_IOC_02_registerRecordDeviceDriver pdbbase + +## calling common command file in ioc 01 boot dir +< ${TOP}/iocBoot/ioc_01_APP_NAME_/st-common.cmd From ff8b400baab2e07195830e9265218776e141133b Mon Sep 17 00:00:00 2001 From: ChrisColeExpControl Date: Tue, 16 Jun 2020 16:22:51 +0100 Subject: [PATCH 07/23] added second COUETTE --- COUETTE/COUETTE-IOC-02App/Db/Makefile | 18 +++++++++++++++ COUETTE/COUETTE-IOC-02App/Makefile | 9 ++++++++ .../src/COUETTE-IOC-02Main.cpp | 23 +++++++++++++++++++ COUETTE/COUETTE-IOC-02App/src/Makefile | 9 ++++++++ COUETTE/iocBoot/iocCOUETTE-IOC-02/Makefile | 6 +++++ COUETTE/iocBoot/iocCOUETTE-IOC-02/st.cmd | 18 +++++++++++++++ 6 files changed, 83 insertions(+) create mode 100644 COUETTE/COUETTE-IOC-02App/Db/Makefile create mode 100644 COUETTE/COUETTE-IOC-02App/Makefile create mode 100644 COUETTE/COUETTE-IOC-02App/src/COUETTE-IOC-02Main.cpp create mode 100644 COUETTE/COUETTE-IOC-02App/src/Makefile create mode 100644 COUETTE/iocBoot/iocCOUETTE-IOC-02/Makefile create mode 100644 COUETTE/iocBoot/iocCOUETTE-IOC-02/st.cmd diff --git a/COUETTE/COUETTE-IOC-02App/Db/Makefile b/COUETTE/COUETTE-IOC-02App/Db/Makefile new file mode 100644 index 000000000..8eb97279d --- /dev/null +++ b/COUETTE/COUETTE-IOC-02App/Db/Makefile @@ -0,0 +1,18 @@ +TOP=../.. +include $(TOP)/configure/CONFIG +#---------------------------------------- +# ADD MACRO DEFINITIONS AFTER THIS LINE + +#---------------------------------------------------- +# Create and install (or just install) into /db +# databases, templates, substitutions like this +#DB += xxx.db + +#---------------------------------------------------- +# If .db template is not named *.template add +# _template = + +include $(TOP)/configure/RULES +#---------------------------------------- +# ADD RULES AFTER THIS LINE + diff --git a/COUETTE/COUETTE-IOC-02App/Makefile b/COUETTE/COUETTE-IOC-02App/Makefile new file mode 100644 index 000000000..373b86bfc --- /dev/null +++ b/COUETTE/COUETTE-IOC-02App/Makefile @@ -0,0 +1,9 @@ +TOP = .. +include $(TOP)/configure/CONFIG +DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *src*)) +DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *Src*)) +DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *db*)) +DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *Db*)) +DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *protocol*)) +include $(TOP)/configure/RULES_DIRS + diff --git a/COUETTE/COUETTE-IOC-02App/src/COUETTE-IOC-02Main.cpp b/COUETTE/COUETTE-IOC-02App/src/COUETTE-IOC-02Main.cpp new file mode 100644 index 000000000..7b9e78fce --- /dev/null +++ b/COUETTE/COUETTE-IOC-02App/src/COUETTE-IOC-02Main.cpp @@ -0,0 +1,23 @@ +/* COUETTE-IOC-02Main.cpp */ +/* Author: Marty Kraimer Date: 17MAR2000 */ + +#include +#include +#include +#include +#include + +#include "epicsExit.h" +#include "epicsThread.h" +#include "iocsh.h" + +int main(int argc,char *argv[]) +{ + if(argc>=2) { + iocsh(argv[1]); + epicsThreadSleep(.2); + } + iocsh(NULL); + epicsExit(0); + return(0); +} diff --git a/COUETTE/COUETTE-IOC-02App/src/Makefile b/COUETTE/COUETTE-IOC-02App/src/Makefile new file mode 100644 index 000000000..8fd8f7279 --- /dev/null +++ b/COUETTE/COUETTE-IOC-02App/src/Makefile @@ -0,0 +1,9 @@ +TOP=../.. +# This file should do very little - it's purpose is to set the APPNAME and then load build.mak + +# this definition is used in build.mak +APPNAME=COUETTE-IOC-02 + +# If we are ###-IOC-01 leave this as is, if we are ###-IOC-02 or higher change to ###-IOC-01 and delete build.mak from this directory +# there should only be a single build.mak for all IOCs of a given family and it is located in the ###-IOC-01 directory +include $(TOP)/COUETTE-IOC-01App/src/build.mak diff --git a/COUETTE/iocBoot/iocCOUETTE-IOC-02/Makefile b/COUETTE/iocBoot/iocCOUETTE-IOC-02/Makefile new file mode 100644 index 000000000..d5e26aae9 --- /dev/null +++ b/COUETTE/iocBoot/iocCOUETTE-IOC-02/Makefile @@ -0,0 +1,6 @@ +TOP = ../.. +include $(TOP)/configure/CONFIG +#ARCH = windows-x64-debug +ARCH = $(EPICS_HOST_ARCH) +TARGETS = envPaths dllPath.bat relPaths.sh runIOC.bat runIOC.sh +include $(TOP)/configure/RULES.ioc diff --git a/COUETTE/iocBoot/iocCOUETTE-IOC-02/st.cmd b/COUETTE/iocBoot/iocCOUETTE-IOC-02/st.cmd new file mode 100644 index 000000000..e31067888 --- /dev/null +++ b/COUETTE/iocBoot/iocCOUETTE-IOC-02/st.cmd @@ -0,0 +1,18 @@ +#!../../bin/windows-x64-debug/COUETTE-IOC-02 + +## You may have to change COUETTE-IOC-02 to something else +## everywhere it appears in this file + +# Increase this if you get <> or discarded messages warnings in your errlog output +errlogInit2(65536, 256) + +< envPaths + +cd "${TOP}" + +## Register all support components +dbLoadDatabase "dbd/COUETTE-IOC-02.dbd" +COUETTE_IOC_02_registerRecordDeviceDriver pdbbase + +## calling common command file in ioc 01 boot dir +< ${TOP}/iocBoot/ioc_01_APP_NAME_/st-common.cmd From 7cd61672666d1d6d69904dc4ffdbd926121967d0 Mon Sep 17 00:00:00 2001 From: ChrisColeExpControl Date: Tue, 16 Jun 2020 16:26:05 +0100 Subject: [PATCH 08/23] added second DELFTSHEAR --- DELFTSHEAR/DELFTSHEAR-IOC-02App/Db/Makefile | 18 +++++++++++++++ DELFTSHEAR/DELFTSHEAR-IOC-02App/Makefile | 9 ++++++++ .../src/DELFTSHEAR-IOC-02Main.cpp | 23 +++++++++++++++++++ DELFTSHEAR/DELFTSHEAR-IOC-02App/src/Makefile | 9 ++++++++ .../iocBoot/iocDELFTSHEAR-IOC-02/Makefile | 6 +++++ .../iocBoot/iocDELFTSHEAR-IOC-02/st.cmd | 18 +++++++++++++++ 6 files changed, 83 insertions(+) create mode 100644 DELFTSHEAR/DELFTSHEAR-IOC-02App/Db/Makefile create mode 100644 DELFTSHEAR/DELFTSHEAR-IOC-02App/Makefile create mode 100644 DELFTSHEAR/DELFTSHEAR-IOC-02App/src/DELFTSHEAR-IOC-02Main.cpp create mode 100644 DELFTSHEAR/DELFTSHEAR-IOC-02App/src/Makefile create mode 100644 DELFTSHEAR/iocBoot/iocDELFTSHEAR-IOC-02/Makefile create mode 100644 DELFTSHEAR/iocBoot/iocDELFTSHEAR-IOC-02/st.cmd diff --git a/DELFTSHEAR/DELFTSHEAR-IOC-02App/Db/Makefile b/DELFTSHEAR/DELFTSHEAR-IOC-02App/Db/Makefile new file mode 100644 index 000000000..8eb97279d --- /dev/null +++ b/DELFTSHEAR/DELFTSHEAR-IOC-02App/Db/Makefile @@ -0,0 +1,18 @@ +TOP=../.. +include $(TOP)/configure/CONFIG +#---------------------------------------- +# ADD MACRO DEFINITIONS AFTER THIS LINE + +#---------------------------------------------------- +# Create and install (or just install) into /db +# databases, templates, substitutions like this +#DB += xxx.db + +#---------------------------------------------------- +# If .db template is not named *.template add +# _template = + +include $(TOP)/configure/RULES +#---------------------------------------- +# ADD RULES AFTER THIS LINE + diff --git a/DELFTSHEAR/DELFTSHEAR-IOC-02App/Makefile b/DELFTSHEAR/DELFTSHEAR-IOC-02App/Makefile new file mode 100644 index 000000000..373b86bfc --- /dev/null +++ b/DELFTSHEAR/DELFTSHEAR-IOC-02App/Makefile @@ -0,0 +1,9 @@ +TOP = .. +include $(TOP)/configure/CONFIG +DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *src*)) +DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *Src*)) +DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *db*)) +DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *Db*)) +DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *protocol*)) +include $(TOP)/configure/RULES_DIRS + diff --git a/DELFTSHEAR/DELFTSHEAR-IOC-02App/src/DELFTSHEAR-IOC-02Main.cpp b/DELFTSHEAR/DELFTSHEAR-IOC-02App/src/DELFTSHEAR-IOC-02Main.cpp new file mode 100644 index 000000000..e67720b35 --- /dev/null +++ b/DELFTSHEAR/DELFTSHEAR-IOC-02App/src/DELFTSHEAR-IOC-02Main.cpp @@ -0,0 +1,23 @@ +/* DELFTSHEAR-IOC-02Main.cpp */ +/* Author: Marty Kraimer Date: 17MAR2000 */ + +#include +#include +#include +#include +#include + +#include "epicsExit.h" +#include "epicsThread.h" +#include "iocsh.h" + +int main(int argc,char *argv[]) +{ + if(argc>=2) { + iocsh(argv[1]); + epicsThreadSleep(.2); + } + iocsh(NULL); + epicsExit(0); + return(0); +} diff --git a/DELFTSHEAR/DELFTSHEAR-IOC-02App/src/Makefile b/DELFTSHEAR/DELFTSHEAR-IOC-02App/src/Makefile new file mode 100644 index 000000000..3bb9557d2 --- /dev/null +++ b/DELFTSHEAR/DELFTSHEAR-IOC-02App/src/Makefile @@ -0,0 +1,9 @@ +TOP=../.. +# This file should do very little - it's purpose is to set the APPNAME and then load build.mak + +# this definition is used in build.mak +APPNAME=DELFTSHEAR-IOC-02 + +# If we are ###-IOC-01 leave this as is, if we are ###-IOC-02 or higher change to ###-IOC-01 and delete build.mak from this directory +# there should only be a single build.mak for all IOCs of a given family and it is located in the ###-IOC-01 directory +include $(TOP)/DELFTSHEAR-IOC-01App/src/build.mak diff --git a/DELFTSHEAR/iocBoot/iocDELFTSHEAR-IOC-02/Makefile b/DELFTSHEAR/iocBoot/iocDELFTSHEAR-IOC-02/Makefile new file mode 100644 index 000000000..d5e26aae9 --- /dev/null +++ b/DELFTSHEAR/iocBoot/iocDELFTSHEAR-IOC-02/Makefile @@ -0,0 +1,6 @@ +TOP = ../.. +include $(TOP)/configure/CONFIG +#ARCH = windows-x64-debug +ARCH = $(EPICS_HOST_ARCH) +TARGETS = envPaths dllPath.bat relPaths.sh runIOC.bat runIOC.sh +include $(TOP)/configure/RULES.ioc diff --git a/DELFTSHEAR/iocBoot/iocDELFTSHEAR-IOC-02/st.cmd b/DELFTSHEAR/iocBoot/iocDELFTSHEAR-IOC-02/st.cmd new file mode 100644 index 000000000..5fb9cc7aa --- /dev/null +++ b/DELFTSHEAR/iocBoot/iocDELFTSHEAR-IOC-02/st.cmd @@ -0,0 +1,18 @@ +#!../../bin/windows-x64-debug/DELFTSHEAR-IOC-02 + +## You may have to change DELFTSHEAR-IOC-02 to something else +## everywhere it appears in this file + +# Increase this if you get <> or discarded messages warnings in your errlog output +errlogInit2(65536, 256) + +< envPaths + +cd "${TOP}" + +## Register all support components +dbLoadDatabase "dbd/DELFTSHEAR-IOC-02.dbd" +DELFTSHEAR_IOC_02_registerRecordDeviceDriver pdbbase + +## calling common command file in ioc 01 boot dir +< ${TOP}/iocBoot/ioc_01_APP_NAME_/st-common.cmd From db3d7a26debe25b3e33bf694f75a3eb3bb9483f8 Mon Sep 17 00:00:00 2001 From: ChrisColeExpControl Date: Tue, 16 Jun 2020 16:28:14 +0100 Subject: [PATCH 09/23] added second DETADC --- DETADC/DETADC-IOC-02App/Db/Makefile | 18 +++++++++++++++ DETADC/DETADC-IOC-02App/Makefile | 9 ++++++++ .../src/DETADC-IOC-02Main.cpp | 23 +++++++++++++++++++ DETADC/DETADC-IOC-02App/src/Makefile | 9 ++++++++ DETADC/iocBoot/iocDETADC-IOC-02/Makefile | 6 +++++ DETADC/iocBoot/iocDETADC-IOC-02/st.cmd | 18 +++++++++++++++ 6 files changed, 83 insertions(+) create mode 100644 DETADC/DETADC-IOC-02App/Db/Makefile create mode 100644 DETADC/DETADC-IOC-02App/Makefile create mode 100644 DETADC/DETADC-IOC-02App/src/DETADC-IOC-02Main.cpp create mode 100644 DETADC/DETADC-IOC-02App/src/Makefile create mode 100644 DETADC/iocBoot/iocDETADC-IOC-02/Makefile create mode 100644 DETADC/iocBoot/iocDETADC-IOC-02/st.cmd diff --git a/DETADC/DETADC-IOC-02App/Db/Makefile b/DETADC/DETADC-IOC-02App/Db/Makefile new file mode 100644 index 000000000..8eb97279d --- /dev/null +++ b/DETADC/DETADC-IOC-02App/Db/Makefile @@ -0,0 +1,18 @@ +TOP=../.. +include $(TOP)/configure/CONFIG +#---------------------------------------- +# ADD MACRO DEFINITIONS AFTER THIS LINE + +#---------------------------------------------------- +# Create and install (or just install) into /db +# databases, templates, substitutions like this +#DB += xxx.db + +#---------------------------------------------------- +# If .db template is not named *.template add +# _template = + +include $(TOP)/configure/RULES +#---------------------------------------- +# ADD RULES AFTER THIS LINE + diff --git a/DETADC/DETADC-IOC-02App/Makefile b/DETADC/DETADC-IOC-02App/Makefile new file mode 100644 index 000000000..373b86bfc --- /dev/null +++ b/DETADC/DETADC-IOC-02App/Makefile @@ -0,0 +1,9 @@ +TOP = .. +include $(TOP)/configure/CONFIG +DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *src*)) +DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *Src*)) +DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *db*)) +DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *Db*)) +DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *protocol*)) +include $(TOP)/configure/RULES_DIRS + diff --git a/DETADC/DETADC-IOC-02App/src/DETADC-IOC-02Main.cpp b/DETADC/DETADC-IOC-02App/src/DETADC-IOC-02Main.cpp new file mode 100644 index 000000000..39c58c879 --- /dev/null +++ b/DETADC/DETADC-IOC-02App/src/DETADC-IOC-02Main.cpp @@ -0,0 +1,23 @@ +/* DETADC-IOC-02Main.cpp */ +/* Author: Marty Kraimer Date: 17MAR2000 */ + +#include +#include +#include +#include +#include + +#include "epicsExit.h" +#include "epicsThread.h" +#include "iocsh.h" + +int main(int argc,char *argv[]) +{ + if(argc>=2) { + iocsh(argv[1]); + epicsThreadSleep(.2); + } + iocsh(NULL); + epicsExit(0); + return(0); +} diff --git a/DETADC/DETADC-IOC-02App/src/Makefile b/DETADC/DETADC-IOC-02App/src/Makefile new file mode 100644 index 000000000..0169737ed --- /dev/null +++ b/DETADC/DETADC-IOC-02App/src/Makefile @@ -0,0 +1,9 @@ +TOP=../.. +# This file should do very little - it's purpose is to set the APPNAME and then load build.mak + +# this definition is used in build.mak +APPNAME=DETADC-IOC-02 + +# If we are ###-IOC-01 leave this as is, if we are ###-IOC-02 or higher change to ###-IOC-01 and delete build.mak from this directory +# there should only be a single build.mak for all IOCs of a given family and it is located in the ###-IOC-01 directory +include $(TOP)/DETADC-IOC-01App/src/build.mak diff --git a/DETADC/iocBoot/iocDETADC-IOC-02/Makefile b/DETADC/iocBoot/iocDETADC-IOC-02/Makefile new file mode 100644 index 000000000..d5e26aae9 --- /dev/null +++ b/DETADC/iocBoot/iocDETADC-IOC-02/Makefile @@ -0,0 +1,6 @@ +TOP = ../.. +include $(TOP)/configure/CONFIG +#ARCH = windows-x64-debug +ARCH = $(EPICS_HOST_ARCH) +TARGETS = envPaths dllPath.bat relPaths.sh runIOC.bat runIOC.sh +include $(TOP)/configure/RULES.ioc diff --git a/DETADC/iocBoot/iocDETADC-IOC-02/st.cmd b/DETADC/iocBoot/iocDETADC-IOC-02/st.cmd new file mode 100644 index 000000000..ee8a585e9 --- /dev/null +++ b/DETADC/iocBoot/iocDETADC-IOC-02/st.cmd @@ -0,0 +1,18 @@ +#!../../bin/windows-x64-debug/DETADC-IOC-02 + +## You may have to change DETADC-IOC-02 to something else +## everywhere it appears in this file + +# Increase this if you get <> or discarded messages warnings in your errlog output +errlogInit2(65536, 256) + +< envPaths + +cd "${TOP}" + +## Register all support components +dbLoadDatabase "dbd/DETADC-IOC-02.dbd" +DETADC_IOC_02_registerRecordDeviceDriver pdbbase + +## calling common command file in ioc 01 boot dir +< ${TOP}/iocBoot/ioc_01_APP_NAME_/st-common.cmd From 6a84e5f1c2c901f5e1580f2e06fa1787e7dcaa30 Mon Sep 17 00:00:00 2001 From: ChrisColeExpControl Date: Tue, 16 Jun 2020 16:31:42 +0100 Subject: [PATCH 10/23] added second ECLAB --- ECLAB/ECLAB-IOC-02App/Db/Makefile | 18 +++++++++++++++ ECLAB/ECLAB-IOC-02App/Makefile | 9 ++++++++ .../ECLAB-IOC-02App/src/ECLAB-IOC-02Main.cpp | 23 +++++++++++++++++++ ECLAB/ECLAB-IOC-02App/src/Makefile | 9 ++++++++ ECLAB/iocBoot/iocECLAB-IOC-02/Makefile | 6 +++++ ECLAB/iocBoot/iocECLAB-IOC-02/st.cmd | 18 +++++++++++++++ 6 files changed, 83 insertions(+) create mode 100644 ECLAB/ECLAB-IOC-02App/Db/Makefile create mode 100644 ECLAB/ECLAB-IOC-02App/Makefile create mode 100644 ECLAB/ECLAB-IOC-02App/src/ECLAB-IOC-02Main.cpp create mode 100644 ECLAB/ECLAB-IOC-02App/src/Makefile create mode 100644 ECLAB/iocBoot/iocECLAB-IOC-02/Makefile create mode 100644 ECLAB/iocBoot/iocECLAB-IOC-02/st.cmd diff --git a/ECLAB/ECLAB-IOC-02App/Db/Makefile b/ECLAB/ECLAB-IOC-02App/Db/Makefile new file mode 100644 index 000000000..8eb97279d --- /dev/null +++ b/ECLAB/ECLAB-IOC-02App/Db/Makefile @@ -0,0 +1,18 @@ +TOP=../.. +include $(TOP)/configure/CONFIG +#---------------------------------------- +# ADD MACRO DEFINITIONS AFTER THIS LINE + +#---------------------------------------------------- +# Create and install (or just install) into /db +# databases, templates, substitutions like this +#DB += xxx.db + +#---------------------------------------------------- +# If .db template is not named *.template add +# _template = + +include $(TOP)/configure/RULES +#---------------------------------------- +# ADD RULES AFTER THIS LINE + diff --git a/ECLAB/ECLAB-IOC-02App/Makefile b/ECLAB/ECLAB-IOC-02App/Makefile new file mode 100644 index 000000000..373b86bfc --- /dev/null +++ b/ECLAB/ECLAB-IOC-02App/Makefile @@ -0,0 +1,9 @@ +TOP = .. +include $(TOP)/configure/CONFIG +DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *src*)) +DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *Src*)) +DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *db*)) +DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *Db*)) +DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *protocol*)) +include $(TOP)/configure/RULES_DIRS + diff --git a/ECLAB/ECLAB-IOC-02App/src/ECLAB-IOC-02Main.cpp b/ECLAB/ECLAB-IOC-02App/src/ECLAB-IOC-02Main.cpp new file mode 100644 index 000000000..2a0ce8bee --- /dev/null +++ b/ECLAB/ECLAB-IOC-02App/src/ECLAB-IOC-02Main.cpp @@ -0,0 +1,23 @@ +/* ECLAB-IOC-02Main.cpp */ +/* Author: Marty Kraimer Date: 17MAR2000 */ + +#include +#include +#include +#include +#include + +#include "epicsExit.h" +#include "epicsThread.h" +#include "iocsh.h" + +int main(int argc,char *argv[]) +{ + if(argc>=2) { + iocsh(argv[1]); + epicsThreadSleep(.2); + } + iocsh(NULL); + epicsExit(0); + return(0); +} diff --git a/ECLAB/ECLAB-IOC-02App/src/Makefile b/ECLAB/ECLAB-IOC-02App/src/Makefile new file mode 100644 index 000000000..fe2ea1716 --- /dev/null +++ b/ECLAB/ECLAB-IOC-02App/src/Makefile @@ -0,0 +1,9 @@ +TOP=../.. +# This file should do very little - it's purpose is to set the APPNAME and then load build.mak + +# this definition is used in build.mak +APPNAME=ECLAB-IOC-02 + +# If we are ###-IOC-01 leave this as is, if we are ###-IOC-02 or higher change to ###-IOC-01 and delete build.mak from this directory +# there should only be a single build.mak for all IOCs of a given family and it is located in the ###-IOC-01 directory +include $(TOP)/ECLAB-IOC-01App/src/build.mak diff --git a/ECLAB/iocBoot/iocECLAB-IOC-02/Makefile b/ECLAB/iocBoot/iocECLAB-IOC-02/Makefile new file mode 100644 index 000000000..d5e26aae9 --- /dev/null +++ b/ECLAB/iocBoot/iocECLAB-IOC-02/Makefile @@ -0,0 +1,6 @@ +TOP = ../.. +include $(TOP)/configure/CONFIG +#ARCH = windows-x64-debug +ARCH = $(EPICS_HOST_ARCH) +TARGETS = envPaths dllPath.bat relPaths.sh runIOC.bat runIOC.sh +include $(TOP)/configure/RULES.ioc diff --git a/ECLAB/iocBoot/iocECLAB-IOC-02/st.cmd b/ECLAB/iocBoot/iocECLAB-IOC-02/st.cmd new file mode 100644 index 000000000..6bfec1c5f --- /dev/null +++ b/ECLAB/iocBoot/iocECLAB-IOC-02/st.cmd @@ -0,0 +1,18 @@ +#!../../bin/windows-x64-debug/ECLAB-IOC-02 + +## You may have to change ECLAB-IOC-02 to something else +## everywhere it appears in this file + +# Increase this if you get <> or discarded messages warnings in your errlog output +errlogInit2(65536, 256) + +< envPaths + +cd "${TOP}" + +## Register all support components +dbLoadDatabase "dbd/ECLAB-IOC-02.dbd" +ECLAB_IOC_02_registerRecordDeviceDriver pdbbase + +## calling common command file in ioc 01 boot dir +< ${TOP}/iocBoot/ioc_01_APP_NAME_/st-common.cmd From 358883a5bb55684cd5c8bbca48feabf9f77ffe33 Mon Sep 17 00:00:00 2001 From: ChrisColeExpControl Date: Tue, 16 Jun 2020 16:33:59 +0100 Subject: [PATCH 11/23] added second EGXCOLIM --- EGXCOLIM/EGXCOLIM-IOC-02App/Db/Makefile | 18 +++++++++++++++ EGXCOLIM/EGXCOLIM-IOC-02App/Makefile | 9 ++++++++ .../src/EGXCOLIM-IOC-02Main.cpp | 23 +++++++++++++++++++ EGXCOLIM/EGXCOLIM-IOC-02App/src/Makefile | 9 ++++++++ EGXCOLIM/iocBoot/iocEGXCOLIM-IOC-02/Makefile | 6 +++++ EGXCOLIM/iocBoot/iocEGXCOLIM-IOC-02/st.cmd | 18 +++++++++++++++ 6 files changed, 83 insertions(+) create mode 100644 EGXCOLIM/EGXCOLIM-IOC-02App/Db/Makefile create mode 100644 EGXCOLIM/EGXCOLIM-IOC-02App/Makefile create mode 100644 EGXCOLIM/EGXCOLIM-IOC-02App/src/EGXCOLIM-IOC-02Main.cpp create mode 100644 EGXCOLIM/EGXCOLIM-IOC-02App/src/Makefile create mode 100644 EGXCOLIM/iocBoot/iocEGXCOLIM-IOC-02/Makefile create mode 100644 EGXCOLIM/iocBoot/iocEGXCOLIM-IOC-02/st.cmd diff --git a/EGXCOLIM/EGXCOLIM-IOC-02App/Db/Makefile b/EGXCOLIM/EGXCOLIM-IOC-02App/Db/Makefile new file mode 100644 index 000000000..8eb97279d --- /dev/null +++ b/EGXCOLIM/EGXCOLIM-IOC-02App/Db/Makefile @@ -0,0 +1,18 @@ +TOP=../.. +include $(TOP)/configure/CONFIG +#---------------------------------------- +# ADD MACRO DEFINITIONS AFTER THIS LINE + +#---------------------------------------------------- +# Create and install (or just install) into /db +# databases, templates, substitutions like this +#DB += xxx.db + +#---------------------------------------------------- +# If .db template is not named *.template add +# _template = + +include $(TOP)/configure/RULES +#---------------------------------------- +# ADD RULES AFTER THIS LINE + diff --git a/EGXCOLIM/EGXCOLIM-IOC-02App/Makefile b/EGXCOLIM/EGXCOLIM-IOC-02App/Makefile new file mode 100644 index 000000000..373b86bfc --- /dev/null +++ b/EGXCOLIM/EGXCOLIM-IOC-02App/Makefile @@ -0,0 +1,9 @@ +TOP = .. +include $(TOP)/configure/CONFIG +DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *src*)) +DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *Src*)) +DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *db*)) +DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *Db*)) +DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *protocol*)) +include $(TOP)/configure/RULES_DIRS + diff --git a/EGXCOLIM/EGXCOLIM-IOC-02App/src/EGXCOLIM-IOC-02Main.cpp b/EGXCOLIM/EGXCOLIM-IOC-02App/src/EGXCOLIM-IOC-02Main.cpp new file mode 100644 index 000000000..bb0d1e383 --- /dev/null +++ b/EGXCOLIM/EGXCOLIM-IOC-02App/src/EGXCOLIM-IOC-02Main.cpp @@ -0,0 +1,23 @@ +/* EGXCOLIM-IOC-02Main.cpp */ +/* Author: Marty Kraimer Date: 17MAR2000 */ + +#include +#include +#include +#include +#include + +#include "epicsExit.h" +#include "epicsThread.h" +#include "iocsh.h" + +int main(int argc,char *argv[]) +{ + if(argc>=2) { + iocsh(argv[1]); + epicsThreadSleep(.2); + } + iocsh(NULL); + epicsExit(0); + return(0); +} diff --git a/EGXCOLIM/EGXCOLIM-IOC-02App/src/Makefile b/EGXCOLIM/EGXCOLIM-IOC-02App/src/Makefile new file mode 100644 index 000000000..2514864e4 --- /dev/null +++ b/EGXCOLIM/EGXCOLIM-IOC-02App/src/Makefile @@ -0,0 +1,9 @@ +TOP=../.. +# This file should do very little - it's purpose is to set the APPNAME and then load build.mak + +# this definition is used in build.mak +APPNAME=EGXCOLIM-IOC-02 + +# If we are ###-IOC-01 leave this as is, if we are ###-IOC-02 or higher change to ###-IOC-01 and delete build.mak from this directory +# there should only be a single build.mak for all IOCs of a given family and it is located in the ###-IOC-01 directory +include $(TOP)/EGXCOLIM-IOC-01App/src/build.mak diff --git a/EGXCOLIM/iocBoot/iocEGXCOLIM-IOC-02/Makefile b/EGXCOLIM/iocBoot/iocEGXCOLIM-IOC-02/Makefile new file mode 100644 index 000000000..d5e26aae9 --- /dev/null +++ b/EGXCOLIM/iocBoot/iocEGXCOLIM-IOC-02/Makefile @@ -0,0 +1,6 @@ +TOP = ../.. +include $(TOP)/configure/CONFIG +#ARCH = windows-x64-debug +ARCH = $(EPICS_HOST_ARCH) +TARGETS = envPaths dllPath.bat relPaths.sh runIOC.bat runIOC.sh +include $(TOP)/configure/RULES.ioc diff --git a/EGXCOLIM/iocBoot/iocEGXCOLIM-IOC-02/st.cmd b/EGXCOLIM/iocBoot/iocEGXCOLIM-IOC-02/st.cmd new file mode 100644 index 000000000..e43a7faa0 --- /dev/null +++ b/EGXCOLIM/iocBoot/iocEGXCOLIM-IOC-02/st.cmd @@ -0,0 +1,18 @@ +#!../../bin/windows-x64-debug/EGXCOLIM-IOC-02 + +## You may have to change EGXCOLIM-IOC-02 to something else +## everywhere it appears in this file + +# Increase this if you get <> or discarded messages warnings in your errlog output +errlogInit2(65536, 256) + +< envPaths + +cd "${TOP}" + +## Register all support components +dbLoadDatabase "dbd/EGXCOLIM-IOC-02.dbd" +EGXCOLIM_IOC_02_registerRecordDeviceDriver pdbbase + +## calling common command file in ioc 01 boot dir +< ${TOP}/iocBoot/ioc_01_APP_NAME_/st-common.cmd From 4ab39c5dc1207c4ad295c6539295cd96d6c2bd73 Mon Sep 17 00:00:00 2001 From: ChrisColeExpControl Date: Tue, 16 Jun 2020 16:35:53 +0100 Subject: [PATCH 12/23] added second FERMCHOP --- FERMCHOP/FERMCHOP-IOC-02App/Db/Makefile | 18 +++++++++++++++ FERMCHOP/FERMCHOP-IOC-02App/Makefile | 9 ++++++++ .../src/FERMCHOP-IOC-02Main.cpp | 23 +++++++++++++++++++ FERMCHOP/FERMCHOP-IOC-02App/src/Makefile | 9 ++++++++ FERMCHOP/iocBoot/iocFERMCHOP-IOC-02/Makefile | 6 +++++ FERMCHOP/iocBoot/iocFERMCHOP-IOC-02/st.cmd | 18 +++++++++++++++ 6 files changed, 83 insertions(+) create mode 100644 FERMCHOP/FERMCHOP-IOC-02App/Db/Makefile create mode 100644 FERMCHOP/FERMCHOP-IOC-02App/Makefile create mode 100644 FERMCHOP/FERMCHOP-IOC-02App/src/FERMCHOP-IOC-02Main.cpp create mode 100644 FERMCHOP/FERMCHOP-IOC-02App/src/Makefile create mode 100644 FERMCHOP/iocBoot/iocFERMCHOP-IOC-02/Makefile create mode 100644 FERMCHOP/iocBoot/iocFERMCHOP-IOC-02/st.cmd diff --git a/FERMCHOP/FERMCHOP-IOC-02App/Db/Makefile b/FERMCHOP/FERMCHOP-IOC-02App/Db/Makefile new file mode 100644 index 000000000..8eb97279d --- /dev/null +++ b/FERMCHOP/FERMCHOP-IOC-02App/Db/Makefile @@ -0,0 +1,18 @@ +TOP=../.. +include $(TOP)/configure/CONFIG +#---------------------------------------- +# ADD MACRO DEFINITIONS AFTER THIS LINE + +#---------------------------------------------------- +# Create and install (or just install) into /db +# databases, templates, substitutions like this +#DB += xxx.db + +#---------------------------------------------------- +# If .db template is not named *.template add +# _template = + +include $(TOP)/configure/RULES +#---------------------------------------- +# ADD RULES AFTER THIS LINE + diff --git a/FERMCHOP/FERMCHOP-IOC-02App/Makefile b/FERMCHOP/FERMCHOP-IOC-02App/Makefile new file mode 100644 index 000000000..373b86bfc --- /dev/null +++ b/FERMCHOP/FERMCHOP-IOC-02App/Makefile @@ -0,0 +1,9 @@ +TOP = .. +include $(TOP)/configure/CONFIG +DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *src*)) +DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *Src*)) +DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *db*)) +DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *Db*)) +DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *protocol*)) +include $(TOP)/configure/RULES_DIRS + diff --git a/FERMCHOP/FERMCHOP-IOC-02App/src/FERMCHOP-IOC-02Main.cpp b/FERMCHOP/FERMCHOP-IOC-02App/src/FERMCHOP-IOC-02Main.cpp new file mode 100644 index 000000000..9af49d812 --- /dev/null +++ b/FERMCHOP/FERMCHOP-IOC-02App/src/FERMCHOP-IOC-02Main.cpp @@ -0,0 +1,23 @@ +/* FERMCHOP-IOC-02Main.cpp */ +/* Author: Marty Kraimer Date: 17MAR2000 */ + +#include +#include +#include +#include +#include + +#include "epicsExit.h" +#include "epicsThread.h" +#include "iocsh.h" + +int main(int argc,char *argv[]) +{ + if(argc>=2) { + iocsh(argv[1]); + epicsThreadSleep(.2); + } + iocsh(NULL); + epicsExit(0); + return(0); +} diff --git a/FERMCHOP/FERMCHOP-IOC-02App/src/Makefile b/FERMCHOP/FERMCHOP-IOC-02App/src/Makefile new file mode 100644 index 000000000..dd0179cdf --- /dev/null +++ b/FERMCHOP/FERMCHOP-IOC-02App/src/Makefile @@ -0,0 +1,9 @@ +TOP=../.. +# This file should do very little - it's purpose is to set the APPNAME and then load build.mak + +# this definition is used in build.mak +APPNAME=FERMCHOP-IOC-02 + +# If we are ###-IOC-01 leave this as is, if we are ###-IOC-02 or higher change to ###-IOC-01 and delete build.mak from this directory +# there should only be a single build.mak for all IOCs of a given family and it is located in the ###-IOC-01 directory +include $(TOP)/FERMCHOP-IOC-01App/src/build.mak diff --git a/FERMCHOP/iocBoot/iocFERMCHOP-IOC-02/Makefile b/FERMCHOP/iocBoot/iocFERMCHOP-IOC-02/Makefile new file mode 100644 index 000000000..d5e26aae9 --- /dev/null +++ b/FERMCHOP/iocBoot/iocFERMCHOP-IOC-02/Makefile @@ -0,0 +1,6 @@ +TOP = ../.. +include $(TOP)/configure/CONFIG +#ARCH = windows-x64-debug +ARCH = $(EPICS_HOST_ARCH) +TARGETS = envPaths dllPath.bat relPaths.sh runIOC.bat runIOC.sh +include $(TOP)/configure/RULES.ioc diff --git a/FERMCHOP/iocBoot/iocFERMCHOP-IOC-02/st.cmd b/FERMCHOP/iocBoot/iocFERMCHOP-IOC-02/st.cmd new file mode 100644 index 000000000..7ecc7ad3e --- /dev/null +++ b/FERMCHOP/iocBoot/iocFERMCHOP-IOC-02/st.cmd @@ -0,0 +1,18 @@ +#!../../bin/windows-x64-debug/FERMCHOP-IOC-02 + +## You may have to change FERMCHOP-IOC-02 to something else +## everywhere it appears in this file + +# Increase this if you get <> or discarded messages warnings in your errlog output +errlogInit2(65536, 256) + +< envPaths + +cd "${TOP}" + +## Register all support components +dbLoadDatabase "dbd/FERMCHOP-IOC-02.dbd" +FERMCHOP_IOC_02_registerRecordDeviceDriver pdbbase + +## calling common command file in ioc 01 boot dir +< ${TOP}/iocBoot/ioc_01_APP_NAME_/st-common.cmd From a4a3c78bde36aa29b198644fe919a8a47e63ce0d Mon Sep 17 00:00:00 2001 From: ChrisColeExpControl Date: Tue, 16 Jun 2020 16:38:12 +0100 Subject: [PATCH 13/23] added second FZJDDFCH --- FZJDDFCH/FZJDDFCH-IOC-02App/Db/Makefile | 18 +++++++++++++++ FZJDDFCH/FZJDDFCH-IOC-02App/Makefile | 9 ++++++++ .../src/FZJDDFCH-IOC-02Main.cpp | 23 +++++++++++++++++++ FZJDDFCH/FZJDDFCH-IOC-02App/src/Makefile | 9 ++++++++ FZJDDFCH/iocBoot/iocFZJDDFCH-IOC-02/Makefile | 6 +++++ FZJDDFCH/iocBoot/iocFZJDDFCH-IOC-02/st.cmd | 18 +++++++++++++++ 6 files changed, 83 insertions(+) create mode 100644 FZJDDFCH/FZJDDFCH-IOC-02App/Db/Makefile create mode 100644 FZJDDFCH/FZJDDFCH-IOC-02App/Makefile create mode 100644 FZJDDFCH/FZJDDFCH-IOC-02App/src/FZJDDFCH-IOC-02Main.cpp create mode 100644 FZJDDFCH/FZJDDFCH-IOC-02App/src/Makefile create mode 100644 FZJDDFCH/iocBoot/iocFZJDDFCH-IOC-02/Makefile create mode 100644 FZJDDFCH/iocBoot/iocFZJDDFCH-IOC-02/st.cmd diff --git a/FZJDDFCH/FZJDDFCH-IOC-02App/Db/Makefile b/FZJDDFCH/FZJDDFCH-IOC-02App/Db/Makefile new file mode 100644 index 000000000..8eb97279d --- /dev/null +++ b/FZJDDFCH/FZJDDFCH-IOC-02App/Db/Makefile @@ -0,0 +1,18 @@ +TOP=../.. +include $(TOP)/configure/CONFIG +#---------------------------------------- +# ADD MACRO DEFINITIONS AFTER THIS LINE + +#---------------------------------------------------- +# Create and install (or just install) into /db +# databases, templates, substitutions like this +#DB += xxx.db + +#---------------------------------------------------- +# If .db template is not named *.template add +# _template = + +include $(TOP)/configure/RULES +#---------------------------------------- +# ADD RULES AFTER THIS LINE + diff --git a/FZJDDFCH/FZJDDFCH-IOC-02App/Makefile b/FZJDDFCH/FZJDDFCH-IOC-02App/Makefile new file mode 100644 index 000000000..373b86bfc --- /dev/null +++ b/FZJDDFCH/FZJDDFCH-IOC-02App/Makefile @@ -0,0 +1,9 @@ +TOP = .. +include $(TOP)/configure/CONFIG +DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *src*)) +DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *Src*)) +DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *db*)) +DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *Db*)) +DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *protocol*)) +include $(TOP)/configure/RULES_DIRS + diff --git a/FZJDDFCH/FZJDDFCH-IOC-02App/src/FZJDDFCH-IOC-02Main.cpp b/FZJDDFCH/FZJDDFCH-IOC-02App/src/FZJDDFCH-IOC-02Main.cpp new file mode 100644 index 000000000..c6ab5ad5b --- /dev/null +++ b/FZJDDFCH/FZJDDFCH-IOC-02App/src/FZJDDFCH-IOC-02Main.cpp @@ -0,0 +1,23 @@ +/* FZJDDFCH-IOC-02Main.cpp */ +/* Author: Marty Kraimer Date: 17MAR2000 */ + +#include +#include +#include +#include +#include + +#include "epicsExit.h" +#include "epicsThread.h" +#include "iocsh.h" + +int main(int argc,char *argv[]) +{ + if(argc>=2) { + iocsh(argv[1]); + epicsThreadSleep(.2); + } + iocsh(NULL); + epicsExit(0); + return(0); +} diff --git a/FZJDDFCH/FZJDDFCH-IOC-02App/src/Makefile b/FZJDDFCH/FZJDDFCH-IOC-02App/src/Makefile new file mode 100644 index 000000000..c4c9a7204 --- /dev/null +++ b/FZJDDFCH/FZJDDFCH-IOC-02App/src/Makefile @@ -0,0 +1,9 @@ +TOP=../.. +# This file should do very little - it's purpose is to set the APPNAME and then load build.mak + +# this definition is used in build.mak +APPNAME=FZJDDFCH-IOC-02 + +# If we are ###-IOC-01 leave this as is, if we are ###-IOC-02 or higher change to ###-IOC-01 and delete build.mak from this directory +# there should only be a single build.mak for all IOCs of a given family and it is located in the ###-IOC-01 directory +include $(TOP)/FZJDDFCH-IOC-01App/src/build.mak diff --git a/FZJDDFCH/iocBoot/iocFZJDDFCH-IOC-02/Makefile b/FZJDDFCH/iocBoot/iocFZJDDFCH-IOC-02/Makefile new file mode 100644 index 000000000..d5e26aae9 --- /dev/null +++ b/FZJDDFCH/iocBoot/iocFZJDDFCH-IOC-02/Makefile @@ -0,0 +1,6 @@ +TOP = ../.. +include $(TOP)/configure/CONFIG +#ARCH = windows-x64-debug +ARCH = $(EPICS_HOST_ARCH) +TARGETS = envPaths dllPath.bat relPaths.sh runIOC.bat runIOC.sh +include $(TOP)/configure/RULES.ioc diff --git a/FZJDDFCH/iocBoot/iocFZJDDFCH-IOC-02/st.cmd b/FZJDDFCH/iocBoot/iocFZJDDFCH-IOC-02/st.cmd new file mode 100644 index 000000000..83256d270 --- /dev/null +++ b/FZJDDFCH/iocBoot/iocFZJDDFCH-IOC-02/st.cmd @@ -0,0 +1,18 @@ +#!../../bin/windows-x64-debug/FZJDDFCH-IOC-02 + +## You may have to change FZJDDFCH-IOC-02 to something else +## everywhere it appears in this file + +# Increase this if you get <> or discarded messages warnings in your errlog output +errlogInit2(65536, 256) + +< envPaths + +cd "${TOP}" + +## Register all support components +dbLoadDatabase "dbd/FZJDDFCH-IOC-02.dbd" +FZJDDFCH_IOC_02_registerRecordDeviceDriver pdbbase + +## calling common command file in ioc 01 boot dir +< ${TOP}/iocBoot/ioc_01_APP_NAME_/st-common.cmd From d79819912a0a4d1bf902883484af0006dfaab346 Mon Sep 17 00:00:00 2001 From: ChrisColeExpControl Date: Tue, 16 Jun 2020 16:39:45 +0100 Subject: [PATCH 14/23] added second GAMRY --- GAMRY/GAMRY-IOC-02App/Db/Makefile | 18 +++++++++++++++ GAMRY/GAMRY-IOC-02App/Makefile | 9 ++++++++ .../GAMRY-IOC-02App/src/GAMRY-IOC-02Main.cpp | 23 +++++++++++++++++++ GAMRY/GAMRY-IOC-02App/src/Makefile | 9 ++++++++ GAMRY/iocBoot/iocGAMRY-IOC-02/Makefile | 6 +++++ GAMRY/iocBoot/iocGAMRY-IOC-02/st.cmd | 18 +++++++++++++++ 6 files changed, 83 insertions(+) create mode 100644 GAMRY/GAMRY-IOC-02App/Db/Makefile create mode 100644 GAMRY/GAMRY-IOC-02App/Makefile create mode 100644 GAMRY/GAMRY-IOC-02App/src/GAMRY-IOC-02Main.cpp create mode 100644 GAMRY/GAMRY-IOC-02App/src/Makefile create mode 100644 GAMRY/iocBoot/iocGAMRY-IOC-02/Makefile create mode 100644 GAMRY/iocBoot/iocGAMRY-IOC-02/st.cmd diff --git a/GAMRY/GAMRY-IOC-02App/Db/Makefile b/GAMRY/GAMRY-IOC-02App/Db/Makefile new file mode 100644 index 000000000..8eb97279d --- /dev/null +++ b/GAMRY/GAMRY-IOC-02App/Db/Makefile @@ -0,0 +1,18 @@ +TOP=../.. +include $(TOP)/configure/CONFIG +#---------------------------------------- +# ADD MACRO DEFINITIONS AFTER THIS LINE + +#---------------------------------------------------- +# Create and install (or just install) into /db +# databases, templates, substitutions like this +#DB += xxx.db + +#---------------------------------------------------- +# If .db template is not named *.template add +# _template = + +include $(TOP)/configure/RULES +#---------------------------------------- +# ADD RULES AFTER THIS LINE + diff --git a/GAMRY/GAMRY-IOC-02App/Makefile b/GAMRY/GAMRY-IOC-02App/Makefile new file mode 100644 index 000000000..373b86bfc --- /dev/null +++ b/GAMRY/GAMRY-IOC-02App/Makefile @@ -0,0 +1,9 @@ +TOP = .. +include $(TOP)/configure/CONFIG +DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *src*)) +DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *Src*)) +DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *db*)) +DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *Db*)) +DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *protocol*)) +include $(TOP)/configure/RULES_DIRS + diff --git a/GAMRY/GAMRY-IOC-02App/src/GAMRY-IOC-02Main.cpp b/GAMRY/GAMRY-IOC-02App/src/GAMRY-IOC-02Main.cpp new file mode 100644 index 000000000..b7c6b735c --- /dev/null +++ b/GAMRY/GAMRY-IOC-02App/src/GAMRY-IOC-02Main.cpp @@ -0,0 +1,23 @@ +/* GAMRY-IOC-02Main.cpp */ +/* Author: Marty Kraimer Date: 17MAR2000 */ + +#include +#include +#include +#include +#include + +#include "epicsExit.h" +#include "epicsThread.h" +#include "iocsh.h" + +int main(int argc,char *argv[]) +{ + if(argc>=2) { + iocsh(argv[1]); + epicsThreadSleep(.2); + } + iocsh(NULL); + epicsExit(0); + return(0); +} diff --git a/GAMRY/GAMRY-IOC-02App/src/Makefile b/GAMRY/GAMRY-IOC-02App/src/Makefile new file mode 100644 index 000000000..5344be0f0 --- /dev/null +++ b/GAMRY/GAMRY-IOC-02App/src/Makefile @@ -0,0 +1,9 @@ +TOP=../.. +# This file should do very little - it's purpose is to set the APPNAME and then load build.mak + +# this definition is used in build.mak +APPNAME=GAMRY-IOC-02 + +# If we are ###-IOC-01 leave this as is, if we are ###-IOC-02 or higher change to ###-IOC-01 and delete build.mak from this directory +# there should only be a single build.mak for all IOCs of a given family and it is located in the ###-IOC-01 directory +include $(TOP)/GAMRY-IOC-01App/src/build.mak diff --git a/GAMRY/iocBoot/iocGAMRY-IOC-02/Makefile b/GAMRY/iocBoot/iocGAMRY-IOC-02/Makefile new file mode 100644 index 000000000..d5e26aae9 --- /dev/null +++ b/GAMRY/iocBoot/iocGAMRY-IOC-02/Makefile @@ -0,0 +1,6 @@ +TOP = ../.. +include $(TOP)/configure/CONFIG +#ARCH = windows-x64-debug +ARCH = $(EPICS_HOST_ARCH) +TARGETS = envPaths dllPath.bat relPaths.sh runIOC.bat runIOC.sh +include $(TOP)/configure/RULES.ioc diff --git a/GAMRY/iocBoot/iocGAMRY-IOC-02/st.cmd b/GAMRY/iocBoot/iocGAMRY-IOC-02/st.cmd new file mode 100644 index 000000000..3d26ea0ab --- /dev/null +++ b/GAMRY/iocBoot/iocGAMRY-IOC-02/st.cmd @@ -0,0 +1,18 @@ +#!../../bin/windows-x64-debug/GAMRY-IOC-02 + +## You may have to change GAMRY-IOC-02 to something else +## everywhere it appears in this file + +# Increase this if you get <> or discarded messages warnings in your errlog output +errlogInit2(65536, 256) + +< envPaths + +cd "${TOP}" + +## Register all support components +dbLoadDatabase "dbd/GAMRY-IOC-02.dbd" +GAMRY_IOC_02_registerRecordDeviceDriver pdbbase + +## calling common command file in ioc 01 boot dir +< ${TOP}/iocBoot/ioc_01_APP_NAME_/st-common.cmd From 9340444f9eecc2dd55da408de263f790e9efab36 Mon Sep 17 00:00:00 2001 From: ChrisColeExpControl Date: Tue, 16 Jun 2020 16:43:11 +0100 Subject: [PATCH 15/23] added second GEMORC --- GEMORC/GEMORC-IOC-02App/Db/Makefile | 18 +++++++++++++++ GEMORC/GEMORC-IOC-02App/Makefile | 9 ++++++++ .../src/GEMORC-IOC-02Main.cpp | 23 +++++++++++++++++++ GEMORC/GEMORC-IOC-02App/src/Makefile | 9 ++++++++ GEMORC/iocBoot/iocGEMORC-IOC-02/Makefile | 6 +++++ GEMORC/iocBoot/iocGEMORC-IOC-02/st.cmd | 18 +++++++++++++++ 6 files changed, 83 insertions(+) create mode 100644 GEMORC/GEMORC-IOC-02App/Db/Makefile create mode 100644 GEMORC/GEMORC-IOC-02App/Makefile create mode 100644 GEMORC/GEMORC-IOC-02App/src/GEMORC-IOC-02Main.cpp create mode 100644 GEMORC/GEMORC-IOC-02App/src/Makefile create mode 100644 GEMORC/iocBoot/iocGEMORC-IOC-02/Makefile create mode 100644 GEMORC/iocBoot/iocGEMORC-IOC-02/st.cmd diff --git a/GEMORC/GEMORC-IOC-02App/Db/Makefile b/GEMORC/GEMORC-IOC-02App/Db/Makefile new file mode 100644 index 000000000..8eb97279d --- /dev/null +++ b/GEMORC/GEMORC-IOC-02App/Db/Makefile @@ -0,0 +1,18 @@ +TOP=../.. +include $(TOP)/configure/CONFIG +#---------------------------------------- +# ADD MACRO DEFINITIONS AFTER THIS LINE + +#---------------------------------------------------- +# Create and install (or just install) into /db +# databases, templates, substitutions like this +#DB += xxx.db + +#---------------------------------------------------- +# If .db template is not named *.template add +# _template = + +include $(TOP)/configure/RULES +#---------------------------------------- +# ADD RULES AFTER THIS LINE + diff --git a/GEMORC/GEMORC-IOC-02App/Makefile b/GEMORC/GEMORC-IOC-02App/Makefile new file mode 100644 index 000000000..373b86bfc --- /dev/null +++ b/GEMORC/GEMORC-IOC-02App/Makefile @@ -0,0 +1,9 @@ +TOP = .. +include $(TOP)/configure/CONFIG +DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *src*)) +DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *Src*)) +DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *db*)) +DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *Db*)) +DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *protocol*)) +include $(TOP)/configure/RULES_DIRS + diff --git a/GEMORC/GEMORC-IOC-02App/src/GEMORC-IOC-02Main.cpp b/GEMORC/GEMORC-IOC-02App/src/GEMORC-IOC-02Main.cpp new file mode 100644 index 000000000..b0982fdff --- /dev/null +++ b/GEMORC/GEMORC-IOC-02App/src/GEMORC-IOC-02Main.cpp @@ -0,0 +1,23 @@ +/* GEMORC-IOC-02Main.cpp */ +/* Author: Marty Kraimer Date: 17MAR2000 */ + +#include +#include +#include +#include +#include + +#include "epicsExit.h" +#include "epicsThread.h" +#include "iocsh.h" + +int main(int argc,char *argv[]) +{ + if(argc>=2) { + iocsh(argv[1]); + epicsThreadSleep(.2); + } + iocsh(NULL); + epicsExit(0); + return(0); +} diff --git a/GEMORC/GEMORC-IOC-02App/src/Makefile b/GEMORC/GEMORC-IOC-02App/src/Makefile new file mode 100644 index 000000000..c5f4d9f7a --- /dev/null +++ b/GEMORC/GEMORC-IOC-02App/src/Makefile @@ -0,0 +1,9 @@ +TOP=../.. +# This file should do very little - it's purpose is to set the APPNAME and then load build.mak + +# this definition is used in build.mak +APPNAME=GEMORC-IOC-02 + +# If we are ###-IOC-01 leave this as is, if we are ###-IOC-02 or higher change to ###-IOC-01 and delete build.mak from this directory +# there should only be a single build.mak for all IOCs of a given family and it is located in the ###-IOC-01 directory +include $(TOP)/GEMORC-IOC-01App/src/build.mak diff --git a/GEMORC/iocBoot/iocGEMORC-IOC-02/Makefile b/GEMORC/iocBoot/iocGEMORC-IOC-02/Makefile new file mode 100644 index 000000000..d5e26aae9 --- /dev/null +++ b/GEMORC/iocBoot/iocGEMORC-IOC-02/Makefile @@ -0,0 +1,6 @@ +TOP = ../.. +include $(TOP)/configure/CONFIG +#ARCH = windows-x64-debug +ARCH = $(EPICS_HOST_ARCH) +TARGETS = envPaths dllPath.bat relPaths.sh runIOC.bat runIOC.sh +include $(TOP)/configure/RULES.ioc diff --git a/GEMORC/iocBoot/iocGEMORC-IOC-02/st.cmd b/GEMORC/iocBoot/iocGEMORC-IOC-02/st.cmd new file mode 100644 index 000000000..51540dfba --- /dev/null +++ b/GEMORC/iocBoot/iocGEMORC-IOC-02/st.cmd @@ -0,0 +1,18 @@ +#!../../bin/windows-x64-debug/GEMORC-IOC-02 + +## You may have to change GEMORC-IOC-02 to something else +## everywhere it appears in this file + +# Increase this if you get <> or discarded messages warnings in your errlog output +errlogInit2(65536, 256) + +< envPaths + +cd "${TOP}" + +## Register all support components +dbLoadDatabase "dbd/GEMORC-IOC-02.dbd" +GEMORC_IOC_02_registerRecordDeviceDriver pdbbase + +## calling common command file in ioc 01 boot dir +< ${TOP}/iocBoot/ioc_01_APP_NAME_/st-common.cmd From 3823362ab071c95395374adeb79645cae3d6e2b2 Mon Sep 17 00:00:00 2001 From: ChrisColeExpControl Date: Tue, 16 Jun 2020 16:45:15 +0100 Subject: [PATCH 16/23] added second HVCAEN --- HVCAEN/HVCAEN-IOC-02App/Db/Makefile | 18 +++++++++++++++ HVCAEN/HVCAEN-IOC-02App/Makefile | 9 ++++++++ .../src/HVCAEN-IOC-02Main.cpp | 23 +++++++++++++++++++ HVCAEN/HVCAEN-IOC-02App/src/Makefile | 9 ++++++++ HVCAEN/iocBoot/iocHVCAEN-IOC-02/Makefile | 6 +++++ HVCAEN/iocBoot/iocHVCAEN-IOC-02/st.cmd | 18 +++++++++++++++ 6 files changed, 83 insertions(+) create mode 100644 HVCAEN/HVCAEN-IOC-02App/Db/Makefile create mode 100644 HVCAEN/HVCAEN-IOC-02App/Makefile create mode 100644 HVCAEN/HVCAEN-IOC-02App/src/HVCAEN-IOC-02Main.cpp create mode 100644 HVCAEN/HVCAEN-IOC-02App/src/Makefile create mode 100644 HVCAEN/iocBoot/iocHVCAEN-IOC-02/Makefile create mode 100644 HVCAEN/iocBoot/iocHVCAEN-IOC-02/st.cmd diff --git a/HVCAEN/HVCAEN-IOC-02App/Db/Makefile b/HVCAEN/HVCAEN-IOC-02App/Db/Makefile new file mode 100644 index 000000000..8eb97279d --- /dev/null +++ b/HVCAEN/HVCAEN-IOC-02App/Db/Makefile @@ -0,0 +1,18 @@ +TOP=../.. +include $(TOP)/configure/CONFIG +#---------------------------------------- +# ADD MACRO DEFINITIONS AFTER THIS LINE + +#---------------------------------------------------- +# Create and install (or just install) into /db +# databases, templates, substitutions like this +#DB += xxx.db + +#---------------------------------------------------- +# If .db template is not named *.template add +# _template = + +include $(TOP)/configure/RULES +#---------------------------------------- +# ADD RULES AFTER THIS LINE + diff --git a/HVCAEN/HVCAEN-IOC-02App/Makefile b/HVCAEN/HVCAEN-IOC-02App/Makefile new file mode 100644 index 000000000..373b86bfc --- /dev/null +++ b/HVCAEN/HVCAEN-IOC-02App/Makefile @@ -0,0 +1,9 @@ +TOP = .. +include $(TOP)/configure/CONFIG +DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *src*)) +DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *Src*)) +DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *db*)) +DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *Db*)) +DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *protocol*)) +include $(TOP)/configure/RULES_DIRS + diff --git a/HVCAEN/HVCAEN-IOC-02App/src/HVCAEN-IOC-02Main.cpp b/HVCAEN/HVCAEN-IOC-02App/src/HVCAEN-IOC-02Main.cpp new file mode 100644 index 000000000..c9e69c871 --- /dev/null +++ b/HVCAEN/HVCAEN-IOC-02App/src/HVCAEN-IOC-02Main.cpp @@ -0,0 +1,23 @@ +/* HVCAEN-IOC-02Main.cpp */ +/* Author: Marty Kraimer Date: 17MAR2000 */ + +#include +#include +#include +#include +#include + +#include "epicsExit.h" +#include "epicsThread.h" +#include "iocsh.h" + +int main(int argc,char *argv[]) +{ + if(argc>=2) { + iocsh(argv[1]); + epicsThreadSleep(.2); + } + iocsh(NULL); + epicsExit(0); + return(0); +} diff --git a/HVCAEN/HVCAEN-IOC-02App/src/Makefile b/HVCAEN/HVCAEN-IOC-02App/src/Makefile new file mode 100644 index 000000000..bb50cf0ab --- /dev/null +++ b/HVCAEN/HVCAEN-IOC-02App/src/Makefile @@ -0,0 +1,9 @@ +TOP=../.. +# This file should do very little - it's purpose is to set the APPNAME and then load build.mak + +# this definition is used in build.mak +APPNAME=HVCAEN-IOC-02 + +# If we are ###-IOC-01 leave this as is, if we are ###-IOC-02 or higher change to ###-IOC-01 and delete build.mak from this directory +# there should only be a single build.mak for all IOCs of a given family and it is located in the ###-IOC-01 directory +include $(TOP)/HVCAEN-IOC-01App/src/build.mak diff --git a/HVCAEN/iocBoot/iocHVCAEN-IOC-02/Makefile b/HVCAEN/iocBoot/iocHVCAEN-IOC-02/Makefile new file mode 100644 index 000000000..d5e26aae9 --- /dev/null +++ b/HVCAEN/iocBoot/iocHVCAEN-IOC-02/Makefile @@ -0,0 +1,6 @@ +TOP = ../.. +include $(TOP)/configure/CONFIG +#ARCH = windows-x64-debug +ARCH = $(EPICS_HOST_ARCH) +TARGETS = envPaths dllPath.bat relPaths.sh runIOC.bat runIOC.sh +include $(TOP)/configure/RULES.ioc diff --git a/HVCAEN/iocBoot/iocHVCAEN-IOC-02/st.cmd b/HVCAEN/iocBoot/iocHVCAEN-IOC-02/st.cmd new file mode 100644 index 000000000..b7a10b220 --- /dev/null +++ b/HVCAEN/iocBoot/iocHVCAEN-IOC-02/st.cmd @@ -0,0 +1,18 @@ +#!../../bin/windows-x64-debug/HVCAEN-IOC-02 + +## You may have to change HVCAEN-IOC-02 to something else +## everywhere it appears in this file + +# Increase this if you get <> or discarded messages warnings in your errlog output +errlogInit2(65536, 256) + +< envPaths + +cd "${TOP}" + +## Register all support components +dbLoadDatabase "dbd/HVCAEN-IOC-02.dbd" +HVCAEN_IOC_02_registerRecordDeviceDriver pdbbase + +## calling common command file in ioc 01 boot dir +< ${TOP}/iocBoot/ioc_01_APP_NAME_/st-common.cmd From df9fbd08982626df5904caabaa5883841714d0e6 Mon Sep 17 00:00:00 2001 From: ChrisColeExpControl Date: Tue, 16 Jun 2020 16:47:10 +0100 Subject: [PATCH 17/23] added second IEG --- IEG/IEG-IOC-02App/Db/Makefile | 18 ++++++++++++++++++ IEG/IEG-IOC-02App/Makefile | 9 +++++++++ IEG/IEG-IOC-02App/src/IEG-IOC-02Main.cpp | 23 +++++++++++++++++++++++ IEG/IEG-IOC-02App/src/Makefile | 9 +++++++++ IEG/iocBoot/iocIEG-IOC-02/Makefile | 6 ++++++ IEG/iocBoot/iocIEG-IOC-02/st.cmd | 18 ++++++++++++++++++ 6 files changed, 83 insertions(+) create mode 100644 IEG/IEG-IOC-02App/Db/Makefile create mode 100644 IEG/IEG-IOC-02App/Makefile create mode 100644 IEG/IEG-IOC-02App/src/IEG-IOC-02Main.cpp create mode 100644 IEG/IEG-IOC-02App/src/Makefile create mode 100644 IEG/iocBoot/iocIEG-IOC-02/Makefile create mode 100644 IEG/iocBoot/iocIEG-IOC-02/st.cmd diff --git a/IEG/IEG-IOC-02App/Db/Makefile b/IEG/IEG-IOC-02App/Db/Makefile new file mode 100644 index 000000000..8eb97279d --- /dev/null +++ b/IEG/IEG-IOC-02App/Db/Makefile @@ -0,0 +1,18 @@ +TOP=../.. +include $(TOP)/configure/CONFIG +#---------------------------------------- +# ADD MACRO DEFINITIONS AFTER THIS LINE + +#---------------------------------------------------- +# Create and install (or just install) into /db +# databases, templates, substitutions like this +#DB += xxx.db + +#---------------------------------------------------- +# If .db template is not named *.template add +# _template = + +include $(TOP)/configure/RULES +#---------------------------------------- +# ADD RULES AFTER THIS LINE + diff --git a/IEG/IEG-IOC-02App/Makefile b/IEG/IEG-IOC-02App/Makefile new file mode 100644 index 000000000..373b86bfc --- /dev/null +++ b/IEG/IEG-IOC-02App/Makefile @@ -0,0 +1,9 @@ +TOP = .. +include $(TOP)/configure/CONFIG +DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *src*)) +DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *Src*)) +DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *db*)) +DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *Db*)) +DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *protocol*)) +include $(TOP)/configure/RULES_DIRS + diff --git a/IEG/IEG-IOC-02App/src/IEG-IOC-02Main.cpp b/IEG/IEG-IOC-02App/src/IEG-IOC-02Main.cpp new file mode 100644 index 000000000..5a4e0ef9a --- /dev/null +++ b/IEG/IEG-IOC-02App/src/IEG-IOC-02Main.cpp @@ -0,0 +1,23 @@ +/* IEG-IOC-02Main.cpp */ +/* Author: Marty Kraimer Date: 17MAR2000 */ + +#include +#include +#include +#include +#include + +#include "epicsExit.h" +#include "epicsThread.h" +#include "iocsh.h" + +int main(int argc,char *argv[]) +{ + if(argc>=2) { + iocsh(argv[1]); + epicsThreadSleep(.2); + } + iocsh(NULL); + epicsExit(0); + return(0); +} diff --git a/IEG/IEG-IOC-02App/src/Makefile b/IEG/IEG-IOC-02App/src/Makefile new file mode 100644 index 000000000..00ef85e06 --- /dev/null +++ b/IEG/IEG-IOC-02App/src/Makefile @@ -0,0 +1,9 @@ +TOP=../.. +# This file should do very little - it's purpose is to set the APPNAME and then load build.mak + +# this definition is used in build.mak +APPNAME=IEG-IOC-02 + +# If we are ###-IOC-01 leave this as is, if we are ###-IOC-02 or higher change to ###-IOC-01 and delete build.mak from this directory +# there should only be a single build.mak for all IOCs of a given family and it is located in the ###-IOC-01 directory +include $(TOP)/IEG-IOC-01App/src/build.mak diff --git a/IEG/iocBoot/iocIEG-IOC-02/Makefile b/IEG/iocBoot/iocIEG-IOC-02/Makefile new file mode 100644 index 000000000..d5e26aae9 --- /dev/null +++ b/IEG/iocBoot/iocIEG-IOC-02/Makefile @@ -0,0 +1,6 @@ +TOP = ../.. +include $(TOP)/configure/CONFIG +#ARCH = windows-x64-debug +ARCH = $(EPICS_HOST_ARCH) +TARGETS = envPaths dllPath.bat relPaths.sh runIOC.bat runIOC.sh +include $(TOP)/configure/RULES.ioc diff --git a/IEG/iocBoot/iocIEG-IOC-02/st.cmd b/IEG/iocBoot/iocIEG-IOC-02/st.cmd new file mode 100644 index 000000000..f74934242 --- /dev/null +++ b/IEG/iocBoot/iocIEG-IOC-02/st.cmd @@ -0,0 +1,18 @@ +#!../../bin/windows-x64-debug/IEG-IOC-02 + +## You may have to change IEG-IOC-02 to something else +## everywhere it appears in this file + +# Increase this if you get <> or discarded messages warnings in your errlog output +errlogInit2(65536, 256) + +< envPaths + +cd "${TOP}" + +## Register all support components +dbLoadDatabase "dbd/IEG-IOC-02.dbd" +IEG_IOC_02_registerRecordDeviceDriver pdbbase + +## calling common command file in ioc 01 boot dir +< ${TOP}/iocBoot/ioc_01_APP_NAME_/st-common.cmd From f05616ab76fcf199f06ca18b3fd3aa8aa09ab797 Mon Sep 17 00:00:00 2001 From: ChrisColeExpControl Date: Tue, 16 Jun 2020 17:32:28 +0100 Subject: [PATCH 18/23] Revert "added second COUETTE" This reverts commit ff8b400baab2e07195830e9265218776e141133b. --- COUETTE/COUETTE-IOC-02App/Db/Makefile | 18 --------------- COUETTE/COUETTE-IOC-02App/Makefile | 9 -------- .../src/COUETTE-IOC-02Main.cpp | 23 ------------------- COUETTE/COUETTE-IOC-02App/src/Makefile | 9 -------- COUETTE/iocBoot/iocCOUETTE-IOC-02/Makefile | 6 ----- COUETTE/iocBoot/iocCOUETTE-IOC-02/st.cmd | 18 --------------- 6 files changed, 83 deletions(-) delete mode 100644 COUETTE/COUETTE-IOC-02App/Db/Makefile delete mode 100644 COUETTE/COUETTE-IOC-02App/Makefile delete mode 100644 COUETTE/COUETTE-IOC-02App/src/COUETTE-IOC-02Main.cpp delete mode 100644 COUETTE/COUETTE-IOC-02App/src/Makefile delete mode 100644 COUETTE/iocBoot/iocCOUETTE-IOC-02/Makefile delete mode 100644 COUETTE/iocBoot/iocCOUETTE-IOC-02/st.cmd diff --git a/COUETTE/COUETTE-IOC-02App/Db/Makefile b/COUETTE/COUETTE-IOC-02App/Db/Makefile deleted file mode 100644 index 8eb97279d..000000000 --- a/COUETTE/COUETTE-IOC-02App/Db/Makefile +++ /dev/null @@ -1,18 +0,0 @@ -TOP=../.. -include $(TOP)/configure/CONFIG -#---------------------------------------- -# ADD MACRO DEFINITIONS AFTER THIS LINE - -#---------------------------------------------------- -# Create and install (or just install) into /db -# databases, templates, substitutions like this -#DB += xxx.db - -#---------------------------------------------------- -# If .db template is not named *.template add -# _template = - -include $(TOP)/configure/RULES -#---------------------------------------- -# ADD RULES AFTER THIS LINE - diff --git a/COUETTE/COUETTE-IOC-02App/Makefile b/COUETTE/COUETTE-IOC-02App/Makefile deleted file mode 100644 index 373b86bfc..000000000 --- a/COUETTE/COUETTE-IOC-02App/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -TOP = .. -include $(TOP)/configure/CONFIG -DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *src*)) -DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *Src*)) -DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *db*)) -DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *Db*)) -DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *protocol*)) -include $(TOP)/configure/RULES_DIRS - diff --git a/COUETTE/COUETTE-IOC-02App/src/COUETTE-IOC-02Main.cpp b/COUETTE/COUETTE-IOC-02App/src/COUETTE-IOC-02Main.cpp deleted file mode 100644 index 7b9e78fce..000000000 --- a/COUETTE/COUETTE-IOC-02App/src/COUETTE-IOC-02Main.cpp +++ /dev/null @@ -1,23 +0,0 @@ -/* COUETTE-IOC-02Main.cpp */ -/* Author: Marty Kraimer Date: 17MAR2000 */ - -#include -#include -#include -#include -#include - -#include "epicsExit.h" -#include "epicsThread.h" -#include "iocsh.h" - -int main(int argc,char *argv[]) -{ - if(argc>=2) { - iocsh(argv[1]); - epicsThreadSleep(.2); - } - iocsh(NULL); - epicsExit(0); - return(0); -} diff --git a/COUETTE/COUETTE-IOC-02App/src/Makefile b/COUETTE/COUETTE-IOC-02App/src/Makefile deleted file mode 100644 index 8fd8f7279..000000000 --- a/COUETTE/COUETTE-IOC-02App/src/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -TOP=../.. -# This file should do very little - it's purpose is to set the APPNAME and then load build.mak - -# this definition is used in build.mak -APPNAME=COUETTE-IOC-02 - -# If we are ###-IOC-01 leave this as is, if we are ###-IOC-02 or higher change to ###-IOC-01 and delete build.mak from this directory -# there should only be a single build.mak for all IOCs of a given family and it is located in the ###-IOC-01 directory -include $(TOP)/COUETTE-IOC-01App/src/build.mak diff --git a/COUETTE/iocBoot/iocCOUETTE-IOC-02/Makefile b/COUETTE/iocBoot/iocCOUETTE-IOC-02/Makefile deleted file mode 100644 index d5e26aae9..000000000 --- a/COUETTE/iocBoot/iocCOUETTE-IOC-02/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -TOP = ../.. -include $(TOP)/configure/CONFIG -#ARCH = windows-x64-debug -ARCH = $(EPICS_HOST_ARCH) -TARGETS = envPaths dllPath.bat relPaths.sh runIOC.bat runIOC.sh -include $(TOP)/configure/RULES.ioc diff --git a/COUETTE/iocBoot/iocCOUETTE-IOC-02/st.cmd b/COUETTE/iocBoot/iocCOUETTE-IOC-02/st.cmd deleted file mode 100644 index e31067888..000000000 --- a/COUETTE/iocBoot/iocCOUETTE-IOC-02/st.cmd +++ /dev/null @@ -1,18 +0,0 @@ -#!../../bin/windows-x64-debug/COUETTE-IOC-02 - -## You may have to change COUETTE-IOC-02 to something else -## everywhere it appears in this file - -# Increase this if you get <> or discarded messages warnings in your errlog output -errlogInit2(65536, 256) - -< envPaths - -cd "${TOP}" - -## Register all support components -dbLoadDatabase "dbd/COUETTE-IOC-02.dbd" -COUETTE_IOC_02_registerRecordDeviceDriver pdbbase - -## calling common command file in ioc 01 boot dir -< ${TOP}/iocBoot/ioc_01_APP_NAME_/st-common.cmd From 234a44e57a500fe579b59b8cedd52bd779a6fd67 Mon Sep 17 00:00:00 2001 From: ChrisColeExpControl Date: Tue, 16 Jun 2020 17:32:58 +0100 Subject: [PATCH 19/23] Revert "added second EGXCOLIM" This reverts commit 358883a5bb55684cd5c8bbca48feabf9f77ffe33. --- EGXCOLIM/EGXCOLIM-IOC-02App/Db/Makefile | 18 --------------- EGXCOLIM/EGXCOLIM-IOC-02App/Makefile | 9 -------- .../src/EGXCOLIM-IOC-02Main.cpp | 23 ------------------- EGXCOLIM/EGXCOLIM-IOC-02App/src/Makefile | 9 -------- EGXCOLIM/iocBoot/iocEGXCOLIM-IOC-02/Makefile | 6 ----- EGXCOLIM/iocBoot/iocEGXCOLIM-IOC-02/st.cmd | 18 --------------- 6 files changed, 83 deletions(-) delete mode 100644 EGXCOLIM/EGXCOLIM-IOC-02App/Db/Makefile delete mode 100644 EGXCOLIM/EGXCOLIM-IOC-02App/Makefile delete mode 100644 EGXCOLIM/EGXCOLIM-IOC-02App/src/EGXCOLIM-IOC-02Main.cpp delete mode 100644 EGXCOLIM/EGXCOLIM-IOC-02App/src/Makefile delete mode 100644 EGXCOLIM/iocBoot/iocEGXCOLIM-IOC-02/Makefile delete mode 100644 EGXCOLIM/iocBoot/iocEGXCOLIM-IOC-02/st.cmd diff --git a/EGXCOLIM/EGXCOLIM-IOC-02App/Db/Makefile b/EGXCOLIM/EGXCOLIM-IOC-02App/Db/Makefile deleted file mode 100644 index 8eb97279d..000000000 --- a/EGXCOLIM/EGXCOLIM-IOC-02App/Db/Makefile +++ /dev/null @@ -1,18 +0,0 @@ -TOP=../.. -include $(TOP)/configure/CONFIG -#---------------------------------------- -# ADD MACRO DEFINITIONS AFTER THIS LINE - -#---------------------------------------------------- -# Create and install (or just install) into /db -# databases, templates, substitutions like this -#DB += xxx.db - -#---------------------------------------------------- -# If .db template is not named *.template add -# _template = - -include $(TOP)/configure/RULES -#---------------------------------------- -# ADD RULES AFTER THIS LINE - diff --git a/EGXCOLIM/EGXCOLIM-IOC-02App/Makefile b/EGXCOLIM/EGXCOLIM-IOC-02App/Makefile deleted file mode 100644 index 373b86bfc..000000000 --- a/EGXCOLIM/EGXCOLIM-IOC-02App/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -TOP = .. -include $(TOP)/configure/CONFIG -DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *src*)) -DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *Src*)) -DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *db*)) -DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *Db*)) -DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *protocol*)) -include $(TOP)/configure/RULES_DIRS - diff --git a/EGXCOLIM/EGXCOLIM-IOC-02App/src/EGXCOLIM-IOC-02Main.cpp b/EGXCOLIM/EGXCOLIM-IOC-02App/src/EGXCOLIM-IOC-02Main.cpp deleted file mode 100644 index bb0d1e383..000000000 --- a/EGXCOLIM/EGXCOLIM-IOC-02App/src/EGXCOLIM-IOC-02Main.cpp +++ /dev/null @@ -1,23 +0,0 @@ -/* EGXCOLIM-IOC-02Main.cpp */ -/* Author: Marty Kraimer Date: 17MAR2000 */ - -#include -#include -#include -#include -#include - -#include "epicsExit.h" -#include "epicsThread.h" -#include "iocsh.h" - -int main(int argc,char *argv[]) -{ - if(argc>=2) { - iocsh(argv[1]); - epicsThreadSleep(.2); - } - iocsh(NULL); - epicsExit(0); - return(0); -} diff --git a/EGXCOLIM/EGXCOLIM-IOC-02App/src/Makefile b/EGXCOLIM/EGXCOLIM-IOC-02App/src/Makefile deleted file mode 100644 index 2514864e4..000000000 --- a/EGXCOLIM/EGXCOLIM-IOC-02App/src/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -TOP=../.. -# This file should do very little - it's purpose is to set the APPNAME and then load build.mak - -# this definition is used in build.mak -APPNAME=EGXCOLIM-IOC-02 - -# If we are ###-IOC-01 leave this as is, if we are ###-IOC-02 or higher change to ###-IOC-01 and delete build.mak from this directory -# there should only be a single build.mak for all IOCs of a given family and it is located in the ###-IOC-01 directory -include $(TOP)/EGXCOLIM-IOC-01App/src/build.mak diff --git a/EGXCOLIM/iocBoot/iocEGXCOLIM-IOC-02/Makefile b/EGXCOLIM/iocBoot/iocEGXCOLIM-IOC-02/Makefile deleted file mode 100644 index d5e26aae9..000000000 --- a/EGXCOLIM/iocBoot/iocEGXCOLIM-IOC-02/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -TOP = ../.. -include $(TOP)/configure/CONFIG -#ARCH = windows-x64-debug -ARCH = $(EPICS_HOST_ARCH) -TARGETS = envPaths dllPath.bat relPaths.sh runIOC.bat runIOC.sh -include $(TOP)/configure/RULES.ioc diff --git a/EGXCOLIM/iocBoot/iocEGXCOLIM-IOC-02/st.cmd b/EGXCOLIM/iocBoot/iocEGXCOLIM-IOC-02/st.cmd deleted file mode 100644 index e43a7faa0..000000000 --- a/EGXCOLIM/iocBoot/iocEGXCOLIM-IOC-02/st.cmd +++ /dev/null @@ -1,18 +0,0 @@ -#!../../bin/windows-x64-debug/EGXCOLIM-IOC-02 - -## You may have to change EGXCOLIM-IOC-02 to something else -## everywhere it appears in this file - -# Increase this if you get <> or discarded messages warnings in your errlog output -errlogInit2(65536, 256) - -< envPaths - -cd "${TOP}" - -## Register all support components -dbLoadDatabase "dbd/EGXCOLIM-IOC-02.dbd" -EGXCOLIM_IOC_02_registerRecordDeviceDriver pdbbase - -## calling common command file in ioc 01 boot dir -< ${TOP}/iocBoot/ioc_01_APP_NAME_/st-common.cmd From c1a1e7666b7854b295bdbc1a7a6578979304782c Mon Sep 17 00:00:00 2001 From: ChrisColeExpControl Date: Tue, 16 Jun 2020 17:33:28 +0100 Subject: [PATCH 20/23] Revert "added second FERMCHOP" This reverts commit 4ab39c5dc1207c4ad295c6539295cd96d6c2bd73. --- FERMCHOP/FERMCHOP-IOC-02App/Db/Makefile | 18 --------------- FERMCHOP/FERMCHOP-IOC-02App/Makefile | 9 -------- .../src/FERMCHOP-IOC-02Main.cpp | 23 ------------------- FERMCHOP/FERMCHOP-IOC-02App/src/Makefile | 9 -------- FERMCHOP/iocBoot/iocFERMCHOP-IOC-02/Makefile | 6 ----- FERMCHOP/iocBoot/iocFERMCHOP-IOC-02/st.cmd | 18 --------------- 6 files changed, 83 deletions(-) delete mode 100644 FERMCHOP/FERMCHOP-IOC-02App/Db/Makefile delete mode 100644 FERMCHOP/FERMCHOP-IOC-02App/Makefile delete mode 100644 FERMCHOP/FERMCHOP-IOC-02App/src/FERMCHOP-IOC-02Main.cpp delete mode 100644 FERMCHOP/FERMCHOP-IOC-02App/src/Makefile delete mode 100644 FERMCHOP/iocBoot/iocFERMCHOP-IOC-02/Makefile delete mode 100644 FERMCHOP/iocBoot/iocFERMCHOP-IOC-02/st.cmd diff --git a/FERMCHOP/FERMCHOP-IOC-02App/Db/Makefile b/FERMCHOP/FERMCHOP-IOC-02App/Db/Makefile deleted file mode 100644 index 8eb97279d..000000000 --- a/FERMCHOP/FERMCHOP-IOC-02App/Db/Makefile +++ /dev/null @@ -1,18 +0,0 @@ -TOP=../.. -include $(TOP)/configure/CONFIG -#---------------------------------------- -# ADD MACRO DEFINITIONS AFTER THIS LINE - -#---------------------------------------------------- -# Create and install (or just install) into /db -# databases, templates, substitutions like this -#DB += xxx.db - -#---------------------------------------------------- -# If .db template is not named *.template add -# _template = - -include $(TOP)/configure/RULES -#---------------------------------------- -# ADD RULES AFTER THIS LINE - diff --git a/FERMCHOP/FERMCHOP-IOC-02App/Makefile b/FERMCHOP/FERMCHOP-IOC-02App/Makefile deleted file mode 100644 index 373b86bfc..000000000 --- a/FERMCHOP/FERMCHOP-IOC-02App/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -TOP = .. -include $(TOP)/configure/CONFIG -DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *src*)) -DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *Src*)) -DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *db*)) -DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *Db*)) -DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *protocol*)) -include $(TOP)/configure/RULES_DIRS - diff --git a/FERMCHOP/FERMCHOP-IOC-02App/src/FERMCHOP-IOC-02Main.cpp b/FERMCHOP/FERMCHOP-IOC-02App/src/FERMCHOP-IOC-02Main.cpp deleted file mode 100644 index 9af49d812..000000000 --- a/FERMCHOP/FERMCHOP-IOC-02App/src/FERMCHOP-IOC-02Main.cpp +++ /dev/null @@ -1,23 +0,0 @@ -/* FERMCHOP-IOC-02Main.cpp */ -/* Author: Marty Kraimer Date: 17MAR2000 */ - -#include -#include -#include -#include -#include - -#include "epicsExit.h" -#include "epicsThread.h" -#include "iocsh.h" - -int main(int argc,char *argv[]) -{ - if(argc>=2) { - iocsh(argv[1]); - epicsThreadSleep(.2); - } - iocsh(NULL); - epicsExit(0); - return(0); -} diff --git a/FERMCHOP/FERMCHOP-IOC-02App/src/Makefile b/FERMCHOP/FERMCHOP-IOC-02App/src/Makefile deleted file mode 100644 index dd0179cdf..000000000 --- a/FERMCHOP/FERMCHOP-IOC-02App/src/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -TOP=../.. -# This file should do very little - it's purpose is to set the APPNAME and then load build.mak - -# this definition is used in build.mak -APPNAME=FERMCHOP-IOC-02 - -# If we are ###-IOC-01 leave this as is, if we are ###-IOC-02 or higher change to ###-IOC-01 and delete build.mak from this directory -# there should only be a single build.mak for all IOCs of a given family and it is located in the ###-IOC-01 directory -include $(TOP)/FERMCHOP-IOC-01App/src/build.mak diff --git a/FERMCHOP/iocBoot/iocFERMCHOP-IOC-02/Makefile b/FERMCHOP/iocBoot/iocFERMCHOP-IOC-02/Makefile deleted file mode 100644 index d5e26aae9..000000000 --- a/FERMCHOP/iocBoot/iocFERMCHOP-IOC-02/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -TOP = ../.. -include $(TOP)/configure/CONFIG -#ARCH = windows-x64-debug -ARCH = $(EPICS_HOST_ARCH) -TARGETS = envPaths dllPath.bat relPaths.sh runIOC.bat runIOC.sh -include $(TOP)/configure/RULES.ioc diff --git a/FERMCHOP/iocBoot/iocFERMCHOP-IOC-02/st.cmd b/FERMCHOP/iocBoot/iocFERMCHOP-IOC-02/st.cmd deleted file mode 100644 index 7ecc7ad3e..000000000 --- a/FERMCHOP/iocBoot/iocFERMCHOP-IOC-02/st.cmd +++ /dev/null @@ -1,18 +0,0 @@ -#!../../bin/windows-x64-debug/FERMCHOP-IOC-02 - -## You may have to change FERMCHOP-IOC-02 to something else -## everywhere it appears in this file - -# Increase this if you get <> or discarded messages warnings in your errlog output -errlogInit2(65536, 256) - -< envPaths - -cd "${TOP}" - -## Register all support components -dbLoadDatabase "dbd/FERMCHOP-IOC-02.dbd" -FERMCHOP_IOC_02_registerRecordDeviceDriver pdbbase - -## calling common command file in ioc 01 boot dir -< ${TOP}/iocBoot/ioc_01_APP_NAME_/st-common.cmd From ca793eb6003e58a641a22d9a32de5a74dcbb218f Mon Sep 17 00:00:00 2001 From: ChrisColeExpControl Date: Tue, 16 Jun 2020 17:34:10 +0100 Subject: [PATCH 21/23] Revert "added second GEMORC" This reverts commit 9340444f9eecc2dd55da408de263f790e9efab36. --- GEMORC/GEMORC-IOC-02App/Db/Makefile | 18 --------------- GEMORC/GEMORC-IOC-02App/Makefile | 9 -------- .../src/GEMORC-IOC-02Main.cpp | 23 ------------------- GEMORC/GEMORC-IOC-02App/src/Makefile | 9 -------- GEMORC/iocBoot/iocGEMORC-IOC-02/Makefile | 6 ----- GEMORC/iocBoot/iocGEMORC-IOC-02/st.cmd | 18 --------------- 6 files changed, 83 deletions(-) delete mode 100644 GEMORC/GEMORC-IOC-02App/Db/Makefile delete mode 100644 GEMORC/GEMORC-IOC-02App/Makefile delete mode 100644 GEMORC/GEMORC-IOC-02App/src/GEMORC-IOC-02Main.cpp delete mode 100644 GEMORC/GEMORC-IOC-02App/src/Makefile delete mode 100644 GEMORC/iocBoot/iocGEMORC-IOC-02/Makefile delete mode 100644 GEMORC/iocBoot/iocGEMORC-IOC-02/st.cmd diff --git a/GEMORC/GEMORC-IOC-02App/Db/Makefile b/GEMORC/GEMORC-IOC-02App/Db/Makefile deleted file mode 100644 index 8eb97279d..000000000 --- a/GEMORC/GEMORC-IOC-02App/Db/Makefile +++ /dev/null @@ -1,18 +0,0 @@ -TOP=../.. -include $(TOP)/configure/CONFIG -#---------------------------------------- -# ADD MACRO DEFINITIONS AFTER THIS LINE - -#---------------------------------------------------- -# Create and install (or just install) into /db -# databases, templates, substitutions like this -#DB += xxx.db - -#---------------------------------------------------- -# If .db template is not named *.template add -# _template = - -include $(TOP)/configure/RULES -#---------------------------------------- -# ADD RULES AFTER THIS LINE - diff --git a/GEMORC/GEMORC-IOC-02App/Makefile b/GEMORC/GEMORC-IOC-02App/Makefile deleted file mode 100644 index 373b86bfc..000000000 --- a/GEMORC/GEMORC-IOC-02App/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -TOP = .. -include $(TOP)/configure/CONFIG -DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *src*)) -DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *Src*)) -DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *db*)) -DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *Db*)) -DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *protocol*)) -include $(TOP)/configure/RULES_DIRS - diff --git a/GEMORC/GEMORC-IOC-02App/src/GEMORC-IOC-02Main.cpp b/GEMORC/GEMORC-IOC-02App/src/GEMORC-IOC-02Main.cpp deleted file mode 100644 index b0982fdff..000000000 --- a/GEMORC/GEMORC-IOC-02App/src/GEMORC-IOC-02Main.cpp +++ /dev/null @@ -1,23 +0,0 @@ -/* GEMORC-IOC-02Main.cpp */ -/* Author: Marty Kraimer Date: 17MAR2000 */ - -#include -#include -#include -#include -#include - -#include "epicsExit.h" -#include "epicsThread.h" -#include "iocsh.h" - -int main(int argc,char *argv[]) -{ - if(argc>=2) { - iocsh(argv[1]); - epicsThreadSleep(.2); - } - iocsh(NULL); - epicsExit(0); - return(0); -} diff --git a/GEMORC/GEMORC-IOC-02App/src/Makefile b/GEMORC/GEMORC-IOC-02App/src/Makefile deleted file mode 100644 index c5f4d9f7a..000000000 --- a/GEMORC/GEMORC-IOC-02App/src/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -TOP=../.. -# This file should do very little - it's purpose is to set the APPNAME and then load build.mak - -# this definition is used in build.mak -APPNAME=GEMORC-IOC-02 - -# If we are ###-IOC-01 leave this as is, if we are ###-IOC-02 or higher change to ###-IOC-01 and delete build.mak from this directory -# there should only be a single build.mak for all IOCs of a given family and it is located in the ###-IOC-01 directory -include $(TOP)/GEMORC-IOC-01App/src/build.mak diff --git a/GEMORC/iocBoot/iocGEMORC-IOC-02/Makefile b/GEMORC/iocBoot/iocGEMORC-IOC-02/Makefile deleted file mode 100644 index d5e26aae9..000000000 --- a/GEMORC/iocBoot/iocGEMORC-IOC-02/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -TOP = ../.. -include $(TOP)/configure/CONFIG -#ARCH = windows-x64-debug -ARCH = $(EPICS_HOST_ARCH) -TARGETS = envPaths dllPath.bat relPaths.sh runIOC.bat runIOC.sh -include $(TOP)/configure/RULES.ioc diff --git a/GEMORC/iocBoot/iocGEMORC-IOC-02/st.cmd b/GEMORC/iocBoot/iocGEMORC-IOC-02/st.cmd deleted file mode 100644 index 51540dfba..000000000 --- a/GEMORC/iocBoot/iocGEMORC-IOC-02/st.cmd +++ /dev/null @@ -1,18 +0,0 @@ -#!../../bin/windows-x64-debug/GEMORC-IOC-02 - -## You may have to change GEMORC-IOC-02 to something else -## everywhere it appears in this file - -# Increase this if you get <> or discarded messages warnings in your errlog output -errlogInit2(65536, 256) - -< envPaths - -cd "${TOP}" - -## Register all support components -dbLoadDatabase "dbd/GEMORC-IOC-02.dbd" -GEMORC_IOC_02_registerRecordDeviceDriver pdbbase - -## calling common command file in ioc 01 boot dir -< ${TOP}/iocBoot/ioc_01_APP_NAME_/st-common.cmd From e536d940f8a83bc2ebef2a1d4226653087ededfa Mon Sep 17 00:00:00 2001 From: ChrisColeExpControl Date: Tue, 16 Jun 2020 17:45:21 +0100 Subject: [PATCH 22/23] Revert "added second FZJDDFCH" This reverts commit a4a3c78bde36aa29b198644fe919a8a47e63ce0d. --- FZJDDFCH/FZJDDFCH-IOC-02App/Db/Makefile | 18 --------------- FZJDDFCH/FZJDDFCH-IOC-02App/Makefile | 9 -------- .../src/FZJDDFCH-IOC-02Main.cpp | 23 ------------------- FZJDDFCH/FZJDDFCH-IOC-02App/src/Makefile | 9 -------- FZJDDFCH/iocBoot/iocFZJDDFCH-IOC-02/Makefile | 6 ----- FZJDDFCH/iocBoot/iocFZJDDFCH-IOC-02/st.cmd | 18 --------------- 6 files changed, 83 deletions(-) delete mode 100644 FZJDDFCH/FZJDDFCH-IOC-02App/Db/Makefile delete mode 100644 FZJDDFCH/FZJDDFCH-IOC-02App/Makefile delete mode 100644 FZJDDFCH/FZJDDFCH-IOC-02App/src/FZJDDFCH-IOC-02Main.cpp delete mode 100644 FZJDDFCH/FZJDDFCH-IOC-02App/src/Makefile delete mode 100644 FZJDDFCH/iocBoot/iocFZJDDFCH-IOC-02/Makefile delete mode 100644 FZJDDFCH/iocBoot/iocFZJDDFCH-IOC-02/st.cmd diff --git a/FZJDDFCH/FZJDDFCH-IOC-02App/Db/Makefile b/FZJDDFCH/FZJDDFCH-IOC-02App/Db/Makefile deleted file mode 100644 index 8eb97279d..000000000 --- a/FZJDDFCH/FZJDDFCH-IOC-02App/Db/Makefile +++ /dev/null @@ -1,18 +0,0 @@ -TOP=../.. -include $(TOP)/configure/CONFIG -#---------------------------------------- -# ADD MACRO DEFINITIONS AFTER THIS LINE - -#---------------------------------------------------- -# Create and install (or just install) into /db -# databases, templates, substitutions like this -#DB += xxx.db - -#---------------------------------------------------- -# If .db template is not named *.template add -# _template = - -include $(TOP)/configure/RULES -#---------------------------------------- -# ADD RULES AFTER THIS LINE - diff --git a/FZJDDFCH/FZJDDFCH-IOC-02App/Makefile b/FZJDDFCH/FZJDDFCH-IOC-02App/Makefile deleted file mode 100644 index 373b86bfc..000000000 --- a/FZJDDFCH/FZJDDFCH-IOC-02App/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -TOP = .. -include $(TOP)/configure/CONFIG -DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *src*)) -DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *Src*)) -DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *db*)) -DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *Db*)) -DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *protocol*)) -include $(TOP)/configure/RULES_DIRS - diff --git a/FZJDDFCH/FZJDDFCH-IOC-02App/src/FZJDDFCH-IOC-02Main.cpp b/FZJDDFCH/FZJDDFCH-IOC-02App/src/FZJDDFCH-IOC-02Main.cpp deleted file mode 100644 index c6ab5ad5b..000000000 --- a/FZJDDFCH/FZJDDFCH-IOC-02App/src/FZJDDFCH-IOC-02Main.cpp +++ /dev/null @@ -1,23 +0,0 @@ -/* FZJDDFCH-IOC-02Main.cpp */ -/* Author: Marty Kraimer Date: 17MAR2000 */ - -#include -#include -#include -#include -#include - -#include "epicsExit.h" -#include "epicsThread.h" -#include "iocsh.h" - -int main(int argc,char *argv[]) -{ - if(argc>=2) { - iocsh(argv[1]); - epicsThreadSleep(.2); - } - iocsh(NULL); - epicsExit(0); - return(0); -} diff --git a/FZJDDFCH/FZJDDFCH-IOC-02App/src/Makefile b/FZJDDFCH/FZJDDFCH-IOC-02App/src/Makefile deleted file mode 100644 index c4c9a7204..000000000 --- a/FZJDDFCH/FZJDDFCH-IOC-02App/src/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -TOP=../.. -# This file should do very little - it's purpose is to set the APPNAME and then load build.mak - -# this definition is used in build.mak -APPNAME=FZJDDFCH-IOC-02 - -# If we are ###-IOC-01 leave this as is, if we are ###-IOC-02 or higher change to ###-IOC-01 and delete build.mak from this directory -# there should only be a single build.mak for all IOCs of a given family and it is located in the ###-IOC-01 directory -include $(TOP)/FZJDDFCH-IOC-01App/src/build.mak diff --git a/FZJDDFCH/iocBoot/iocFZJDDFCH-IOC-02/Makefile b/FZJDDFCH/iocBoot/iocFZJDDFCH-IOC-02/Makefile deleted file mode 100644 index d5e26aae9..000000000 --- a/FZJDDFCH/iocBoot/iocFZJDDFCH-IOC-02/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -TOP = ../.. -include $(TOP)/configure/CONFIG -#ARCH = windows-x64-debug -ARCH = $(EPICS_HOST_ARCH) -TARGETS = envPaths dllPath.bat relPaths.sh runIOC.bat runIOC.sh -include $(TOP)/configure/RULES.ioc diff --git a/FZJDDFCH/iocBoot/iocFZJDDFCH-IOC-02/st.cmd b/FZJDDFCH/iocBoot/iocFZJDDFCH-IOC-02/st.cmd deleted file mode 100644 index 83256d270..000000000 --- a/FZJDDFCH/iocBoot/iocFZJDDFCH-IOC-02/st.cmd +++ /dev/null @@ -1,18 +0,0 @@ -#!../../bin/windows-x64-debug/FZJDDFCH-IOC-02 - -## You may have to change FZJDDFCH-IOC-02 to something else -## everywhere it appears in this file - -# Increase this if you get <> or discarded messages warnings in your errlog output -errlogInit2(65536, 256) - -< envPaths - -cd "${TOP}" - -## Register all support components -dbLoadDatabase "dbd/FZJDDFCH-IOC-02.dbd" -FZJDDFCH_IOC_02_registerRecordDeviceDriver pdbbase - -## calling common command file in ioc 01 boot dir -< ${TOP}/iocBoot/ioc_01_APP_NAME_/st-common.cmd From aa6e2b93077322d712c05fd533360586af6f4ebc Mon Sep 17 00:00:00 2001 From: ChrisColeExpControl Date: Tue, 16 Jun 2020 17:50:11 +0100 Subject: [PATCH 23/23] filled in templates --- AG33220A/iocBoot/iocAG33220A-IOC-02/st.cmd | 2 +- AG53220A/iocBoot/iocAG53220A-IOC-02/st.cmd | 2 +- CAENMCA/iocBoot/iocCAENMCA-IOC-02/st.cmd | 2 +- CONEXAGP/iocBoot/iocCONEXAGP-IOC-02/st.cmd | 2 +- DELFTSHEAR/iocBoot/iocDELFTSHEAR-IOC-02/st.cmd | 2 +- DETADC/iocBoot/iocDETADC-IOC-02/st.cmd | 2 +- ECLAB/iocBoot/iocECLAB-IOC-02/st.cmd | 2 +- GAMRY/iocBoot/iocGAMRY-IOC-02/st.cmd | 2 +- HVCAEN/iocBoot/iocHVCAEN-IOC-02/st.cmd | 2 +- IEG/iocBoot/iocIEG-IOC-02/st.cmd | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/AG33220A/iocBoot/iocAG33220A-IOC-02/st.cmd b/AG33220A/iocBoot/iocAG33220A-IOC-02/st.cmd index 89a5a3d85..efb5ad769 100644 --- a/AG33220A/iocBoot/iocAG33220A-IOC-02/st.cmd +++ b/AG33220A/iocBoot/iocAG33220A-IOC-02/st.cmd @@ -15,4 +15,4 @@ dbLoadDatabase "dbd/AG33220A-IOC-02.dbd" AG33220A_IOC_02_registerRecordDeviceDriver pdbbase ## calling common command file in ioc 01 boot dir -< ${TOP}/iocBoot/ioc_01_APP_NAME_/st-common.cmd +< ${TOP}/iocBoot/iocAG33220A-IOC-01/st-common.cmd diff --git a/AG53220A/iocBoot/iocAG53220A-IOC-02/st.cmd b/AG53220A/iocBoot/iocAG53220A-IOC-02/st.cmd index 6ffe40870..0f67082cd 100644 --- a/AG53220A/iocBoot/iocAG53220A-IOC-02/st.cmd +++ b/AG53220A/iocBoot/iocAG53220A-IOC-02/st.cmd @@ -15,4 +15,4 @@ dbLoadDatabase "dbd/AG53220A-IOC-02.dbd" AG53220A_IOC_02_registerRecordDeviceDriver pdbbase ## calling common command file in ioc 01 boot dir -< ${TOP}/iocBoot/ioc_01_APP_NAME_/st-common.cmd +< ${TOP}/iocBoot/iocAG53220A-IOC-01/st-common.cmd diff --git a/CAENMCA/iocBoot/iocCAENMCA-IOC-02/st.cmd b/CAENMCA/iocBoot/iocCAENMCA-IOC-02/st.cmd index 45fd24e4b..2c53dcf50 100644 --- a/CAENMCA/iocBoot/iocCAENMCA-IOC-02/st.cmd +++ b/CAENMCA/iocBoot/iocCAENMCA-IOC-02/st.cmd @@ -15,4 +15,4 @@ dbLoadDatabase "dbd/CAENMCA-IOC-02.dbd" CAENMCA_IOC_02_registerRecordDeviceDriver pdbbase ## calling common command file in ioc 01 boot dir -< ${TOP}/iocBoot/ioc_01_APP_NAME_/st-common.cmd +< ${TOP}/iocBoot/iocCAENMCA-IOC-01/st-common.cmd diff --git a/CONEXAGP/iocBoot/iocCONEXAGP-IOC-02/st.cmd b/CONEXAGP/iocBoot/iocCONEXAGP-IOC-02/st.cmd index 678975ff7..acc5ece01 100644 --- a/CONEXAGP/iocBoot/iocCONEXAGP-IOC-02/st.cmd +++ b/CONEXAGP/iocBoot/iocCONEXAGP-IOC-02/st.cmd @@ -15,4 +15,4 @@ dbLoadDatabase "dbd/CONEXAGP-IOC-02.dbd" CONEXAGP_IOC_02_registerRecordDeviceDriver pdbbase ## calling common command file in ioc 01 boot dir -< ${TOP}/iocBoot/ioc_01_APP_NAME_/st-common.cmd +< ${TOP}/iocBoot/iocCONEXAGP-IOC-01/st-common.cmd diff --git a/DELFTSHEAR/iocBoot/iocDELFTSHEAR-IOC-02/st.cmd b/DELFTSHEAR/iocBoot/iocDELFTSHEAR-IOC-02/st.cmd index 5fb9cc7aa..9f7c39e9f 100644 --- a/DELFTSHEAR/iocBoot/iocDELFTSHEAR-IOC-02/st.cmd +++ b/DELFTSHEAR/iocBoot/iocDELFTSHEAR-IOC-02/st.cmd @@ -15,4 +15,4 @@ dbLoadDatabase "dbd/DELFTSHEAR-IOC-02.dbd" DELFTSHEAR_IOC_02_registerRecordDeviceDriver pdbbase ## calling common command file in ioc 01 boot dir -< ${TOP}/iocBoot/ioc_01_APP_NAME_/st-common.cmd +< ${TOP}/iocBoot/iocDELFTSHEAR-IOC-01/st-common.cmd diff --git a/DETADC/iocBoot/iocDETADC-IOC-02/st.cmd b/DETADC/iocBoot/iocDETADC-IOC-02/st.cmd index ee8a585e9..16159dcd6 100644 --- a/DETADC/iocBoot/iocDETADC-IOC-02/st.cmd +++ b/DETADC/iocBoot/iocDETADC-IOC-02/st.cmd @@ -15,4 +15,4 @@ dbLoadDatabase "dbd/DETADC-IOC-02.dbd" DETADC_IOC_02_registerRecordDeviceDriver pdbbase ## calling common command file in ioc 01 boot dir -< ${TOP}/iocBoot/ioc_01_APP_NAME_/st-common.cmd +< ${TOP}/iocBoot/iocDETADC-IOC-01/st-common.cmd diff --git a/ECLAB/iocBoot/iocECLAB-IOC-02/st.cmd b/ECLAB/iocBoot/iocECLAB-IOC-02/st.cmd index 6bfec1c5f..b90a2d14a 100644 --- a/ECLAB/iocBoot/iocECLAB-IOC-02/st.cmd +++ b/ECLAB/iocBoot/iocECLAB-IOC-02/st.cmd @@ -15,4 +15,4 @@ dbLoadDatabase "dbd/ECLAB-IOC-02.dbd" ECLAB_IOC_02_registerRecordDeviceDriver pdbbase ## calling common command file in ioc 01 boot dir -< ${TOP}/iocBoot/ioc_01_APP_NAME_/st-common.cmd +< ${TOP}/iocBoot/iocECLAB-IOC-01/st-common.cmd diff --git a/GAMRY/iocBoot/iocGAMRY-IOC-02/st.cmd b/GAMRY/iocBoot/iocGAMRY-IOC-02/st.cmd index 3d26ea0ab..c61012020 100644 --- a/GAMRY/iocBoot/iocGAMRY-IOC-02/st.cmd +++ b/GAMRY/iocBoot/iocGAMRY-IOC-02/st.cmd @@ -15,4 +15,4 @@ dbLoadDatabase "dbd/GAMRY-IOC-02.dbd" GAMRY_IOC_02_registerRecordDeviceDriver pdbbase ## calling common command file in ioc 01 boot dir -< ${TOP}/iocBoot/ioc_01_APP_NAME_/st-common.cmd +< ${TOP}/iocBoot/iocGAMRY-IOC-01/st-common.cmd diff --git a/HVCAEN/iocBoot/iocHVCAEN-IOC-02/st.cmd b/HVCAEN/iocBoot/iocHVCAEN-IOC-02/st.cmd index b7a10b220..5da69ac39 100644 --- a/HVCAEN/iocBoot/iocHVCAEN-IOC-02/st.cmd +++ b/HVCAEN/iocBoot/iocHVCAEN-IOC-02/st.cmd @@ -15,4 +15,4 @@ dbLoadDatabase "dbd/HVCAEN-IOC-02.dbd" HVCAEN_IOC_02_registerRecordDeviceDriver pdbbase ## calling common command file in ioc 01 boot dir -< ${TOP}/iocBoot/ioc_01_APP_NAME_/st-common.cmd +< ${TOP}/iocBoot/iocHVCAEN-IOC-01/st-common.cmd diff --git a/IEG/iocBoot/iocIEG-IOC-02/st.cmd b/IEG/iocBoot/iocIEG-IOC-02/st.cmd index f74934242..839ece5dc 100644 --- a/IEG/iocBoot/iocIEG-IOC-02/st.cmd +++ b/IEG/iocBoot/iocIEG-IOC-02/st.cmd @@ -15,4 +15,4 @@ dbLoadDatabase "dbd/IEG-IOC-02.dbd" IEG_IOC_02_registerRecordDeviceDriver pdbbase ## calling common command file in ioc 01 boot dir -< ${TOP}/iocBoot/ioc_01_APP_NAME_/st-common.cmd +< ${TOP}/iocBoot/iocIEG-IOC-01/st-common.cmd