Merge from Mandrake_10_1 branch (version 2.2.4)

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

diff --git a/config_files/SMESH_BIN.sh b/config_files/SMESH_BIN.sh
index 87d19e0043c264adb54a2a47c55740ccc46661da..3681a51822d55c6c539ae691f6115d786c977ccd 100755 (executable)
--- a/config_files/SMESH_BIN.sh
+++ b/config_files/SMESH_BIN.sh
@@ -5,7 +5,7 @@ if [ -n "${SMESH_ROOT_DIR}" ]; then
     check_lib_version VERSION ${SMESH_ROOT_DIR}/bin/salome
     if [ "$?" -eq "0" ]; then
        ver=`cat ${SMESH_ROOT_DIR}/bin/salome/VERSION | awk -F: '{print $2}' | tr -d '[:space:]' ` 
-       if [ "$ver" = "2.2.3" ]; then
+       if [ "$ver" = "2.2.4" ]; then
            return 0
        fi
     fi
@@ -17,6 +17,13 @@ print_env(){
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export SMESH_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT}
+if [ -n "\${ENV_FOR_LAUNCH}" ] ; then
+  if [ "\${ENV_FOR_LAUNCH}" == "1" ] ; then
+    export PATH=\${SMESH_ROOT_DIR}/bin/salome:\${PATH}
+    export LD_LIBRARY_PATH=\${SMESH_ROOT_DIR}/lib/salome:\${LD_LIBRARY_PATH}
+    export PYTHONPATH=\${SMESH_ROOT_DIR}/bin/salome:\${SMESH_ROOT_DIR}/lib/salome:\${SMESH_ROOT_DIR}/lib/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH}
+  fi
+fi
 ##
 EOF
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
@@ -30,6 +37,13 @@ if [ $? -eq 0 ] ; then
     cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export SMESH_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT}
+if [ -n "\${ENV_FOR_LAUNCH}" ] ; then
+  if [ "\${ENV_FOR_LAUNCH}" == "1" ] ; then
+    export PATH=\${SMESH_ROOT_DIR}/bin/salome:\${PATH}
+    export LD_LIBRARY_PATH=\${SMESH_ROOT_DIR}/lib/salome:\${LD_LIBRARY_PATH}
+    export PYTHONPATH=\${SMESH_ROOT_DIR}/bin/salome:\${SMESH_ROOT_DIR}/lib/salome:\${SMESH_ROOT_DIR}/lib/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH}
+  fi
+fi
 ##
 EOF
     make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
@@ -53,7 +67,7 @@ install_binary()
 make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
 source ${INSTALL_WORK}/$SHRC
 
-check_jb tar xfz ${SOURCE_DIR}/SMESHbinariesV2.2.3.tar.gz -C ${INSTALL_ROOT}
+check_jb tar xfz ${SOURCE_DIR}/SMESHbinariesV2.2.4.tar.gz -C ${INSTALL_ROOT}
 
 print_env
 }
@@ -64,7 +78,7 @@ export SOURCE_DIR=$3;
 export INSTALL_ROOT=$4;
 export PRODUCT_SEQUENCE=$5;
 if [ $# == 6 ] ; then export PRODUCT_TYPE=$6 ; else export PRODUCT_TYPE="SmeshBin" ; fi
-export PRODUCT="SMESH_2.2.3"
+export PRODUCT="SMESH_2.2.4"
 export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT}
 export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
 source ./common.sh