SALOME 7.3.0 preparation

diff --git a/config_files/ATOMSOLV.sh b/config_files/ATOMSOLV.sh
index 27fc81db75e5e1d6d3a65597ed72cb325f88521b..1b4e3e55254a278bb3068f2e096740b054449cd8 100755 (executable)
--- a/config_files/ATOMSOLV.sh
+++ b/config_files/ATOMSOLV.sh
@@ -118,6 +118,7 @@ export ATOMSOLV_ROOT_DIR=${PRODUCT_DIR}
 test -z ${SINGLE_DIR} && modif_la_files ${PRODUCT_DIR}
 modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeATOMSOLVConfig.cmake
 modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeATOMSOLVTargets-release.cmake 
+sed -i "s%export KERNEL_ROOT_DIR=.*%export KERNEL_ROOT_DIR=${KERNEL_ROOT_DIR}%g;s%export ATOMSOLV_ROOT_DIR=.*%export ATOMSOLV_ROOT_DIR=${ATOMSOLV_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 4b0ba3734e7fc25df4ff1b148eacc9747553f6b5..d4dfaa9d15ee61526a8b2fd18b77156dec6f1d08 100755 (executable)
--- a/config_files/HEXABLOCK.sh
+++ b/config_files/HEXABLOCK.sh
@@ -125,6 +125,7 @@ export HEXABLOCK_ROOT_DIR=${PRODUCT_DIR}
 test -z ${SINGLE_DIR} && modif_la_files ${PRODUCT_DIR}
 modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeHEXABLOCKConfig.cmake
 modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeHEXABLOCKTargets-release.cmake 
+sed -i "s%export KERNEL_ROOT_DIR=.*%export KERNEL_ROOT_DIR=${KERNEL_ROOT_DIR}%g;s%export HEXABLOCK_ROOT_DIR=.*%export HEXABLOCK_ROOT_DIR=${HEXABLOCK_ROOT_DIR}%g" ${PRODUCT_DIR}/bin/salome/runAppli
 
 # to generate environment scripts
 try_preinstalled

diff --git a/config_files/HOMARD.sh b/config_files/HOMARD.sh
index 98b2671bf9abbbb3338fe026266dfef7657af3be..5072bef9646c8acebd14781aab97b3425e424d9d 100755 (executable)
--- a/config_files/HOMARD.sh
+++ b/config_files/HOMARD.sh
@@ -122,6 +122,7 @@ export HOMARD_ROOT_DIR=${PRODUCT_DIR}
 test -z ${SINGLE_DIR} && modif_la_files ${PRODUCT_DIR}
 modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeHOMARDConfig.cmake
 modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeHOMARDTargets-release.cmake 
+sed -i "s%export KERNEL_ROOT_DIR=.*%export KERNEL_ROOT_DIR=${KERNEL_ROOT_DIR}%g;s%export HOMARD_ROOT_DIR=.*%export HOMARD_ROOT_DIR=${HOMARD_ROOT_DIR}%g" ${PRODUCT_DIR}/bin/salome/runAppli
 
 # to generate environment scripts
 try_preinstalled

