SALOME 7.3.0 preparation

diff --git a/config_files/ATOMGEN.sh b/config_files/ATOMGEN.sh
index ac9cc89961249fd7d5c85ebf49b3f2bf740859e0..a6405851e5aabbd43b63e59093fa63e53d4e57a3 100755 (executable)
--- a/config_files/ATOMGEN.sh
+++ b/config_files/ATOMGEN.sh
@@ -116,8 +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 
+modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeATOMGENConfig.cmake
+modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeATOMGENTargets-release.cmake 
 
 # to generate environment scripts
 try_preinstalled

diff --git a/config_files/ATOMIC.sh b/config_files/ATOMIC.sh
index 8fbff060a06044b3497512a69ec1597c36cd7100..b53525411720ce711a1cea6c4673e943411f38a4 100755 (executable)
--- a/config_files/ATOMIC.sh
+++ b/config_files/ATOMIC.sh
@@ -116,8 +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 
+modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeATOMICConfig.cmake
+modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeATOMICTargets-release.cmake 
 
 # to generate environment scripts
 try_preinstalled

diff --git a/config_files/ATOMSOLV.sh b/config_files/ATOMSOLV.sh
index c518bc433f023e8ccb055e4b3c77554d38af7330..27fc81db75e5e1d6d3a65597ed72cb325f88521b 100755 (executable)
--- a/config_files/ATOMSOLV.sh
+++ b/config_files/ATOMSOLV.sh
@@ -116,8 +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 
+modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeATOMSOLVConfig.cmake
+modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeATOMSOLVTargets-release.cmake 
 
 # to generate environment scripts
 try_preinstalled

diff --git a/config_files/BLSURFPLUGIN.sh b/config_files/BLSURFPLUGIN.sh
index bf5df0800b79f2bb134b5c362c908dbab4fc57d5..9005ab263bb75c3750a972bed25b7650c03f803f 100755 (executable)
--- a/config_files/BLSURFPLUGIN.sh
+++ b/config_files/BLSURFPLUGIN.sh
@@ -125,8 +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 
+modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeBLSURFPLUGINConfig.cmake
+modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeBLSURFPLUGINTargets-release.cmake 
 
 # to generate environment scripts
 try_preinstalled

diff --git a/config_files/CALCULATOR.sh b/config_files/CALCULATOR.sh
index 7bf4dc4f6ff0b2fe9ea4a2facbb1a8cec70a9a82..224900f45947f674683b3917be4e861c3f9e0cbf 100755 (executable)
--- a/config_files/CALCULATOR.sh
+++ b/config_files/CALCULATOR.sh
@@ -116,8 +116,8 @@ 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}
-modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomeCALCULATORConfig.cmake
-modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomeCALCULATORTargets-release.cmake 
+modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeCALCULATORConfig.cmake
+modif_cfg_file ${PRODUCT_DIR}/adm_local/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

diff --git a/config_files/COMPONENT.sh b/config_files/COMPONENT.sh
index 091be6e94ad830cc4bd85fd96cab6219b5739b7f..82814ce6bff74836965b3d0d4e20790fc406f54f 100755 (executable)
--- a/config_files/COMPONENT.sh
+++ b/config_files/COMPONENT.sh
@@ -116,8 +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 
+modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeCOMPONENTConfig.cmake
+modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeCOMPONENTTargets-release.cmake 
 
 # to generate environment scripts
 try_preinstalled

diff --git a/config_files/GEOM.sh b/config_files/GEOM.sh
index b4d8aa424aa461de042654e564307b70e326c3d4..2619359b52111be69c693f73075d9b481c6c4cf2 100755 (executable)
--- a/config_files/GEOM.sh
+++ b/config_files/GEOM.sh
@@ -124,8 +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 
+modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeGEOMConfig.cmake
+modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeGEOMTargets-release.cmake 
 
 # to generate environment scripts
 try_preinstalled

diff --git a/config_files/GHS3DPLUGIN.sh b/config_files/GHS3DPLUGIN.sh
index feee55571d2e3d0004937d6734e026014b30527a..65c4dfed84f4731e4278f1de342cc931959ff9af 100755 (executable)
--- a/config_files/GHS3DPLUGIN.sh
+++ b/config_files/GHS3DPLUGIN.sh
@@ -124,8 +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 
+modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeGHS3DPLUGINConfig.cmake
+modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeGHS3DPLUGINTargets-release.cmake 
 
 # to generate environment scripts
 try_preinstalled

