From ff31cbcf4980386e97eb8781cbfa5faefe27ee4b Mon Sep 17 00:00:00 2001 From: vsr Date: Fri, 13 Dec 2013 14:55:01 +0000 Subject: [PATCH] SALOME 7.3.0 preparation --- config_files/ATOMGEN.sh | 2 + config_files/ATOMIC.sh | 2 + config_files/ATOMSOLV.sh | 2 + config_files/BLSURFPLUGIN.sh | 2 + config_files/CALCULATOR.sh | 9 ++-- config_files/COMPONENT.sh | 2 + config_files/GEOM.sh | 2 + config_files/GHS3DPLUGIN.sh | 2 + config_files/GHS3DPRLPLUGIN.sh | 2 + config_files/GUI.sh | 2 + config_files/HELLO.sh | 9 ++-- config_files/HEXABLOCK.sh | 2 + config_files/HEXABLOCKPLUGIN.sh | 2 + config_files/HOMARD.sh | 2 + config_files/HexoticPLUGIN.sh | 2 + config_files/JOBMANAGER.sh | 2 + config_files/KERNEL.sh | 10 +--- config_files/LIGHT.sh | 2 + config_files/MED.sh | 2 + config_files/NETGENPLUGIN.sh | 2 + config_files/PARAVIS.sh | 2 + config_files/PYCALCULATOR.sh | 2 + config_files/PYHELLO.sh | 8 ++- config_files/PYLIGHT.sh | 2 + config_files/RANDOMIZER.sh | 2 + config_files/SIERPINSKY.sh | 2 + config_files/SMESH.sh | 2 + config_files/YACS.sh | 2 + config_files/common.sh | 94 +++++++++++++++++++++++++++++++++ 29 files changed, 153 insertions(+), 25 deletions(-) diff --git a/config_files/ATOMGEN.sh b/config_files/ATOMGEN.sh index 3751c9e..ac9cc89 100755 --- a/config_files/ATOMGEN.sh +++ b/config_files/ATOMGEN.sh @@ -116,6 +116,8 @@ check_jb tar xfz ${SRC_DIR}/ATOMGENsourcesV${SALOME_VERSION}.tar.gz -C ${INST_RO # modify all *.la files export ATOMGEN_ROOT_DIR=${PRODUCT_DIR} test -z ${SINGLE_DIR} && modif_la_files ${PRODUCT_DIR} +modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomeATOMGENConfig.cmake +modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomeATOMGENTargets-release.cmake # to generate environment scripts try_preinstalled diff --git a/config_files/ATOMIC.sh b/config_files/ATOMIC.sh index 16954c0..8fbff06 100755 --- a/config_files/ATOMIC.sh +++ b/config_files/ATOMIC.sh @@ -116,6 +116,8 @@ check_jb tar xfz ${SRC_DIR}/ATOMICsourcesV${SALOME_VERSION}.tar.gz -C ${INST_ROO # modify all *.la files export ATOMIC_ROOT_DIR=${PRODUCT_DIR} test -z ${SINGLE_DIR} && modif_la_files ${PRODUCT_DIR} +modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomeATOMICConfig.cmake +modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomeATOMICTargets-release.cmake # to generate environment scripts try_preinstalled diff --git a/config_files/ATOMSOLV.sh b/config_files/ATOMSOLV.sh index 039a5df..c518bc4 100755 --- a/config_files/ATOMSOLV.sh +++ b/config_files/ATOMSOLV.sh @@ -116,6 +116,8 @@ check_jb tar xfz ${SRC_DIR}/ATOMSOLVsourcesV${SALOME_VERSION}.tar.gz -C ${INST_R # modify all *.la files export ATOMSOLV_ROOT_DIR=${PRODUCT_DIR} test -z ${SINGLE_DIR} && modif_la_files ${PRODUCT_DIR} +modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomeATOMSOLVConfig.cmake +modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomeATOMSOLVTargets-release.cmake # to generate environment scripts try_preinstalled diff --git a/config_files/BLSURFPLUGIN.sh b/config_files/BLSURFPLUGIN.sh index 090b4a6..bf5df08 100755 --- a/config_files/BLSURFPLUGIN.sh +++ b/config_files/BLSURFPLUGIN.sh @@ -125,6 +125,8 @@ check_jb tar xfz ${SRC_DIR}/BLSURFPLUGINsourcesV${SALOME_VERSION}.tar.gz -C ${IN # modify all *.la files export BLSURFPLUGIN_ROOT_DIR=${PRODUCT_DIR} test -z ${SINGLE_DIR} && modif_la_files ${PRODUCT_DIR} +modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomeBLSURFPLUGINConfig.cmake +modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomeBLSURFPLUGINTargets-release.cmake # to generate environment scripts try_preinstalled diff --git a/config_files/CALCULATOR.sh b/config_files/CALCULATOR.sh index a121f6b..7bf4dc4 100755 --- a/config_files/CALCULATOR.sh +++ b/config_files/CALCULATOR.sh @@ -116,12 +116,9 @@ check_jb tar xfz ${SRC_DIR}/CALCULATORsourcesV${SALOME_VERSION}.tar.gz -C ${INST # modify all *.la files export CALCULATOR_ROOT_DIR=${PRODUCT_DIR} test -z ${SINGLE_DIR} && modif_la_files ${PRODUCT_DIR} - -cd ${PRODUCT_DIR}/bin/salome -sed -e "s%export KERNEL_ROOT_DIR=.*%export KERNEL_ROOT_DIR=${KERNEL_ROOT_DIR}%g" runAppli > _runAppli -sed -e "s%export CALCULATOR_ROOT_DIR=.*%export CALCULATOR_ROOT_DIR=${CALCULATOR_ROOT_DIR}%g" _runAppli > runAppli -rm -f _runAppli -chmod a+x runAppli +modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomeCALCULATORConfig.cmake +modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomeCALCULATORTargets-release.cmake +sed -i "s%export KERNEL_ROOT_DIR=.*%export KERNEL_ROOT_DIR=${KERNEL_ROOT_DIR}%g;s%export CALCULATOR_ROOT_DIR=.*%export CALCULATOR_ROOT_DIR=${CALCULATOR_ROOT_DIR}%g" ${PRODUCT_DIR}/bin/salome/runAppli # to generate environment scripts try_preinstalled diff --git a/config_files/COMPONENT.sh b/config_files/COMPONENT.sh index 71d6bfa..091be6e 100755 --- a/config_files/COMPONENT.sh +++ b/config_files/COMPONENT.sh @@ -116,6 +116,8 @@ check_jb tar xfz ${SRC_DIR}/COMPONENTsourcesV${SALOME_VERSION}.tar.gz -C ${INST_ # modify all *.la files export COMPONENT_ROOT_DIR=${PRODUCT_DIR} test -z ${SINGLE_DIR} && modif_la_files ${PRODUCT_DIR} +modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomeCOMPONENTConfig.cmake +modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomeCOMPONENTTargets-release.cmake # to generate environment scripts try_preinstalled diff --git a/config_files/GEOM.sh b/config_files/GEOM.sh index 3a26e32..b4d8aa4 100755 --- a/config_files/GEOM.sh +++ b/config_files/GEOM.sh @@ -124,6 +124,8 @@ check_jb tar xfz ${SRC_DIR}/GEOMsourcesV${SALOME_VERSION}.tar.gz -C ${INST_ROOT} # modify all *.la files export GEOM_ROOT_DIR=${PRODUCT_DIR} test -z ${SINGLE_DIR} && modif_la_files ${PRODUCT_DIR} +modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomeGEOMConfig.cmake +modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomeGEOMTargets-release.cmake # to generate environment scripts try_preinstalled diff --git a/config_files/GHS3DPLUGIN.sh b/config_files/GHS3DPLUGIN.sh index 7657600..feee555 100755 --- a/config_files/GHS3DPLUGIN.sh +++ b/config_files/GHS3DPLUGIN.sh @@ -124,6 +124,8 @@ check_jb tar xfz ${SRC_DIR}/GHS3DPLUGINsourcesV${SALOME_VERSION}.tar.gz -C ${INS # modify all *.la files export GHS3DPLUGIN_ROOT_DIR=${PRODUCT_DIR} test -z ${SINGLE_DIR} && modif_la_files ${PRODUCT_DIR} +modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomeGHS3DPLUGINConfig.cmake +modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomeGHS3DPLUGINTargets-release.cmake # to generate environment scripts try_preinstalled diff --git a/config_files/GHS3DPRLPLUGIN.sh b/config_files/GHS3DPRLPLUGIN.sh index b351cf4..82c487e 100755 --- a/config_files/GHS3DPRLPLUGIN.sh +++ b/config_files/GHS3DPRLPLUGIN.sh @@ -123,6 +123,8 @@ check_jb tar xfz ${SRC_DIR}/GHS3DPRLPLUGINsourcesV${SALOME_VERSION}.tar.gz -C ${ # modify all *.la files export GHS3DPRLPLUGIN_ROOT_DIR=${PRODUCT_DIR} test -z ${SINGLE_DIR} && modif_la_files ${PRODUCT_DIR} +modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomeGHS3DPRLPLUGINConfig.cmake +modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomeGHS3DPRLPLUGINTargets-release.cmake # to generate environment scripts try_preinstalled diff --git a/config_files/GUI.sh b/config_files/GUI.sh index c5f17ee..05fe2e5 100755 --- a/config_files/GUI.sh +++ b/config_files/GUI.sh @@ -117,6 +117,8 @@ check_jb tar xfz ${SRC_DIR}/GUIsourcesV${SALOME_VERSION}.tar.gz -C ${INST_ROOT} # modify all *.la files export GUI_ROOT_DIR=${PRODUCT_DIR} test -z ${SINGLE_DIR} && modif_la_files ${PRODUCT_DIR} +modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomeGUIConfig.cmake +modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomeGUITargets-release.cmake # to generate environment scripts try_preinstalled diff --git a/config_files/HELLO.sh b/config_files/HELLO.sh index 006c92a..7fcca65 100755 --- a/config_files/HELLO.sh +++ b/config_files/HELLO.sh @@ -115,12 +115,9 @@ check_jb tar xfz ${SRC_DIR}/HELLOsourcesV${SALOME_VERSION}.tar.gz -C ${INST_ROOT # modify all *.la files export HELLO_ROOT_DIR=${PRODUCT_DIR} test -z ${SINGLE_DIR} && modif_la_files ${PRODUCT_DIR} - -cd ${PRODUCT_DIR}/bin/salome -sed -e "s%export KERNEL_ROOT_DIR=.*%export KERNEL_ROOT_DIR=${KERNEL_ROOT_DIR}%g" runAppli > _runAppli -sed -e "s%export HELLO_ROOT_DIR=.*%export HELLO_ROOT_DIR=${HELLO_ROOT_DIR}%g" _runAppli > runAppli -rm -f _runAppli -chmod a+x runAppli +modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomeHELLOConfig.cmake +modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomeHELLOTargets-release.cmake +sed -i "s%export KERNEL_ROOT_DIR=.*%export KERNEL_ROOT_DIR=${KERNEL_ROOT_DIR}%g;s%export HELLO_ROOT_DIR=.*%export HELLO_ROOT_DIR=${HELLO_ROOT_DIR}%g" ${PRODUCT_DIR}/bin/salome/runAppli # to generate environment scripts try_preinstalled diff --git a/config_files/HEXABLOCK.sh b/config_files/HEXABLOCK.sh index e2fbe05..c9396a9 100755 --- a/config_files/HEXABLOCK.sh +++ b/config_files/HEXABLOCK.sh @@ -123,6 +123,8 @@ check_jb tar xfz ${SRC_DIR}/HEXABLOCKsourcesV${SALOME_VERSION}.tar.gz -C ${INST_ # modify all *.la files export HEXABLOCK_ROOT_DIR=${PRODUCT_DIR} test -z ${SINGLE_DIR} && modif_la_files ${PRODUCT_DIR} +modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomeHEXABLOCKConfig.cmake +modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomeHEXABLOCKTargets-release.cmake # to generate environment scripts try_preinstalled diff --git a/config_files/HEXABLOCKPLUGIN.sh b/config_files/HEXABLOCKPLUGIN.sh index bd4f3af..17ef33e 100755 --- a/config_files/HEXABLOCKPLUGIN.sh +++ b/config_files/HEXABLOCKPLUGIN.sh @@ -124,6 +124,8 @@ check_jb tar xfz ${SRC_DIR}/HEXABLOCKPLUGINsourcesV${SALOME_VERSION}.tar.gz -C $ # modify all *.la files export HEXABLOCKPLUGIN_ROOT_DIR=${PRODUCT_DIR} test -z ${SINGLE_DIR} && modif_la_files ${PRODUCT_DIR} +modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomeHEXABLOCKPLUGINConfig.cmake +modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomeHEXABLOCKPLUGINTargets-release.cmake # to generate environment scripts try_preinstalled diff --git a/config_files/HOMARD.sh b/config_files/HOMARD.sh index 16cf0ff..327b0fe 100755 --- a/config_files/HOMARD.sh +++ b/config_files/HOMARD.sh @@ -120,6 +120,8 @@ check_jb tar xfz ${SRC_DIR}/HOMARDsourcesV${SALOME_VERSION}.tar.gz -C ${INST_ROO # modify all *.la files export HOMARD_ROOT_DIR=${PRODUCT_DIR} test -z ${SINGLE_DIR} && modif_la_files ${PRODUCT_DIR} +modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomeHOMARDConfig.cmake +modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomeHOMARDTargets-release.cmake # to generate environment scripts try_preinstalled diff --git a/config_files/HexoticPLUGIN.sh b/config_files/HexoticPLUGIN.sh index 33e50b5..08f10eb 100755 --- a/config_files/HexoticPLUGIN.sh +++ b/config_files/HexoticPLUGIN.sh @@ -123,6 +123,8 @@ check_jb tar xfz ${SRC_DIR}/HexoticPLUGINsourcesV${SALOME_VERSION}.tar.gz -C ${I # modify all *.la files export HexoticPLUGIN_ROOT_DIR=${PRODUCT_DIR} test -z ${SINGLE_DIR} && modif_la_files ${PRODUCT_DIR} +modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomeHexoticPLUGINConfig.cmake +modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomeHexoticPLUGINTargets-release.cmake # to generate environment scripts try_preinstalled diff --git a/config_files/JOBMANAGER.sh b/config_files/JOBMANAGER.sh index 52b421b..37b8433 100755 --- a/config_files/JOBMANAGER.sh +++ b/config_files/JOBMANAGER.sh @@ -110,6 +110,8 @@ check_jb tar xfz ${SRC_DIR}/JOBMANAGERsourcesV${SALOME_VERSION}.tar.gz -C ${INST # modify all *.la files export JOBMANAGER_ROOT_DIR=${PRODUCT_DIR} test -z ${SINGLE_DIR} && modif_la_files ${PRODUCT_DIR} +modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomeJOBMANAGERConfig.cmake +modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomeJOBMANAGERTargets-release.cmake # to generate environment scripts try_preinstalled diff --git a/config_files/KERNEL.sh b/config_files/KERNEL.sh index 82fbe2a..1e0a5ed 100755 --- a/config_files/KERNEL.sh +++ b/config_files/KERNEL.sh @@ -114,17 +114,11 @@ test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR} check_jb tar xfz ${SOURCE_DIR}/KERNELbinariesV${SALOME_VERSION}.tar.gz -C ${PRODUCT_DIR} check_jb tar xfz ${SRC_DIR}/KERNELsourcesV${SALOME_VERSION}.tar.gz -C ${INST_ROOT} -# The next two symbolic links are created only for Red Hat 9 and Scientific Linux 3.0.5 -if [ -f /lib/libcrypto.so.0.9.7a ]; then - ln -sf /lib/libcrypto.so.0.9.7a ${PRODUCT_DIR}/lib/salome/libcrypto.so.2 -fi -if [ -f /lib/libssl.so.0.9.7a ]; then - ln -sf /lib/libssl.so.0.9.7a ${PRODUCT_DIR}/lib/salome/libssl.so.2 -fi - # modify all *.la files export KERNEL_ROOT_DIR=${PRODUCT_DIR} test -z ${SINGLE_DIR} && modif_la_files ${PRODUCT_DIR} +modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomeKERNELConfig.cmake +modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomeKERNELTargets-release.cmake # to generate environment scripts try_preinstalled diff --git a/config_files/LIGHT.sh b/config_files/LIGHT.sh index d400d8b..1974f1b 100755 --- a/config_files/LIGHT.sh +++ b/config_files/LIGHT.sh @@ -113,6 +113,8 @@ check_jb tar xfz ${SRC_DIR}/LIGHTsourcesV${SALOME_VERSION}.tar.gz -C ${INST_ROOT # modify all *.la files export LIGHT_ROOT_DIR=${PRODUCT_DIR} test -z ${SINGLE_DIR} && modif_la_files ${PRODUCT_DIR} +modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomeLIGHTConfig.cmake +modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomeLIGHTTargets-release.cmake # to generate environment scripts try_preinstalled diff --git a/config_files/MED.sh b/config_files/MED.sh index 80921c1..87a0511 100755 --- a/config_files/MED.sh +++ b/config_files/MED.sh @@ -125,6 +125,8 @@ check_jb tar xfz ${SRC_DIR}/MEDsourcesV${SALOME_VERSION}.tar.gz -C ${INST_ROOT} # modify all *.la files export MED_ROOT_DIR=${PRODUCT_DIR} test -z ${SINGLE_DIR} && modif_la_files ${PRODUCT_DIR} +modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomeMEDConfig.cmake +modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomeMEDTargets-release.cmake # to generate environment scripts try_preinstalled diff --git a/config_files/NETGENPLUGIN.sh b/config_files/NETGENPLUGIN.sh index 4e2a37b..62d1609 100755 --- a/config_files/NETGENPLUGIN.sh +++ b/config_files/NETGENPLUGIN.sh @@ -124,6 +124,8 @@ check_jb tar xfz ${SRC_DIR}/NETGENPLUGINsourcesV${SALOME_VERSION}.tar.gz -C ${IN # modify all *.la files export NETGENPLUGIN_ROOT_DIR=${PRODUCT_DIR} test -z ${SINGLE_DIR} && modif_la_files ${PRODUCT_DIR} +modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomeNETGENPLUGINConfig.cmake +modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomeNETGENPLUGINTargets-release.cmake # to generate environment scripts try_preinstalled diff --git a/config_files/PARAVIS.sh b/config_files/PARAVIS.sh index 32fe356..01f9dd2 100755 --- a/config_files/PARAVIS.sh +++ b/config_files/PARAVIS.sh @@ -118,6 +118,8 @@ check_jb tar xfz ${SRC_DIR}/PARAVISsourcesV${SALOME_VERSION}.tar.gz -C ${INST_RO # modify all *.la files export PARAVIS_ROOT_DIR=${PRODUCT_DIR} test -z ${SINGLE_DIR} && modif_la_files ${PRODUCT_DIR} +modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomePARAVISConfig.cmake +modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomePARAVISTargets-release.cmake # to generate environment scripts try_preinstalled diff --git a/config_files/PYCALCULATOR.sh b/config_files/PYCALCULATOR.sh index 83ec1df..18a1151 100755 --- a/config_files/PYCALCULATOR.sh +++ b/config_files/PYCALCULATOR.sh @@ -116,6 +116,8 @@ check_jb tar xfz ${SRC_DIR}/PYCALCULATORsourcesV${SALOME_VERSION}.tar.gz -C ${IN # modify all *.la files export PYCALCULATOR_ROOT_DIR=${PRODUCT_DIR} test -z ${SINGLE_DIR} && modif_la_files ${PRODUCT_DIR} +modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomePYCALCULATORConfig.cmake +modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomePYCALCULATORTargets-release.cmake # to generate environment scripts try_preinstalled diff --git a/config_files/PYHELLO.sh b/config_files/PYHELLO.sh index aab25b5..e05d10b 100755 --- a/config_files/PYHELLO.sh +++ b/config_files/PYHELLO.sh @@ -114,11 +114,9 @@ check_jb tar xfz ${SRC_DIR}/PYHELLOsourcesV${SALOME_VERSION}.tar.gz -C ${INST_RO # modify all *.la files export PYHELLO_ROOT_DIR=${PRODUCT_DIR} test -z ${SINGLE_DIR} && modif_la_files ${PRODUCT_DIR} - -cd ${PRODUCT_DIR}/bin/salome -sed -e "s%export KERNEL_ROOT_DIR=.*%export KERNEL_ROOT_DIR=${KERNEL_ROOT_DIR}%g" runAppli > _runAppli -sed -e "s%export PYHELLO_ROOT_DIR=.*%export PYHELLO_ROOT_DIR=${PYHELLO_ROOT_DIR}%g" _runAppli > runAppli -chmod a+x runAppli +modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomePYHELLOConfig.cmake +modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomePYHELLOTargets-release.cmake +sed -e "s%export KERNEL_ROOT_DIR=.*%export KERNEL_ROOT_DIR=${KERNEL_ROOT_DIR}%g;s%export PYHELLO_ROOT_DIR=.*%export PYHELLO_ROOT_DIR=${PYHELLO_ROOT_DIR}%g" ${PRODUCT_DIR}/bin/salome/runAppli # to generate environment scripts try_preinstalled diff --git a/config_files/PYLIGHT.sh b/config_files/PYLIGHT.sh index 1c6bac0..727892b 100755 --- a/config_files/PYLIGHT.sh +++ b/config_files/PYLIGHT.sh @@ -114,6 +114,8 @@ check_jb tar xfz ${SRC_DIR}/PYLIGHTsourcesV${SALOME_VERSION}.tar.gz -C ${INST_RO # modify all *.la files export PYLIGHT_ROOT_DIR=${PRODUCT_DIR} test -z ${SINGLE_DIR} && modif_la_files ${PRODUCT_DIR} +modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomePYLIGHTConfig.cmake +modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomePYLIGHTTargets-release.cmake # to generate environment scripts try_preinstalled diff --git a/config_files/RANDOMIZER.sh b/config_files/RANDOMIZER.sh index a296ce2..4997fef 100755 --- a/config_files/RANDOMIZER.sh +++ b/config_files/RANDOMIZER.sh @@ -115,6 +115,8 @@ check_jb tar xfz ${SRC_DIR}/RANDOMIZERsourcesV${SALOME_VERSION}.tar.gz -C ${INST # modify all *.la files export RANDOMIZER_ROOT_DIR=${PRODUCT_DIR} test -z ${SINGLE_DIR} && modif_la_files ${PRODUCT_DIR} +modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomeRANDOMIZERConfig.cmake +modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomeRANDOMIZERTargets-release.cmake # to generate environment scripts try_preinstalled diff --git a/config_files/SIERPINSKY.sh b/config_files/SIERPINSKY.sh index b37f3b0..beace25 100755 --- a/config_files/SIERPINSKY.sh +++ b/config_files/SIERPINSKY.sh @@ -115,6 +115,8 @@ check_jb tar xfz ${SRC_DIR}/SIERPINSKYsourcesV${SALOME_VERSION}.tar.gz -C ${INST # modify all *.la files export SIERPINSKY_ROOT_DIR=${PRODUCT_DIR} test -z ${SINGLE_DIR} && modif_la_files ${PRODUCT_DIR} +modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomeSIERPINSKYConfig.cmake +modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomeSIERPINSKYTargets-release.cmake # to generate environment scripts try_preinstalled diff --git a/config_files/SMESH.sh b/config_files/SMESH.sh index e53379e..b7259cf 100755 --- a/config_files/SMESH.sh +++ b/config_files/SMESH.sh @@ -124,6 +124,8 @@ check_jb tar xfz ${SRC_DIR}/SMESHsourcesV${SALOME_VERSION}.tar.gz -C ${INST_ROOT # modify all *.la files export SMESH_ROOT_DIR=${PRODUCT_DIR} test -z ${SINGLE_DIR} && modif_la_files ${PRODUCT_DIR} +modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomeSMESHConfig.cmake +modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomeSMESHTargets-release.cmake # to generate environment scripts try_preinstalled diff --git a/config_files/YACS.sh b/config_files/YACS.sh index 5e32c33..0418b40 100755 --- a/config_files/YACS.sh +++ b/config_files/YACS.sh @@ -123,6 +123,8 @@ check_jb tar xfz ${SRC_DIR}/YACSsourcesV${SALOME_VERSION}.tar.gz -C ${INST_ROOT} # modify all *.la files export YACS_ROOT_DIR=${PRODUCT_DIR} test -z ${SINGLE_DIR} && modif_la_files ${PRODUCT_DIR} +modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomeYACSConfig.cmake +modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomeYACSTargets-release.cmake # to generate environment scripts try_preinstalled diff --git a/config_files/common.sh b/config_files/common.sh index 0ee0792..c161521 100755 --- a/config_files/common.sh +++ b/config_files/common.sh @@ -687,6 +687,8 @@ fix_gl_libs(){ } modif_la_files(){ +return 0 +# obsolete ldir=$1 if [ -z "${ldir}" ] || [ ! -d "${ldir}" ]; then return 1; fi @@ -966,3 +968,95 @@ done cd ${srcdir} return 0 } + +modif_cfg_file(){ + local nf=$1 + if [ "${nf}" = "" ] || [ ! -e ${nf} ] ; then + return + fi + if [ "${PYTHON_ROOT_DIR}" != "" ] ; then + sed -i "s%\([^/]*\)[^;]*/Python-[0-9.]\+%\1${PYTHON_ROOT_DIR}%g" $1 + fi + if [ "${SWIG_ROOT_DIR}" != "" ] ; then + sed -i "s%\([^/]*\)[^;]*/swig-[0-9.]\+%\1${SWIG_ROOT_DIR}%g" $1 + fi + if [ "${OMNIORB_ROOT_DIR}" != "" ] ; then + sed -i "s%\([^/]*\)[^;]*/omniORB-[0-9.]\+%\1${OMNIORB_ROOT_DIR}%g" $1 + fi + if [ "${HDF5_ROOT_DIR}" != "" ] ; then + sed -i "s%\([^/]*\)[^;]*/hdf5-[0-9.]\+%\1${HDF5_ROOT_DIR}%g" $1 + fi + if [ "${BOOST_ROOT_DIR}" != "" ] ; then + sed -i "s%\([^/]*\)[^;]*/boost-[0-9.]\+%\1${BOOST_ROOT_DIR}%g" $1 + fi + if [ "${MEDFILE_ROOT_DIR}" != "" ] ; then + sed -i "s%\([^/]*\)[^;]*/med-[0-9.]\+%\1${MEDFILE_ROOT_DIR}%g" $1 + fi + if [ "${QT4_ROOT_DIR}" != "" ] ; then + sed -i "s%\([^/]*\)[^;]*/qt-[0-9.]\+%\1${QT4_ROOT_DIR}%g" $1 + fi + if [ "${SIP_ROOT_DIR}" != "" ] ; then + sed -i "s%\([^/]*\)[^;]*/sip-[0-9.]\+%\1${SIP_ROOT_DIR}%g" $1 + fi + if [ "${PYQT4_ROOT_DIR}" != "" ] ; then + sed -i "s%\([^/]*\)[^;]*/PyQt-[0-9.]\+%\1${PYQT4_ROOT_DIR}%g" $1 + fi + if [ "${QSCINTILLA_ROOT_DIR}" != "" ] ; then + sed -i "s%\([^/]*\)[^;]*/QScintilla-[0-9.]\+%\1${QSCINTILLA_ROOT_DIR}%g" $1 + fi + if [ "${PARAVIEW_ROOT_DIR}" != "" ] ; then + sed -i "s%\([^/]*\)[^;]*/ParaView-[0-9.]\+%\1${PARAVIEW_ROOT_DIR}%g" $1 + fi + if [ "${LIBXML2_ROOT_DIR}" != "" ] ; then + sed -i "s%\([^/]*\)[^;]*/libxml2-[0-9.]\+%\1${LIBXML2_ROOT_DIR}%g" $1 + fi + if [ "${EXPAT_ROOT_DIR}" != "" ] ; then + sed -i "s%\([^/]*\)[^;]*/expat-[0-9.]\+%\1${EXPAT_ROOT_DIR}%g" $1 + fi + if [ "${FREETYPE_ROOT_DIR}" != "" ] ; then + sed -i "s%\([^/]*\)[^;]*/freetype-[0-9.]\+%\1${FREETYPE_ROOT_DIR}%g" $1 + fi + if [ "${FREEIMAGE_ROOT_DIR}" != "" ] ; then + sed -i "s%\([^/]*\)[^;]*/freeimage-[0-9.]\+%\1${FREEIMAGE_ROOT_DIR}%g" $1 + fi + if [ "${GL2PS_ROOT_DIR}" != "" ] ; then + sed -i "s%\([^/]*\)[^;]*/gl2ps-[0-9.]\+%\1${GL2PS_ROOT_DIR}%g" $1 + fi + if [ "${TBB_ROOT_DIR}" != "" ] ; then + sed -i "s%\([^/]*\)[^;]*/tbb[^/]\+%\1${TBB_ROOT_DIR}%g" $1 + fi + if [ "${CAS_ROOT_DIR}" != "" ] ; then + sed -i "s%\([^/]*\)[^;]*/OCCT[^/]*%\1${CAS_ROOT_DIR}%g" $1 + fi + if [ "${NETGEN_ROOT_DIR}" != "" ] ; then + sed -i "s%\([^/]*\)[^;]*/netgen-[0-9.]\+%\1${NETGEN_ROOT_DIR}%g" $1 + fi + if [ "${NUMPY_ROOT_DIR}" != "" ] ; then + sed -i "s%\([^/]*\)[^;]*/numpy-[0-9.]\+%\1${NUMPY_ROOT_DIR}%g" $1 + fi + if [ "${GRAPHVIZ_ROOT_DIR}" != "" ] ; then + sed -i "s%\([^/]*\)[^;]*/graphviz-[0-9.]\+%\1${GRAPHVIZ_ROOT_DIR}%g" $1 + fi + if [ "${DOXYGEN_ROOT_DIR}" != "" ] ; then + sed -i "s%\([^/]*\)[^;]*/doxygen-[0-9.]\+%\1${DOXYGEN_ROOT_DIR}%g" $1 + fi + if [ "${SPHINX_ROOT_DIR}" != "" ] ; then + sed -i "s%\([^/]*\)[^;]*/Sphinx-[0-9.]\+%\1${SPHINX_ROOT_DIR}%g" $1 + fi + if [ "${WSO2_ROOT_DIR}" != "" ] ; then + sed -i "s%\([^/]*\)[^;]*/wso2-wsf-cpp-[0-9.]\+%\1${WSO2_ROOT_DIR}%g" $1 + fi + if [ "$MESHGEMS{_ROOT_DIR}" != "" ] ; then + sed -i "s%\([^/]*\)[^;]*/MeshGems-[0-9.]\+%\1${MESHGEMS_ROOT_DIR}%g" $1 + fi + local sm + local smvar + for sm in LIBBATCH SIMANIO KERNEL GUI GEOM MED SMESH PARAVIS YACS HEXABLOCK HOMARD JOBMANAGER \ + NETGENPLUGIN BLSURFPLUGIN GHS3DPLUGIN GHS3DPRLPLUGIN HexoticPLUGIN HEXABLOCKPLUGIN \ + CALCULATOR PYCALCULATOR COMPONENT HELLO PYHELLO LIGHT PYLIGHT ATOMIC ATOMGEN ATOMSOLV RANDOMIZER SIERPINSKY ; do + smvar=${sm}_ROOT_DIR + if [ "${!smvar}" != "" ] ; then + sed -i "s%\([^/]*\)[^;]*/${sm}[^/]*%\1${!smvar}%g" $1 + fi + done +} -- 2.39.2