X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=config_files%2FCALCULATOR.sh;h=e77ff8da68bc839bd5b9a0b3132ddf8a42ef7d6f;hb=260bf6b42efe9e30501c4e6e99b013da3fe34f77;hp=3328c92290b881760044c4ce7d259694a1c5a4e4;hpb=b2036a2d0e2c0ea62a25791c479629b0a6e20c37;p=tools%2Finstall.git

diff --git a/config_files/CALCULATOR.sh b/config_files/CALCULATOR.sh
index 3328c92..e77ff8d 100755
--- a/config_files/CALCULATOR.sh
+++ b/config_files/CALCULATOR.sh
@@ -1,30 +1,28 @@
 #!/bin/bash -noprofile
 
 ####################################################################################
-#  File      : CALCULATOR_BIN.sh
+#  File      : CALCULATOR.sh
 #  Created   : Thu Dec 18 12:01:00 2002
 #  Author    : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com)
 #  Project   : SALOME
 #  Module    : Installation Wizard
-#  Copyright : 2002-2007 CEA
+#  Copyright : 2002-2008 CEA
 #
 #  This script is the part of the SALOME installation procedure.
 #
 ####################################################################################
 
-VERSION="5.0.0"
-
 check_version(){
 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" = "${VERSION}" ]; then
+	if [ "$ver" = "${SALOME_VERSION}" ]; then
 	    return 0
 	fi
     fi
 elif [ -n "${CALCULATOR_SRC_DIR}" ]; then
-  check_salome_src_version CALCULATOR_SRC_DIR $VERSION
+  check_salome_src_version CALCULATOR_SRC_DIR
   if [ $? -eq 0 ] ; then return 0 ; fi
   return 1
 fi
@@ -32,23 +30,14 @@ return 1
 }
 
 print_env_bin(){
-
-if [ `uname -m` = "x86_64" ] && [ -d ${PRODUCT_DIR}/lib64 ] ; then 
-    LIB_PREFIX=64
-elif [ -d ${PRODUCT_DIR}/lib ] ; then 
-    LIB_PREFIX=""
-else 
-    LIB_PREFIX=64
-fi
-
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export CALCULATOR_ROOT_DIR=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
 if [ -n "\${ENV_FOR_LAUNCH}" ] ; then
-  if [ "\${ENV_FOR_LAUNCH}" == "1" ] ; then
+  if [ "\${ENV_FOR_LAUNCH}" = "1" ] ; then
     export PATH=\${CALCULATOR_ROOT_DIR}/bin/salome:\${PATH}
-    export LD_LIBRARY_PATH=\${CALCULATOR_ROOT_DIR}/lib${LIB_PREFIX}/salome:\${LD_LIBRARY_PATH}
-    export PYTHONPATH=\${CALCULATOR_ROOT_DIR}/bin/salome:\${CALCULATOR_ROOT_DIR}/lib${LIB_PREFIX}/salome:\${CALCULATOR_ROOT_DIR}/lib${LIB_PREFIX}/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
 ##
@@ -79,7 +68,7 @@ install_source()
 make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src
 source ${INSTALL_WORK}/$SHRC
 
-check_jb tar xfz ${SOURCE_DIR}/CALCULATORsourcesV${VERSION}.tar.gz -C ${INST_ROOT}
+check_jb tar xfz ${SOURCE_DIR}/CALCULATORsourcesV${SALOME_VERSION}.tar.gz -C ${INST_ROOT}
 
 # to generate environment scripts
 try_preinstalled
@@ -99,7 +88,7 @@ fi
 
 CUR_DIR=`pwd`
 cd ${INST_ROOT}
-check_jb build.sh -o -b -d -v 0 -p $INST_ROOT CALCULATOR
+check_jb ./build.sh -o -b -d -v 0 -p $INST_ROOT CALCULATOR
 
 cd $CUR_DIR
 
@@ -121,8 +110,8 @@ source ${INSTALL_WORK}/$SHRC
 # create a module directory
 test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
 
-check_jb tar xfz ${SOURCE_DIR}/CALCULATORbinariesV${VERSION}.tar.gz -C ${PRODUCT_DIR}
-check_jb tar xfz ${SRC_DIR}/CALCULATORsourcesV${VERSION}.tar.gz -C ${INST_ROOT}
+check_jb tar xfz ${SOURCE_DIR}/CALCULATORbinariesV${SALOME_VERSION}.tar.gz -C ${PRODUCT_DIR}
+check_jb tar xfz ${SRC_DIR}/CALCULATORsourcesV${SALOME_VERSION}.tar.gz -C ${INST_ROOT}
 
 # modify all *.la files
 export CALCULATOR_ROOT_DIR=${PRODUCT_DIR}
@@ -138,6 +127,8 @@ chmod a+x runAppli
 try_preinstalled
 }
 
+source ./common.sh
+
 export PROCEDURE=$1;
 export INSTALL_WORK=$2;
 export SOURCE_DIR=$3;
@@ -150,9 +141,9 @@ shift
 REMOVE_SRC_TMP=$8;
 shift
 SINGLE_DIR=$9;
-export PRODUCT="CALCULATOR_${VERSION}"
-export PRODUCT_SRC="CALCULATOR_SRC_${VERSION}"
+if [ -n "$SINGLE_DIR" ] ; then SINGLE_DIR=$SDIR_NAME; fi
+export PRODUCT="CALCULATOR_${SALOME_VERSION}"
+export PRODUCT_SRC="CALCULATOR_SRC_${SALOME_VERSION}"
 export PRODUCT_DIR=${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
 export PRODUCT_SRC_DIR=${INST_ROOT}/${PRODUCT_SRC}
-source ./common.sh
 $PROCEDURE