diff --git a/config_files/GHS3DPRLPLUGIN.sh b/config_files/GHS3DPRLPLUGIN.sh
index 82c487e05eb8acff85436ca90099eb50860e440e..49b2c5e2b6ad4abcabacfcc434a6cb8f10d567ba 100755 (executable)
--- a/config_files/GHS3DPRLPLUGIN.sh
+++ b/config_files/GHS3DPRLPLUGIN.sh
@@ -123,8 +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 
+modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeGHS3DPRLPLUGINConfig.cmake
+modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeGHS3DPRLPLUGINTargets-release.cmake 
 
 # to generate environment scripts
 try_preinstalled

diff --git a/config_files/GUI.sh b/config_files/GUI.sh
index 05fe2e5b624fc103d02db306aff6649f3d233465..56eff0f9bbc6ab03d0dc515cb6677c6bbcd573ce 100755 (executable)
--- a/config_files/GUI.sh
+++ b/config_files/GUI.sh
@@ -117,8 +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 
+modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeGUIConfig.cmake
+modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeGUITargets-release.cmake 
 
 # to generate environment scripts
 try_preinstalled

diff --git a/config_files/HELLO.sh b/config_files/HELLO.sh
index 7fcca65a34a0a7ba138bca56bc614c89e92f829a..c5bf7eb0bfe3eb293829636d4502369f1dce81cc 100755 (executable)
--- a/config_files/HELLO.sh
+++ b/config_files/HELLO.sh
@@ -115,8 +115,8 @@ 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}
-modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomeHELLOConfig.cmake
-modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomeHELLOTargets-release.cmake 
+modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeHELLOConfig.cmake
+modif_cfg_file ${PRODUCT_DIR}/adm_local/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

diff --git a/config_files/HEXABLOCK.sh b/config_files/HEXABLOCK.sh
index c9396a92a542166038ab0bc334765540e7c8fe4c..4b0ba3734e7fc25df4ff1b148eacc9747553f6b5 100755 (executable)
--- a/config_files/HEXABLOCK.sh
+++ b/config_files/HEXABLOCK.sh
@@ -123,8 +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 
+modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeHEXABLOCKConfig.cmake
+modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeHEXABLOCKTargets-release.cmake 
 
 # to generate environment scripts
 try_preinstalled

diff --git a/config_files/HEXABLOCKPLUGIN.sh b/config_files/HEXABLOCKPLUGIN.sh
index 17ef33ee92e1d6ba643ddcb38e491e4fff8bd0f0..d9c99df1f3da9059fb92c8549f8068cd3290b7d2 100755 (executable)
--- a/config_files/HEXABLOCKPLUGIN.sh
+++ b/config_files/HEXABLOCKPLUGIN.sh
@@ -124,8 +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 
+modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeHEXABLOCKPLUGINConfig.cmake
+modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeHEXABLOCKPLUGINTargets-release.cmake 
 
 # to generate environment scripts
 try_preinstalled

diff --git a/config_files/HOMARD.sh b/config_files/HOMARD.sh
index 327b0fe55298c9b46b7062863a324c09369a658f..98b2671bf9abbbb3338fe026266dfef7657af3be 100755 (executable)
--- a/config_files/HOMARD.sh
+++ b/config_files/HOMARD.sh
@@ -120,8 +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 
+modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeHOMARDConfig.cmake
+modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeHOMARDTargets-release.cmake 
 
 # to generate environment scripts
 try_preinstalled

diff --git a/config_files/HexoticPLUGIN.sh b/config_files/HexoticPLUGIN.sh
index 08f10ebe5492c01e1cca2a36f1231dfa6888fafe..e134bdb9571d4b47241736f582715e9aace9ab33 100755 (executable)
--- a/config_files/HexoticPLUGIN.sh
+++ b/config_files/HexoticPLUGIN.sh
@@ -123,8 +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 
+modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeHexoticPLUGINConfig.cmake
+modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeHexoticPLUGINTargets-release.cmake 
 
 # to generate environment scripts
 try_preinstalled

diff --git a/config_files/JOBMANAGER.sh b/config_files/JOBMANAGER.sh
index 37b84331e31e1a113648925e5543a59e583c2295..e1d3b2906e68d70790c90abc08e01f68550f2a93 100755 (executable)
--- a/config_files/JOBMANAGER.sh
+++ b/config_files/JOBMANAGER.sh
@@ -110,8 +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 
+modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeJOBMANAGERConfig.cmake
+modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeJOBMANAGERTargets-release.cmake 
 
 # to generate environment scripts
 try_preinstalled

