X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=config_files%2FCALCULATOR.sh;h=82f0bea54ad20d1e52d1d2b1168695aac9c566af;hb=741af97320c9411115221a3cbdf5f84128be907e;hp=a104b220f76286774002aa7c69f210713c37dfb3;hpb=b2d3f84aba2f2de9373dd0d8966b80e233b12754;p=tools%2Finstall.git

diff --git a/config_files/CALCULATOR.sh b/config_files/CALCULATOR.sh
index a104b22..82f0bea 100755
--- a/config_files/CALCULATOR.sh
+++ b/config_files/CALCULATOR.sh
@@ -12,7 +12,7 @@
 #
 ####################################################################################
 
-VERSION="3.2.7"
+VERSION="4.1.1"
 
 check_version(){
 if [ -n "${CALCULATOR_ROOT_DIR}" ]; then
@@ -24,12 +24,9 @@ if [ -n "${CALCULATOR_ROOT_DIR}" ]; then
 	fi
     fi
 elif [ -n "${CALCULATOR_SRC_DIR}" ]; then
-    if [ -f ${CALCULATOR_SRC_DIR}/configure.in.base ]; then
-	ver=`grep -E "^VERSION=" ${CALCULATOR_SRC_DIR}/configure.in.base | awk -F= '{print $NF}' | tr -d '[:space:]' ` 
-	if [ "$ver" = "${VERSION}" ]; then
-	    return 0
-	fi
-    fi
+  check_salome_src_version CALCULATOR_SRC_DIR $VERSION
+  if [ $? -eq 0 ] ; then return 0 ; fi
+  return 1
 fi
 return 1
 }
@@ -44,7 +41,7 @@ fi
 
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
-export CALCULATOR_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT}
+export CALCULATOR_ROOT_DIR=\${INSTALL_ROOT}/${SINGLE_DIR:-${PRODUCT}}
 if [ -n "\${ENV_FOR_LAUNCH}" ] ; then
   if [ "\${ENV_FOR_LAUNCH}" == "1" ] ; then
     export PATH=\${CALCULATOR_ROOT_DIR}/bin/salome:\${PATH}
@@ -92,7 +89,7 @@ install_source_and_build()
 install_source
 
 # build sources
-mkdir -p ${PRODUCT_DIR}
+test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
 
 if [ -e ./build.sh ] ; then
     cp -f ./build.sh ${INSTALL_ROOT}
@@ -119,12 +116,15 @@ install_binary()
 make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
 source ${INSTALL_WORK}/$SHRC
 
-check_jb tar xfz ${SOURCE_DIR}/CALCULATORbinariesV${VERSION}.tar.gz -C ${INSTALL_ROOT}
+# 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 ${INSTALL_ROOT}
 
 # modify all *.la files
 export CALCULATOR_ROOT_DIR=${PRODUCT_DIR}
-modif_la_files ${PRODUCT_DIR}
+test -z ${SINGLE_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
@@ -146,9 +146,11 @@ export INSTALL_PRODUCTS=$7;
 SRC_DIR=$8;
 shift
 REMOVE_SRC_TMP=$8;
+shift
+SINGLE_DIR=$9;
 export PRODUCT="CALCULATOR_${VERSION}"
 export PRODUCT_SRC="CALCULATOR_SRC_${VERSION}"
-export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT}
+export PRODUCT_DIR=${INSTALL_ROOT}/${SINGLE_DIR:-${PRODUCT}}
 export PRODUCT_SRC_DIR=${INSTALL_ROOT}/${PRODUCT_SRC}
 source ./common.sh
 $PROCEDURE