Update for Salome 4.1.3

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

diff --git a/config_files/MULTIPR.sh b/config_files/MULTIPR.sh
index 4eb0cd821f28b936baea501864a899349157e8ab..7ca3945de9135634b911f7208099573015c09b8d 100755 (executable)
--- a/config_files/MULTIPR.sh
+++ b/config_files/MULTIPR.sh
@@ -12,7 +12,7 @@
 #
 ####################################################################################
 
-VERSION="4.0.0"
+VERSION="4.1.3"
 
 check_version(){
 if [ -n "${MULTIPR_ROOT_DIR}" ]; then
@@ -31,17 +31,20 @@ return 1
 }
 
 print_env_bin(){
-if test `uname -m` = "x86_64" ; then
-export LIB_PREFIX=64
-else
-export LIB_PREFIX=""
+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 MULTIPR_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT}
+export MULTIPR_ROOT_DIR=\${INSTALL_ROOT}/${SINGLE_DIR:-${PRODUCT}}
 if [ -n "\${ENV_FOR_LAUNCH}" ] ; then
   if [ "\${ENV_FOR_LAUNCH}" == "1" ] ; then
     export PATH=\${MULTIPR_ROOT_DIR}/bin/salome:\${PATH}
+    export LD_LIBRARY_PATH=\${MULTIPR_ROOT_DIR}/lib${LIB_PREFIX}/salome:\${LD_LIBRARY_PATH}
     export PYTHONPATH=\${MULTIPR_ROOT_DIR}/bin/salome:\${MULTIPR_ROOT_DIR}/lib${LIB_PREFIX}/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH}
   fi
 fi
@@ -85,7 +88,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}
@@ -112,12 +115,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}/MULTIPRbinariesV${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}/MULTIPRbinariesV${VERSION}.tar.gz -C ${PRODUCT_DIR}
 check_jb tar xfz ${SRC_DIR}/MULTIPRsourcesV${VERSION}.tar.gz -C ${INSTALL_ROOT}
 
 # modify all *.la files
 export MULTIPR_ROOT_DIR=${PRODUCT_DIR}
-modif_la_files ${PRODUCT_DIR}
+test -z ${SINGLE_DIR} && modif_la_files ${PRODUCT_DIR}
 
 # to generate environment scripts
 try_preinstalled
@@ -133,9 +139,11 @@ export INSTALL_PRODUCTS=$7;
 SRC_DIR=$8;
 shift
 REMOVE_SRC_TMP=$8;
+shift
+SINGLE_DIR=$9;
 export PRODUCT="MULTIPR_${VERSION}"
 export PRODUCT_SRC="MULTIPR_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