diff --git a/config_files/LIGHT.sh b/config_files/LIGHT.sh
index 1974f1b15d69bfaecf9ece91a98065395214c5fe..d81a0dd58bf20e8cb8eeee03c1a41530235e72a3 100755 (executable)
--- a/config_files/LIGHT.sh
+++ b/config_files/LIGHT.sh
@@ -113,8 +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 
+modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeLIGHTConfig.cmake
+modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeLIGHTTargets-release.cmake 
 
 # to generate environment scripts
 try_preinstalled

diff --git a/config_files/MED.sh b/config_files/MED.sh
index 87a05119f6344cba15b2dc4e3f669197ad6cbdbd..47e358b021a15feb0b5ebcf0e445aef9cab0fb7d 100755 (executable)
--- a/config_files/MED.sh
+++ b/config_files/MED.sh
@@ -125,8 +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 
+modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeMEDConfig.cmake
+modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeMEDTargets-release.cmake 
 
 # to generate environment scripts
 try_preinstalled

diff --git a/config_files/NETGENPLUGIN.sh b/config_files/NETGENPLUGIN.sh
index 62d1609e8f67cf1807c79ae7070d93e2df233f82..9e9832bffef958a1b6f67ad692ff49bf373638a8 100755 (executable)
--- a/config_files/NETGENPLUGIN.sh
+++ b/config_files/NETGENPLUGIN.sh
@@ -124,8 +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 
+modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeNETGENPLUGINConfig.cmake
+modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeNETGENPLUGINTargets-release.cmake 
 
 # to generate environment scripts
 try_preinstalled

diff --git a/config_files/PARAVIS.sh b/config_files/PARAVIS.sh
index 01f9dd229b5920154f157280814d6eeca305b2e0..ceabdaf2dc72df21b9061a862cbb7943f1cf407c 100755 (executable)
--- a/config_files/PARAVIS.sh
+++ b/config_files/PARAVIS.sh
@@ -118,8 +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 
+modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomePARAVISConfig.cmake
+modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomePARAVISTargets-release.cmake 
 
 # to generate environment scripts
 try_preinstalled

diff --git a/config_files/PYCALCULATOR.sh b/config_files/PYCALCULATOR.sh
index 18a11515becf343dbb88462ce66603d7869cc936..9fa6618c11c13d663a95184dde697ce4149ba570 100755 (executable)
--- a/config_files/PYCALCULATOR.sh
+++ b/config_files/PYCALCULATOR.sh
@@ -116,8 +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 
+modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomePYCALCULATORConfig.cmake
+modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomePYCALCULATORTargets-release.cmake 
 
 # to generate environment scripts
 try_preinstalled

diff --git a/config_files/PYHELLO.sh b/config_files/PYHELLO.sh
index e05d10b566258262641a6d755165be3a9da4487d..97d4d596f1af5c3d907547e2ea4ec8939f68ac00 100755 (executable)
--- a/config_files/PYHELLO.sh
+++ b/config_files/PYHELLO.sh
@@ -114,8 +114,8 @@ 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}
-modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomePYHELLOConfig.cmake
-modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomePYHELLOTargets-release.cmake 
+modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomePYHELLOConfig.cmake
+modif_cfg_file ${PRODUCT_DIR}/adm_local/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

diff --git a/config_files/PYLIGHT.sh b/config_files/PYLIGHT.sh
index 727892bac4c90227f76746ef5b1b9851b3d4cb23..79b72d76ca7a88b4d5a00c30d2ddb1a430d1227f 100755 (executable)
--- a/config_files/PYLIGHT.sh
+++ b/config_files/PYLIGHT.sh
@@ -114,8 +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 
+modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomePYLIGHTConfig.cmake
+modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomePYLIGHTTargets-release.cmake 
 
 # to generate environment scripts
 try_preinstalled

diff --git a/config_files/RANDOMIZER.sh b/config_files/RANDOMIZER.sh
index 4997fefba3a614687379af5a295b2100c4d52bfb..c0b1a5cb7cbe59f5bc5f2f40856e46dcc0c57563 100755 (executable)
--- a/config_files/RANDOMIZER.sh
+++ b/config_files/RANDOMIZER.sh
@@ -115,8 +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 
+modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeRANDOMIZERConfig.cmake
+modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeRANDOMIZERTargets-release.cmake 
 
 # to generate environment scripts
 try_preinstalled

