*** empty log message ***

[tools/install.git] / config_files / common.sh

diff --git a/config_files/common.sh b/config_files/common.sh
index beaff54802a6d67c74eba7334e0448261b98ea3a..b2acc2bafcec811ab11c85f31111c2eecb99f6ad 100755 (executable)
--- a/config_files/common.sh
+++ b/config_files/common.sh
@@ -19,7 +19,9 @@ export CSHRC="salome.csh"
 #####################################################
 # !WARNING! This is current SALOME version number 
 ####################################################
-export SALOME_VERSION="5.1.2"
+export SALOME_VERSION="6.1.0"
+export YACSGEN_VERSION="6.1.0"
+export JOBMANAGER_VERSION="0.1"
 
 # Name of the single directory for SALOME modules
 export SDIR_NAME="SALOME_${SALOME_VERSION}"
@@ -32,9 +34,19 @@ if [ -n "$root_dir" ]; then
     cfg_file=configure.ac
     if [ ! -f ${root_dir}/${cfg_file} ] ; then
        cfg_file=configure.in.base
-    fi
+       else
+           cfg_file=CMakeLists.txt
+       fi
     if [ -f ${root_dir}/${cfg_file} ] ; then
-       ver=`grep -e "^AC_INIT" ${root_dir}/${cfg_file} | sed -e "s%.*\[\([[:digit:].]*\)\].*%\1%g"`
+       if [ "${cfg_file}" = "CMakeLists.txt" ] ; then
+           ver_maj=`cat ${root_dir}/${cfg_file} | grep SET\(VERSION_MAJOR | sed -e "s%[A-Z_() ]%%g"`
+           ver_min=`cat ${root_dir}/${cfg_file} | grep SET\(VERSION_MINOR | sed -e "s%[A-Z_() ]%%g"`
+           ver_maintenance=`cat ${root_dir}/${cfg_file} | grep SET\(VERSION_MAINTENANCE | sed -e "s%[A-Z_() ]%%g"`
+           ver="${ver_maj}.${ver_min}.${ver_maintenance}"
+       else
+           ver=`grep -e "^AC_INIT" ${root_dir}/${cfg_file} | sed -e "s%.*\[\([[:digit:].]*\)\].*%\1%g"`
+       fi
+
        if [ "$ver" = "${SALOME_VERSION}" ]; then
            return 0
        fi
@@ -169,7 +181,7 @@ echo '#------ License activation ------' >> ${install_work}/$SHRC 2>/dev/null
 echo 'export LICENSE_FILE=/product/distene/dlim8.var.sh' >> ${install_work}/$SHRC 2>/dev/null
 echo '' >> ${install_work}/$SHRC 2>/dev/null
 echo 'if [ -e "${LICENSE_FILE}" ] ; then' >> ${install_work}/$SHRC 2>/dev/null
-echo 'export SIMULOGD_LICENSE_FILE=29029@amun' >> ${install_work}/$SHRC 2>/dev/null
+echo 'export SIMULOGD_LICENSE_FILE=29029@soleil' >> ${install_work}/$SHRC 2>/dev/null
 echo 'source ${LICENSE_FILE}' >> ${install_work}/$SHRC 2>/dev/null
 echo 'fi' >> ${install_work}/$SHRC 2>/dev/null
 echo '' >> ${install_work}/$SHRC 2>/dev/null
@@ -792,7 +804,7 @@ if [ "$l" != "X" ] ; then
     blsurfdir=`printenv BLSURFHOME`/lib
     if [ -n "${blsurfdir}" ] && [ -d "${blsurfdir}" ] ; then
        # echo $l $BOOSTDIR $boostdir
-       sed -e "s%-L[^[:space:]]*blsurf[^[:space:]]*/lib%-L${blsurfdir}%g" $l > $l"_"
+       sed -e "s%-L[^[:space:]]*BLSurf[^[:space:]]*/lib%-L${blsurfdir}%g" $l > $l"_"
        mv -f $l"_" $l
     fi
 
@@ -843,10 +855,24 @@ if [ "$l" != "X" ] ; then
    # 20. process QScintilla-2.3 dependencies
     qscintilladir=`printenv QSCINTILLA_DIR`/lib
     if [ ! -d ${qscintilladir} ] ; then qscintilladir=`printenv QSCINTILLA_DIR`/lib ; fi
-    sed -e "s%[[:space:]]\(-L\)\?[^[:space:]]*QScintilla-[0-9]\.[0-9]\.[0-9]/lib% \1${qscintilladir}%g" $l > $l"_"
+    sed -e "s%[[:space:]]\(-L\)\?[^[:space:]]*QScintilla-[0-9]\.[0-9]\(\.[0-9]\)\?/lib% \1${qscintilladir}%g" $l > $l"_"
     chmod -f --reference=$l $l"_"
     mv -f $l"_" $l     
 
+   # 21. process expat-2.0.1 dependencies
+       expatdir=${EXPAT_ROOT}/lib
+       sed -e "s%-L[^[:space:]]*expat[^[:space:]]*/lib%-L${expatdir}%g" \
+           -e "s%[^[:space:]]*expat[^[:space:]]*/lib/libexpat.la%-lexpat%g" $l > $l"_"
+       chmod -f --reference=$l $l"_"
+       mv -f $l"_" $l          
+
+    # 22. process ParaView dependencies
+    paraviewdir=`printenv PVHOME`/lib
+    if [ ! -d ${paraviewdir} ] ; then paraviewdir=`printenv PVHOME`/lib ; fi
+    sed -e "s%[[:space:]]\(-L\)\?[^[:space:]]*ParaView-[0-9]\.[0-9]/lib% \1${paraviewdir}%g" $l > $l"_"
+    chmod -f --reference=$l $l"_"
+    mv -f $l"_" $l 
+
 fi
 done