X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=config_files%2FCALCULATOR_BIN.sh;h=8b404ed0b64567476c9bbfbb91461425b91761d5;hb=11d56da368de92e83f422c03c18fd816daa36a72;hp=ec090cdaae3ebc8ba9f9ce5132339a62a6c03132;hpb=064e1054881cef4980b5f11906e6295dd44f927e;p=tools%2Finstall.git

diff --git a/config_files/CALCULATOR_BIN.sh b/config_files/CALCULATOR_BIN.sh
index ec090cd..8b404ed 100755
--- a/config_files/CALCULATOR_BIN.sh
+++ b/config_files/CALCULATOR_BIN.sh
@@ -5,7 +5,7 @@ if [ -n "${CALCULATOR_ROOT_DIR}" ]; then
     check_lib_version VERSION ${CALCULATOR_ROOT_DIR}/bin/salome
     if [ "$?" -eq "0" ]; then
 	ver=`cat ${CALCULATOR_ROOT_DIR}/bin/salome/VERSION | awk -F: '{print $2}' | tr -d '[:space:]' ` 
-	if [ "$ver" = "2.2.5" ]; then
+	if [ "$ver" = "3.2.1" ]; then
 	    return 0
 	fi
     fi
@@ -20,7 +20,8 @@ export CALCULATOR_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT}
 if [ -n "\${ENV_FOR_LAUNCH}" ] ; then
   if [ "\${ENV_FOR_LAUNCH}" == "1" ] ; then
     export PATH=\${CALCULATOR_ROOT_DIR}/bin/salome:\${PATH}
-    export PYTHONPATH=\${CALCULATOR_ROOT_DIR}/bin/salome:\${CALCULATOR_ROOT_DIR}/lib/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH}
+    export LD_LIBRARY_PATH=\${CALCULATOR_ROOT_DIR}/lib/salome:\${LD_LIBRARY_PATH}
+    export PYTHONPATH=\${CALCULATOR_ROOT_DIR}/bin/salome:\${CALCULATOR_ROOT_DIR}/lib/salome:\${CALCULATOR_ROOT_DIR}/lib/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH}
   fi
 fi
 ##
@@ -39,7 +40,8 @@ export CALCULATOR_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT}
 if [ -n "\${ENV_FOR_LAUNCH}" ] ; then
   if [ "\${ENV_FOR_LAUNCH}" == "1" ] ; then
     export PATH=\${CALCULATOR_ROOT_DIR}/bin/salome:\${PATH}
-    export PYTHONPATH=\${CALCULATOR_ROOT_DIR}/bin/salome:\${CALCULATOR_ROOT_DIR}/lib/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH}
+    export LD_LIBRARY_PATH=\${CALCULATOR_ROOT_DIR}/lib/salome:\${LD_LIBRARY_PATH}
+    export PYTHONPATH=\${CALCULATOR_ROOT_DIR}/bin/salome:\${CALCULATOR_ROOT_DIR}/lib/salome:\${CALCULATOR_ROOT_DIR}/lib/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH}
   fi
 fi
 ##
@@ -65,7 +67,16 @@ install_binary()
 make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
 source ${INSTALL_WORK}/$SHRC
 
-check_jb tar xfz ${SOURCE_DIR}/CALCULATORbinariesV2.2.5.tar.gz -C ${INSTALL_ROOT}
+check_jb tar xfz ${SOURCE_DIR}/CALCULATORbinariesV3.2.1.tar.gz -C ${INSTALL_ROOT}
+
+# modify all *.la files
+export CALCULATOR_ROOT_DIR=${PRODUCT_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
+chmod a+x runAppli
 
 print_env
 }
@@ -75,8 +86,8 @@ export INSTALL_WORK=$2;
 export SOURCE_DIR=$3;
 export INSTALL_ROOT=$4;
 export PRODUCT_SEQUENCE=$5;
-if [ $# == 6 ] ; then export PRODUCT_TYPE=$6 ; else export PRODUCT_TYPE="CALCULATORBin" ; fi
-export PRODUCT="CALCULATOR_2.2.5"
+if [ $# == 6 ] ; then export PRODUCT_TYPE=$6 ; else export PRODUCT_TYPE="CalculatorBin" ; fi
+export PRODUCT="CALCULATOR_3.2.1"
 export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT}
 export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
 source ./common.sh