diff --git a/config_files/common.sh b/config_files/common.sh
index d9b2cd0319dce114992c83641150b4a26521c025..d8b2d41e470868b83d9e97f8d86f226bd8c3fdc4 100755 (executable)
--- a/config_files/common.sh
+++ b/config_files/common.sh
@@ -1052,9 +1052,15 @@ modif_cfg_file(){
     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
+    if [ "${MESHGEMS_ROOT_DIR}" != "" ] ; then
        sed -i "s%\([^/]*\)[^;]*/MeshGems-[0-9.]\+%\1${MESHGEMS_ROOT_DIR}%g" $1
     fi
+    if [ "${METIS_ROOT_DIR}" != "" ] ; then
+       sed -i "s%\([^/]*\)[^;]*/metis-[0-9.]\+%\1${METIS_ROOT_DIR}%g" $1
+    fi
+    if [ "${SCOTCH_ROOT_DIR}" != "" ] ; then
+       sed -i "s%\([^/]*\)[^;]*/scotch-[0-9.]\+%\1${SCOTCH_ROOT_DIR}%g" $1
+    fi
     local sm
     local smvar
     for sm in LIBBATCH SIMANIO KERNEL GUI GEOM MED SMESH PARAVIS YACS HEXABLOCK HOMARD JOBMANAGER \

diff --git a/config_files/netgen.sh b/config_files/netgen.sh
index 4f3d3368160db5989f9c086619bf5192dd9f7e09..92eab60b020acbf9eaeded7d3de03614dd079fc8 100755 (executable)
--- a/config_files/netgen.sh
+++ b/config_files/netgen.sh
@@ -153,36 +153,27 @@ check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${PRODUCT_DIR}
 
 ### modifing la files
 if [ -f ${PRODUCT_DIR}/lib/libnglib.la ] ; then
-
-    cd ${PRODUCT_DIR}/lib
-
-    freetypedir=`printenv FREETYPE_ROOT_DIR`
-    gl2psdir=`printenv GL2PS_ROOT_DIR`
-    freeimagedir=`printenv FREEIMAGE_ROOT_DIR`
-    tbbbasedir=`printenv TBB_ROOT_DIR`
-
-    TBBKERNEL='cc4.1.0_libc2.4_kernel2.6.16.21'
-    if test `uname -m` = "x86_64" ; then
-       export TBBMODE="intel64/${TBBKERNEL}"
-    else
-       export TBBMODE="ia32/${TBBKERNEL}"
+    if [ "${FREETYPE_ROOT_DIR}" != "" ] ; then
+       sed -i "s%-L[^[:space:]]\+/freetype-[0-9.]\+/lib%-L${FREETYPE_ROOT_DIR}/lib%g;s%[^[:space:]]\+/libfreetype.la%-lfreetype%g" ${PRODUCT_DIR}/lib/libnglib.la
     fi
-    tbbdir=${tbbbasedir}/lib/${TBBMODE}
-
-    if [ -n "${freetypedir}" ] && [ -d "${freetypedir}" ] ; then
-       sed -i "s%\(.*\)\([[:space:]].*-L.*/freetype-[0-9]\.[0-9]\.[0-9]/lib[[:space:]]\)\(.*\)%\1 -L${freetypedir}/lib \3%g;s%\(.*\)\([[:space:]].*libfreetype.la\)\(.*\)%\1 -lfreetype \3%g" libnglib.la
+    if [ "${GL2PS_ROOT_DIR}" != "" ] ; then
+       sed -i "s%-L[^[:space:]]\+/gl2ps-[0-9.]\+/lib%-L${GL2PS_ROOT_DIR}/lib%g" ${PRODUCT_DIR}/lib/libnglib.la
     fi
-    if [ -n "${gl2psdir}" ] && [ -d "${gl2psdir}" ] ; then
-       sed -i "s%\(.*\)\([[:space:]].*-L.*/gl2ps-[0-9]\.[0-9]\.[0-9]/lib[[:space:]]\)\(.*\)%\1 -L${gl2psdir}/lib \3%g" libnglib.la
+    if [ "${FREEIMAGE_ROOT_DIR}" != "" ] ; then
+       sed -i "s%-L[^[:space:]]\+/freeimage-[0-9.]\+/lib%-L${FREEIMAGE_ROOT_DIR}/lib%g" ${PRODUCT_DIR}/lib/libnglib.la
     fi
-    if [ -n "${freeimagedir}" ] && [ -d "${freeimagedir}" ] ; then
-       sed -i "s%\(.*\)\([[:space:]].*-L.*/freeimage[^[:space:]]*/lib[[:space:]]\)\(.*\)%\1 -L${freeimagedir}/lib \3%g" libnglib.la
+    if [ "${TBB_ROOT_DIR}" != "" ] ; then
+       if test `uname -m` = "x86_64" ; then
+           tbbdir=${TBB_ROOT_DIR}/lib/intel64/cc4.1.0_libc2.4_kernel2.6.16.21
+       else
+           tbbdir=${TBB_ROOT_DIR}/lib/ia32/cc4.1.0_libc2.4_kernel2.6.16.21
+       fi
+       sed -i "s%-L[^[:space:]]\+/tbb[^[:space:]]*/lib[^[:space:]]*%-L${tbbdir}%g" ${PRODUCT_DIR}/lib/libnglib.la
     fi
-    if [ -n "${tbbdir}" ] && [ -d "${tbbdir}" ] ; then
-       sed -i "s%\(.*\)\([[:space:]].*-L.*/tbb[^[:space:]]*/lib[^[:space:]]*\)\(.*\)%\1 -L${tbbdir} \3%g" libnglib.la
+    if [ "${CAS_ROOT_DIR}" != "" ] ; then
+       sed -i "s%-L[^[:space:]]\+/\(OCCT\|CAS\)[^[:space:]]*/lib\?%-L${CAS_ROOT_DIR}/lib%g;s%[^[:space:]]\+/\(OCCT\|CAS\)[^[:space:]]*/lib/lib\?%${CAS_ROOT_DIR}/lib/lib%g" ${PRODUCT_DIR}/lib/libnglib.la
     fi
-
-    sed -i "s%^libdir='\(.*\)'%libdir='${PRODUCT_DIR}/lib'%g;s%[[:space:]]-L[^[:space:]]*\(OCCT\|CAS\)[^[:space:]]*/lib\?% -L${CAS_ROOT_DIR}/lib%g;s%[[:space:]][^[:space:]]*\(OCCT\|CAS\)[^[:space:]]*/lib/lib\?% ${CAS_ROOT_DIR}/lib/lib%g" libnglib.la
+    sed -i "s%^libdir='\(.*\)'%libdir='${PRODUCT_DIR}/lib'%g" ${PRODUCT_DIR}/lib/libnglib.la
 fi
 
 # to generate environment script for sources