diff --git a/config_files/SIERPINSKY.sh b/config_files/SIERPINSKY.sh
index beace25282db6fcab98cce572b75f40999b092cd..ed367b0733a459fcefa61a69a2c4d19c50d1fed3 100755 (executable)
--- a/config_files/SIERPINSKY.sh
+++ b/config_files/SIERPINSKY.sh
@@ -115,8 +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 
+modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeSIERPINSKYConfig.cmake
+modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeSIERPINSKYTargets-release.cmake 
 
 # to generate environment scripts
 try_preinstalled

diff --git a/config_files/SMESH.sh b/config_files/SMESH.sh
index b7259cf12ad8a17e9b2a44501bf5f09c0503d124..7a701b9f766acc5084c6c9f60ab304c84081e83e 100755 (executable)
--- a/config_files/SMESH.sh
+++ b/config_files/SMESH.sh
@@ -124,8 +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 
+modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeSMESHConfig.cmake
+modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeSMESHTargets-release.cmake 
 
 # to generate environment scripts
 try_preinstalled

diff --git a/config_files/YACS.sh b/config_files/YACS.sh
index 0418b40148bf4553cff1cb786b26e99d7c740f4b..76515cdc940c5e1e81b506e0d6fc4ddb5292556a 100755 (executable)
--- a/config_files/YACS.sh
+++ b/config_files/YACS.sh
@@ -123,8 +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 
+modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeYACSConfig.cmake
+modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeYACSTargets-release.cmake 
 
 # to generate environment scripts
 try_preinstalled

diff --git a/config_files/common.sh b/config_files/common.sh
index c16152182de850e3d337644d391fe3e163ffb4fc..d9b2cd0319dce114992c83641150b4a26521c025 100755 (executable)
--- a/config_files/common.sh
+++ b/config_files/common.sh
@@ -995,6 +995,9 @@ modif_cfg_file(){
     if [ "${QT4_ROOT_DIR}" != "" ] ; then
        sed -i "s%\([^/]*\)[^;]*/qt-[0-9.]\+%\1${QT4_ROOT_DIR}%g" $1
     fi
+    if [ "${QWT_ROOT_DIR}" != "" ] ; then
+       sed -i "s%\([^/]*\)[^;]*/qwt-[0-9.]\+%\1${QWT_ROOT_DIR}%g" $1
+    fi
     if [ "${SIP_ROOT_DIR}" != "" ] ; then
        sed -i "s%\([^/]*\)[^;]*/sip-[0-9.]\+%\1${SIP_ROOT_DIR}%g" $1
     fi
@@ -1031,6 +1034,9 @@ modif_cfg_file(){
     if [ "${NETGEN_ROOT_DIR}" != "" ] ; then
        sed -i "s%\([^/]*\)[^;]*/netgen-[0-9.]\+%\1${NETGEN_ROOT_DIR}%g" $1
     fi
+    if [ "${CGNS_ROOT_DIR}" != "" ] ; then
+       sed -i "s%\([^/]*\)[^;]*/cgnslib-[0-9.]\+%\1${CGNS_ROOT_DIR}%g" $1
+    fi
     if [ "${NUMPY_ROOT_DIR}" != "" ] ; then
        sed -i "s%\([^/]*\)[^;]*/numpy-[0-9.]\+%\1${NUMPY_ROOT_DIR}%g" $1
     fi

diff --git a/config_files/wso2.sh b/config_files/wso2.sh
index 438510e3c31efe3cd2d632cb7faeb3b1fbd259f1..446f46d4fbd4cf38e9d8c8d3b128c544510ae787 100755 (executable)
--- a/config_files/wso2.sh
+++ b/config_files/wso2.sh
@@ -116,6 +116,24 @@ test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
 
 check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${PRODUCT_DIR}
 
+# modifing la files
+for f in `find ${PRODUCT_DIR} -name "*.la"` X ; do
+    case ${f} in
+       X ) ;;
+       * ) sed -i "s%^libdir='.*/wso2-wsf-cpp-[0-9.]\+%libdir='${PRODUCT_DIR}%g;s%[[:space:]][^[:space:]]\+/wso2-wsf-cpp-[0-9.]\+/% ${PRODUCT_DIR}/%g" ${f} ;;
+    esac
+done
+# modify pkgconfig
+if [ -d ${PRODUCT_DIR}/lib/pkgconfig ] ; then
+  for f in X `find ${PRODUCT_DIR}/lib/pkgconfig -name "*.pc"`; do
+    case ${f} in
+       X ) ;;
+       * ) sed -i "s%^prefix=.*%prefix=${PRODUCT_DIR}%g" ${f}
+    esac
+  done
+fi
+
+
 # to generate environment script for sources
 try_preinstalled
 }