SALOME 7.3.0 preparation

diff --git a/config_files/ATOMGEN.sh b/config_files/ATOMGEN.sh
index 3751c9e911c5a1a355ffc847ae99c5b298d858bd..ac9cc89961249fd7d5c85ebf49b3f2bf740859e0 100755 (executable)
--- 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}
 # 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
 
 # to generate environment scripts
 try_preinstalled

diff --git a/config_files/ATOMIC.sh b/config_files/ATOMIC.sh
index 16954c06037d359d9b4bb8fb84485abfd2ebc9c1..8fbff060a06044b3497512a69ec1597c36cd7100 100755 (executable)
--- 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}
 # 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
 
 # to generate environment scripts
 try_preinstalled

diff --git a/config_files/ATOMSOLV.sh b/config_files/ATOMSOLV.sh
index 039a5dfe8b44c9c485e13a8ba120bd0763ab32f1..c518bc433f023e8ccb055e4b3c77554d38af7330 100755 (executable)
--- 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}
 # 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
 
 # to generate environment scripts
 try_preinstalled

diff --git a/config_files/BLSURFPLUGIN.sh b/config_files/BLSURFPLUGIN.sh
index 090b4a6ec314bad758ed24f2cfd315cc33d129b9..bf5df0800b79f2bb134b5c362c908dbab4fc57d5 100755 (executable)
--- 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}
 # 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
 
 # to generate environment scripts
 try_preinstalled

diff --git a/config_files/CALCULATOR.sh b/config_files/CALCULATOR.sh
index a121f6b5136bf3ec49837d947e5bfb6214071064..7bf4dc4f6ff0b2fe9ea4a2facbb1a8cec70a9a82 100755 (executable)
--- 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}
 # 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
 
 # to generate environment scripts
 try_preinstalled

diff --git a/config_files/COMPONENT.sh b/config_files/COMPONENT.sh
index 71d6bfa4d1040ec235b2e3e7a8dfffad25665fda..091be6e94ad830cc4bd85fd96cab6219b5739b7f 100755 (executable)
--- 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}
 # 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
 
 # to generate environment scripts
 try_preinstalled

diff --git a/config_files/GEOM.sh b/config_files/GEOM.sh
index 3a26e32ab3dc326312f3c4dcee526974518a206a..b4d8aa424aa461de042654e564307b70e326c3d4 100755 (executable)
--- 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}
 # 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
 
 # to generate environment scripts
 try_preinstalled

diff --git a/config_files/GHS3DPLUGIN.sh b/config_files/GHS3DPLUGIN.sh
index 765760096b9fa4bb64142cdb77c2a347c1ad51dd..feee55571d2e3d0004937d6734e026014b30527a 100755 (executable)
--- 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}
 # 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
 
 # to generate environment scripts
 try_preinstalled

diff --git a/config_files/GHS3DPRLPLUGIN.sh b/config_files/GHS3DPRLPLUGIN.sh
index b351cf4e4c7706b0174f133fa64a804823d590ad..82c487e05eb8acff85436ca90099eb50860e440e 100755 (executable)
--- 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}
 # 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
 
 # to generate environment scripts
 try_preinstalled

diff --git a/config_files/GUI.sh b/config_files/GUI.sh
index c5f17ee15458a00b79ae33e37695ee455488e46e..05fe2e5b624fc103d02db306aff6649f3d233465 100755 (executable)
--- 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}
 # 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
 
 # to generate environment scripts
 try_preinstalled

diff --git a/config_files/HELLO.sh b/config_files/HELLO.sh
index 006c92a38e4fa1a19d362314425bef22774f6078..7fcca65a34a0a7ba138bca56bc614c89e92f829a 100755 (executable)
--- 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}
 # 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
 
 # to generate environment scripts
 try_preinstalled

diff --git a/config_files/HEXABLOCK.sh b/config_files/HEXABLOCK.sh
index e2fbe05dbf4a455d4368b9fb83cb0b75c7e9a4df..c9396a92a542166038ab0bc334765540e7c8fe4c 100755 (executable)
--- 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}
 # 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
 
 # to generate environment scripts
 try_preinstalled

diff --git a/config_files/HEXABLOCKPLUGIN.sh b/config_files/HEXABLOCKPLUGIN.sh
index bd4f3af65e967cd1dc352e0c44f8af8145460cbb..17ef33ee92e1d6ba643ddcb38e491e4fff8bd0f0 100755 (executable)
--- 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}
 # 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
 
 # to generate environment scripts
 try_preinstalled

diff --git a/config_files/HOMARD.sh b/config_files/HOMARD.sh
index 16cf0ff137c72807061126bc8ff3bcdfcc11a746..327b0fe55298c9b46b7062863a324c09369a658f 100755 (executable)
--- 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}
 # 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
 
 # to generate environment scripts
 try_preinstalled

diff --git a/config_files/HexoticPLUGIN.sh b/config_files/HexoticPLUGIN.sh
index 33e50b5ebfc59b7fafbccd6d34f22a4861b8e52c..08f10ebe5492c01e1cca2a36f1231dfa6888fafe 100755 (executable)
--- 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}
 # 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
 
 # to generate environment scripts
 try_preinstalled

