From a4e0d9811a98c1a026e3d8e2573b722374e4cebb Mon Sep 17 00:00:00 2001 From: Dirk Zimoch Date: Tue, 12 May 2026 17:08:12 +0200 Subject: [PATCH] migrate to PSI module build system --- GNUmakefile | 24 +++++++++++++++ eibApp/Db/CHANNEL.substitutions | 2 +- eibApp/Db/Makefile | 26 ---------------- eibApp/Db/Sync.substitutions | 2 +- eibApp/adl/Makefile | 17 ----------- eibApp/lib64/Makefile | 7 ----- eibApp/src/Makefile | 53 --------------------------------- iocBoot/ioceib/st.cmd | 23 -------------- set | 2 -- startup.cmd | 4 +++ 10 files changed, 30 insertions(+), 130 deletions(-) create mode 100644 GNUmakefile delete mode 100644 eibApp/Db/Makefile delete mode 100644 eibApp/adl/Makefile delete mode 100644 eibApp/lib64/Makefile delete mode 100644 eibApp/src/Makefile delete mode 100755 iocBoot/ioceib/st.cmd delete mode 100755 set create mode 100644 startup.cmd diff --git a/GNUmakefile b/GNUmakefile new file mode 100644 index 0000000..3d7484f --- /dev/null +++ b/GNUmakefile @@ -0,0 +1,24 @@ +include /ioc/tools/driver.makefile + +ARCH_FILTER = RHEL% + +SOURCES += eibApp/src/EIB.c +SOURCES += eibApp/src/myEIB.c +SOURCES += eibApp/src/Error.c +SOURCES += eibApp/src/AuxFuncs.c +SOURCES += eibApp/src/CfgLib.c + +SHRLIBS += eibApp/lib64/libeib7_64.so + +DBDS += eibApp/src/myEIB.dbd + +TEMPLATES += eibApp/Db/EIB.db +TEMPLATES += eibApp/Db/SYNC_ALL.db +TEMPLATES += eibApp/Db/Sync.substitutions +TEMPLATES += eibApp/Db/CHANNEL.template +TEMPLATES += eibApp/Db/CHANNEL.substitutions + +QT += eibApp/adl/EIB.ui +QT += eibApp/adl/STATUS.ui +QT += eibApp/adl/RON.ui +QT += eibApp/adl/EIB_ext.ui diff --git a/eibApp/Db/CHANNEL.substitutions b/eibApp/Db/CHANNEL.substitutions index 2f74b8e..31fb043 100644 --- a/eibApp/Db/CHANNEL.substitutions +++ b/eibApp/Db/CHANNEL.substitutions @@ -1,5 +1,5 @@ -file ../../db/CHANNEL.template{ +file CHANNEL.template{ # pattern{ CH , UNIT} { 0 , deg} diff --git a/eibApp/Db/Makefile b/eibApp/Db/Makefile deleted file mode 100644 index 1bab0f2..0000000 --- a/eibApp/Db/Makefile +++ /dev/null @@ -1,26 +0,0 @@ -TOP=../.. -include $(TOP)/configure/CONFIG -#---------------------------------------- -# ADD MACRO DEFINITIONS AFTER THIS LINE - -#---------------------------------------------------- -# Optimization of db files using dbst (DEFAULT: NO) -#DB_OPT = YES - -#---------------------------------------------------- -# Create and install (or just install) into /db -# databases, templates, substitutions like this -DB += EIB.db -DB += SYNC_ALL.db -DB += CHANNEL.template -DB += CHANNEL.substitutions -DB += Sync.substitutions - -#---------------------------------------------------- -# If .db template is not named *.template add -# _template = - -include $(TOP)/configure/RULES -#---------------------------------------- -# ADD RULES AFTER THIS LINE - diff --git a/eibApp/Db/Sync.substitutions b/eibApp/Db/Sync.substitutions index c416863..97d3552 100644 --- a/eibApp/Db/Sync.substitutions +++ b/eibApp/Db/Sync.substitutions @@ -1,5 +1,5 @@ -file ../../db/SYNC_ALL.db { +file SYNC_ALL.db { # # SET PV is set to the value of RB PV. Uses SIMUL field to write to SET PV. # This is triggered by SATOP11-OSGM087:SYNCALL that issues an event with no 83 diff --git a/eibApp/adl/Makefile b/eibApp/adl/Makefile deleted file mode 100644 index 50b249d..0000000 --- a/eibApp/adl/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -TOP=../.. -include $(TOP)/configure/CONFIG - -#include $(TOP)/iocBoot/ioceib/Makefile - -all: install - -install: EIB.adl EIB_ext.adl STATUS.adl RON.adl start - cp EIB.adl STATUS.adl RON.adl EIB_ext.adl $(INSTALL_LOCATION)/adl - cp EIB.ui STATUS.ui RON.ui EIB_ext.ui $(INSTALL_LOCATION)/adl - cp start $(INSTALL_LOCATION)/adl - cp ../../iocBoot/ioceib/EIB.CFG $(INSTALL_LOCATION)/iocBoot/ioceib/ - cp ../../iocBoot/ioceib/st.cmd $(INSTALL_LOCATION)/iocBoot/ioceib/ - - -#clean: -# rm $(INSTALL_LOCATION)/adl/* diff --git a/eibApp/lib64/Makefile b/eibApp/lib64/Makefile deleted file mode 100644 index 2bea537..0000000 --- a/eibApp/lib64/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -TOP=../.. -include $(TOP)/configure/CONFIG - -all: install - -install: libeib7_64.so - cp libeib7_64.so $(INSTALL_LOCATION)/lib64 diff --git a/eibApp/src/Makefile b/eibApp/src/Makefile deleted file mode 100644 index 6fbd1c9..0000000 --- a/eibApp/src/Makefile +++ /dev/null @@ -1,53 +0,0 @@ -TOP=../.. - -include $(TOP)/configure/CONFIG -#---------------------------------------- -# ADD MACRO DEFINITIONS AFTER THIS LINE -#============================= - -#============================= -# Build the IOC application - -PROD_IOC = eib -# eib.dbd will be created and installed -DBD += eib.dbd - -# eib.dbd will be made up from these files: -eib_DBD += base.dbd -eib_DBD += myEIB.dbd - -# Include dbd files from all support applications: -#eib_DBD += xxx.dbd - -# Add all the support libraries needed by this IOC - -# eib_registerRecordDeviceDriver.cpp derives from eib.dbd -eib_SRCS += eib_registerRecordDeviceDriver.cpp - -# Build the main IOC entry point on workstation OSs. -# eib_SRCS_DEFAULT += EIB_standalone.c - -eib_SRCS_DEFAULT += EIB.c -eib_SRCS_DEFAULT += myEIB.c -eib_SRCS_DEFAULT += Error.c -eib_SRCS_DEFAULT += AuxFuncs.c -eib_SRCS_DEFAULT += CfgLib.c -eib_SRCS_vxWorks += -nil- - -# Add support from base/src/vxWorks if needed -#eib_OBJS_vxWorks += $(EPICS_BASE_BIN)/vxComLibrary - -# Finally link to the EPICS Base libraries -eib_LIBS += $(EPICS_BASE_IOC_LIBS) - - -# export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/afs/psi.ch/user/f/follath_r/progs/EIB700/lib64 - -USR_LDFLAGS += -lpthread -leib7_64 -L/afs/psi.ch/user/f/follath_r/progs/EIB700/lib64 - -#=========================== - -include $(TOP)/configure/RULES -#---------------------------------------- -# ADD RULES AFTER THIS LINE - diff --git a/iocBoot/ioceib/st.cmd b/iocBoot/ioceib/st.cmd deleted file mode 100755 index 2003258..0000000 --- a/iocBoot/ioceib/st.cmd +++ /dev/null @@ -1,23 +0,0 @@ -#!../../bin/linux-x86_64/eib - -## You may have to change eib to something else -## everywhere it appears in this file - -#< envPaths - -## Register all support components -dbLoadDatabase("../../dbd/eib.dbd",0,0) -eib_registerRecordDeviceDriver(pdbbase) - -## Load record instances -dbLoadRecords("../../db/EIB.db") -dbLoadTemplate "../../db/CHANNEL.substitutions" -dbLoadTemplate "../../db/Sync.substitutions" - -#cd /afs/psi.ch/user/f/follath_r/progs/eib/iocBoot/ioceib -iocInit() - -## Start any sequence programs -#seq snceib,"user=follath_r" - -#dbpf EIB:CH_0_VALUE.SCAN 6 diff --git a/set b/set deleted file mode 100755 index cb447e8..0000000 --- a/set +++ /dev/null @@ -1,2 +0,0 @@ -export EPICS_HOST_ARCH=linux-x86_64 -export LD_LIBRARY_PATH=/afs/psi.ch/user/f/follath_r/progs/eib/bin/linux-x86_64 diff --git a/startup.cmd b/startup.cmd new file mode 100644 index 0000000..6ce38f2 --- /dev/null +++ b/startup.cmd @@ -0,0 +1,4 @@ +## Load record instances +dbLoadRecords EIB.db +dbLoadTemplate CHANNEL.substitutions +dbLoadTemplate Sync.substitutions