From 0866544474128dba031092c5af13b49574328752 Mon Sep 17 00:00:00 2001 From: ferrog Date: Thu, 5 Feb 2026 17:07:28 +0000 Subject: [PATCH] Package OK --- EC-GN-JA-PCF-IN/pom.xml | 5 +---- .../src/main/c++/DataSources/Makefile.inc | 2 +- .../src/main/c++/GAMs/JAMessageGAM/Makefile.inc | 2 +- .../main/c++/GAMs/JASourceChoiceGAM/Makefile.inc | 2 +- .../Configurations/Makefile.inc | 4 ++-- ec-gn-ja-pcf-sdd-in | 2 +- generate.sh | 13 +++++++------ 7 files changed, 14 insertions(+), 16 deletions(-) diff --git a/EC-GN-JA-PCF-IN/pom.xml b/EC-GN-JA-PCF-IN/pom.xml index ea1d61b..c220a32 100755 --- a/EC-GN-JA-PCF-IN/pom.xml +++ b/EC-GN-JA-PCF-IN/pom.xml @@ -87,9 +87,6 @@ of the distribution package.. *.so - - *.so - *.so @@ -124,7 +121,7 @@ of the distribution package.. *.so - + *.so diff --git a/EC-GN-JA-PCF-IN/src/main/c++/DataSources/Makefile.inc b/EC-GN-JA-PCF-IN/src/main/c++/DataSources/Makefile.inc index 59ce9d2..e8a93c7 100644 --- a/EC-GN-JA-PCF-IN/src/main/c++/DataSources/Makefile.inc +++ b/EC-GN-JA-PCF-IN/src/main/c++/DataSources/Makefile.inc @@ -23,7 +23,7 @@ # $Id: Makefile.inc 3 2012-01-15 16:26:07Z aneto $ # ############################################################# -SPB = RandomDataSource.x NI6528.x JAEPICSCA.x +SPB = RandomDataSource.x JAEPICSCA.x MAKEDEFAULTDIR=$(MARTe2_DIR)/MakeDefaults diff --git a/EC-GN-JA-PCF-IN/src/main/c++/GAMs/JAMessageGAM/Makefile.inc b/EC-GN-JA-PCF-IN/src/main/c++/GAMs/JAMessageGAM/Makefile.inc index 658d273..e2e2415 100644 --- a/EC-GN-JA-PCF-IN/src/main/c++/GAMs/JAMessageGAM/Makefile.inc +++ b/EC-GN-JA-PCF-IN/src/main/c++/GAMs/JAMessageGAM/Makefile.inc @@ -27,7 +27,7 @@ OBJSX=JAMessageGAM.x PACKAGE=GAMs -ROOT_DIR=../../ +ROOT_DIR=../../../../obj MAKEDEFAULTDIR=$(MARTe2_DIR)/MakeDefaults include $(MAKEDEFAULTDIR)/MakeStdLibDefs.$(TARGET) diff --git a/EC-GN-JA-PCF-IN/src/main/c++/GAMs/JASourceChoiceGAM/Makefile.inc b/EC-GN-JA-PCF-IN/src/main/c++/GAMs/JASourceChoiceGAM/Makefile.inc index d376235..748d092 100644 --- a/EC-GN-JA-PCF-IN/src/main/c++/GAMs/JASourceChoiceGAM/Makefile.inc +++ b/EC-GN-JA-PCF-IN/src/main/c++/GAMs/JASourceChoiceGAM/Makefile.inc @@ -27,7 +27,7 @@ OBJSX=JASourceChoiceGAM.x PACKAGE=GAMs -ROOT_DIR=../../ +ROOT_DIR=../../../../obj MAKEDEFAULTDIR=$(MARTe2_DIR)/MakeDefaults include $(MAKEDEFAULTDIR)/MakeStdLibDefs.$(TARGET) diff --git a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/Makefile.inc b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/Makefile.inc index 51b4641..88a887c 100644 --- a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/Makefile.inc +++ b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/Makefile.inc @@ -28,7 +28,7 @@ MDT=mdt SOURCES=src/*.marte src/state_machine/*.marte src/data/*.marte src/thread1/*.marte src/thread2/*.marte src/thread3/*.marte src/thread4/*.marte src/thread5/*.marte src/thread6/*.marte #Location of the Build directory where the configuration file will be written to -BUILD_DIR?=./out/ +BUILD_DIR?=. #Location of the MakeDefaults directory. #Note that the MARTe2_DIR environment variable @@ -38,7 +38,7 @@ MAKEDEFAULTDIR=$(MARTe2_DIR)/MakeDefaults include $(MAKEDEFAULTDIR)/MakeStdLibDefs.$(TARGET) all: $(OBJS) - $(MDT) build $(SOURCES) -o $(OBJSX) + $(MDT) build $(SOURCES) -o $(BUILD_DIR)/$(OBJSX) include $(MAKEDEFAULTDIR)/MakeStdLibRules.$(TARGET) diff --git a/ec-gn-ja-pcf-sdd-in b/ec-gn-ja-pcf-sdd-in index c45dde8..25d0d9a 160000 --- a/ec-gn-ja-pcf-sdd-in +++ b/ec-gn-ja-pcf-sdd-in @@ -1 +1 @@ -Subproject commit c45dde8f187db4a1c64578743b025febae091ffa +Subproject commit 25d0d9ac80a02e41fae488ecbf0da6e350854031 diff --git a/generate.sh b/generate.sh index 7d25d43..41c4d4c 100755 --- a/generate.sh +++ b/generate.sh @@ -88,15 +88,16 @@ ok=$(echo ${mask} | cut -c ${cid}) if [[ ${ok} != "0" ]]; then - cat patches/EC-GN-P01-PCF0CORE_sddPreDriverConf.patch ${project_name}/src/main/epics/iocBoot/iocEC-GN-P01-PCF0CORE/sddPreDriverConf.cmd > sddPreDriverConf_patched.cmd - mv -f sddPreDriverConf_patched.cmd ${project_name}/src/main/epics/iocBoot/iocEC-GN-P01-PCF0CORE/sddPreDriverConf.cmd +# cat patches/EC-GN-P01-PCF0CORE_sddPreDriverConf.patch ${project_name}/src/main/epics/iocBoot/iocEC-GN-P01-PCF0CORE/sddPreDriverConf.cmd > sddPreDriverConf_patched.cmd +# mv -f sddPreDriverConf_patched.cmd ${project_name}/src/main/epics/iocBoot/iocEC-GN-P01-PCF0CORE/sddPreDriverConf.cmd - cat patches/EC-GN-P01-PCF0CORE_userPreDriverConf.patch ${project_name}/src/main/epics/iocBoot/iocEC-GN-P01-PCF0CORE/userPreDriverConf.cmd > userPreDriverConf_patched.cmd - mv -f userPreDriverConf_patched.cmd ${project_name}/src/main/epics/iocBoot/iocEC-GN-P01-PCF0CORE/userPreDriverConf.cmd +# cat patches/EC-GN-P01-PCF0CORE_userPreDriverConf.patch ${project_name}/src/main/epics/iocBoot/iocEC-GN-P01-PCF0CORE/userPreDriverConf.cmd > userPreDriverConf_patched.cmd +# mv -f userPreDriverConf_patched.cmd ${project_name}/src/main/epics/iocBoot/iocEC-GN-P01-PCF0CORE/userPreDriverConf.cmd - sed -i 's+# Add all the support libraries needed by this IOC+# Add all the support libraries needed by this IOC\n-include $(EPICS_ROOT)/mk/asyn.mk\n-include $(EPICS_ROOT)/mk/picmg.mk\n-include $(EPICS_ROOT)/mk/stream.mk\n-include $(EPICS_ROOT)/mk/nisync-epics.mk\n-include $(EPICS_ROOT)/mk/nisync-generalTime.mk\n-include $(EPICS_ROOT)/mk/nixseries-epics.mk\n-include $(EPICS_ROOT)/mk/pxi6259-epics.mk\n-include $(EPICS_ROOT)/mk/pxi6528-epics.mk+g' EC-GN-JA-PCF/src/main/epics/EC-GN-P01App/src/Makefile +# sed -i 's+# Add all the support libraries needed by this IOC+# Add all the support libraries needed by this IOC\n-include $(EPICS_ROOT)/mk/asyn.mk\n-include $(EPICS_ROOT)/mk/picmg.mk\n-include $(EPICS_ROOT)/mk/stream.mk\n-include $(EPICS_ROOT)/mk/nisync-epics.mk\n-include $(EPICS_ROOT)/mk/nisync-generalTime.mk\n-include $(EPICS_ROOT)/mk/nixseries-epics.mk\n-include $(EPICS_ROOT)/mk/pxi6259-epics.mk\n-include $(EPICS_ROOT)/mk/pxi6528-epics.mk+g' EC-GN-JA-PCF/src/main/epics/EC-GN-P01App/src/Makefile - sed -i 's+epicsEnvSet("\(.*\)")+epicsEnvSet("\1:${TOP}/iocBoot/iocEC-GN-P01-PCF0CORE")+g' EC-GN-JA-PCF/src/main/epics/iocBoot/iocEC-GN-P01-PCF0CORE/envSystem +# sed -i 's+epicsEnvSet("\(.*\)")+epicsEnvSet("\1:${TOP}/iocBoot/iocEC-GN-P01-PCF0CORE")+g' EC-GN-JA-PCF/src/main/epics/iocBoot/iocEC-GN-P01-PCF0CORE/envSystem +echo OK fi cid=$((cid+1))