diff --git a/config_files/JOBMANAGER.sh b/config_files/JOBMANAGER.sh
index 52b421b80def09539d411e7d73c0127d1f7c3f48..37b84331e31e1a113648925e5543a59e583c2295 100755 (executable)
--- 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}
 # 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
 
 # to generate environment scripts
 try_preinstalled

diff --git a/config_files/KERNEL.sh b/config_files/KERNEL.sh
index 82fbe2a99584838442185c6a938c6c6e0bcb565c..1e0a5ed713d025db815bc64f3ef1559732b8620d 100755 (executable)
--- 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}
 
 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}
 # 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
 
 # to generate environment scripts
 try_preinstalled

diff --git a/config_files/LIGHT.sh b/config_files/LIGHT.sh
index d400d8b5826d6b9fb5fabfb9f44364d91bcfd56b..1974f1b15d69bfaecf9ece91a98065395214c5fe 100755 (executable)
--- 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}
 # 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
 
 # to generate environment scripts
 try_preinstalled

diff --git a/config_files/MED.sh b/config_files/MED.sh
index 80921c134a03e2d419edbf8ce24c2bb35635b81b..87a05119f6344cba15b2dc4e3f669197ad6cbdbd 100755 (executable)
--- 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}
 # 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
 
 # to generate environment scripts
 try_preinstalled

diff --git a/config_files/NETGENPLUGIN.sh b/config_files/NETGENPLUGIN.sh
index 4e2a37b9d03a02667999ec652faf72d1efbf2e5a..62d1609e8f67cf1807c79ae7070d93e2df233f82 100755 (executable)
--- 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}
 # 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
 
 # to generate environment scripts
 try_preinstalled

diff --git a/config_files/PARAVIS.sh b/config_files/PARAVIS.sh
index 32fe356155a75dad88df523741eac8c9804fac87..01f9dd229b5920154f157280814d6eeca305b2e0 100755 (executable)
--- 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}
 # 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
 
 # to generate environment scripts
 try_preinstalled

diff --git a/config_files/PYCALCULATOR.sh b/config_files/PYCALCULATOR.sh
index 83ec1df751b0a77ea762ce515d506186d0dc189c..18a11515becf343dbb88462ce66603d7869cc936 100755 (executable)
--- 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}
 # 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
 
 # to generate environment scripts
 try_preinstalled

diff --git a/config_files/PYHELLO.sh b/config_files/PYHELLO.sh
index aab25b53692221340ce5ab3beab4ffcb427ff548..e05d10b566258262641a6d755165be3a9da4487d 100755 (executable)
--- 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}
 # 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
 
 # to generate environment scripts
 try_preinstalled

diff --git a/config_files/PYLIGHT.sh b/config_files/PYLIGHT.sh
index 1c6bac0a4203609c968a87124c4e69a6181e0e1e..727892bac4c90227f76746ef5b1b9851b3d4cb23 100755 (executable)
--- 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}
 # 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
 
 # to generate environment scripts
 try_preinstalled

diff --git a/config_files/RANDOMIZER.sh b/config_files/RANDOMIZER.sh
index a296ce2c5e0fc02e79a052a58d701f87b6301c8e..4997fefba3a614687379af5a295b2100c4d52bfb 100755 (executable)
--- 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}
 # 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
 
 # to generate environment scripts
 try_preinstalled

diff --git a/config_files/SIERPINSKY.sh b/config_files/SIERPINSKY.sh
index b37f3b00c669b9181e5aff0fdfd971abd52eb881..beace25282db6fcab98cce572b75f40999b092cd 100755 (executable)
--- 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}
 # 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
 
 # to generate environment scripts
 try_preinstalled

diff --git a/config_files/SMESH.sh b/config_files/SMESH.sh
index e53379eeb03188e714c6b293d16fbfafa300c6e0..b7259cf12ad8a17e9b2a44501bf5f09c0503d124 100755 (executable)
--- 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}
 # 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
 
 # to generate environment scripts
 try_preinstalled

diff --git a/config_files/YACS.sh b/config_files/YACS.sh
index 5e32c33374df29f60f4d6001528a8f4a46b93c8e..0418b40148bf4553cff1cb786b26e99d7c740f4b 100755 (executable)
--- 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}
 # 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
 
 # to generate environment scripts
 try_preinstalled

diff --git a/config_files/common.sh b/config_files/common.sh
index 0ee07926f585c8f41b962c321c70e440dd70f6b9..c16152182de850e3d337644d391fe3e163ffb4fc 100755 (executable)
--- a/config_files/common.sh
+++ b/config_files/common.sh
@@ -687,6 +687,8 @@ fix_gl_libs(){
 }
 
 modif_la_files(){
 }
 
 modif_la_files(){

+return 0
+# obsolete

 ldir=$1
 if [ -z "${ldir}" ] || [ ! -d "${ldir}" ]; then return 1; fi
 
 ldir=$1
 if [ -z "${ldir}" ] || [ ! -d "${ldir}" ]; then return 1; fi
 


@@ -966,3 +968,95 @@ done
 cd ${srcdir}
 return 0
 }
 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
+}