Use custom template if exists

This commit is contained in:
ferrog
2025-05-15 13:50:43 +00:00
parent 84b4888bbc
commit 01dae2f39b
3 changed files with 14 additions and 4 deletions

View File

@@ -70,9 +70,9 @@ of the distribution package..
<define macroname="project_version">${project.version}</define>
<define macroname="project_description">${project.description}</define>
</rpmspec>
<package name="EC-GN-PSH0PCF-ioc">
<package name="EC-GN-PCF0CORE-ioc">
<url>${rpm.vcs.url}</url>
<include name="EC-GN-PSH0PCF" type="ioc" />
<include name="EC-GN-PCF0CORE" type="ioc" />
</package>
<package name="EC-GN-PCF0SYSM-ioc">
<include name="EC-GN-PCF0SYSM" type="ioc" />

View File

@@ -68,6 +68,9 @@ if [[ ${ok} != "0" ]]; then
cp -rf ${project_name}-IN/.[^.]* ${project_name}/
# cp -rf tmp_resources/* ${project_name}/src/main/resources
# rm -rf tmp_resources
mkdir ${project_name,,}-sdd-in/SDD_IN/templates
/bin/cp -f /opt/codac/marte2-extensions/templates/* ${project_name,,}-sdd-in/SDD_IN/templates
/bin/cp -f patches/* ${project_name,,}-sdd-in/SDD_IN/templates
cd ${project_name,,}-sdd-in/SDD_IN
./sdd-generate.sh
@@ -83,6 +86,13 @@ cd ${current_dir}
ok=$(echo ${mask} | cut -c ${cid})
#if [[ ${ok} != "0" ]]; then
# cat patches/EC-GN-PCF0CORE_sddPreDriverConf.patch ${project_name}/src/main/epics/iocBoot/iocEC-GN-PCF0CORE/sddPreDriverConf.cmd > sddPreDriverConf_patched.cmd
# mv -f sddPreDriverConf_patched.cmd ${project_name}/src/main/epics/iocBoot/iocEC-GN-PCF0CORE/sddPreDriverConf.cmd
# cat patches/EC-GN-PCF0CORE_userPreDriverConf.patch ${project_name}/src/main/epics/iocBoot/iocEC-GN-PCF0CORE/userPreDriverConf.cmd > userPreDriverConf_patched.cmd
# mv -f userPreDriverConf_patched.cmd ${project_name}/src/main/epics/iocBoot/iocEC-GN-PCF0CORE/userPreDriverConf.cmd
#fi
cid=$((cid+1))