Update for Salome 4.1.3

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

diff --git a/config_files/GHS3DPLUGIN.sh b/config_files/GHS3DPLUGIN.sh
index da670a79805abcfe53cfd2df71b2528c93ba24c6..36459514f3eff84b02b6f477ba986d22f88cf499 100755 (executable)
--- a/config_files/GHS3DPLUGIN.sh
+++ b/config_files/GHS3DPLUGIN.sh
@@ -12,7 +12,7 @@
 #
 ####################################################################################
 
-VERSION="4.1.1"
+VERSION="4.1.3"
 
 check_version(){
 if [ -n "${GHS3DPLUGIN_ROOT_DIR}" ]; then
@@ -34,10 +34,12 @@ 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 
@@ -97,7 +99,11 @@ fi
 
 CUR_DIR=`pwd`
 cd ${INSTALL_ROOT}
-check_jb build.sh -o -b -d -v 0 -p $INSTALL_ROOT GHS3DPLUGIN
+if [ $INST_WITH_GUI == "FALSE" ] ; then
+    check_jb build.sh -o -b -w -d -v 0 -p $INSTALL_ROOT GHS3DPLUGIN
+else
+    check_jb build.sh -o -b -d -v 0 -p $INSTALL_ROOT GHS3DPLUGIN
+fi
 
 cd $CUR_DIR
 
@@ -119,7 +125,11 @@ 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}/GHS3DPLUGINbinariesV${VERSION}.tar.gz -C ${PRODUCT_DIR}
+if [ $INST_WITH_GUI == "FALSE" ] ; then
+    check_jb tar xfz ${SOURCE_DIR}/GHS3DPLUGINWOGUIbinariesV${VERSION}.tar.gz -C ${PRODUCT_DIR}
+else
+    check_jb tar xfz ${SOURCE_DIR}/GHS3DPLUGINbinariesV${VERSION}.tar.gz -C ${PRODUCT_DIR}
+fi
 check_jb tar xfz ${SRC_DIR}/GHS3DPLUGINsourcesV${VERSION}.tar.gz -C ${INSTALL_ROOT}
 
 # modify all *.la files
@@ -141,6 +151,8 @@ SRC_DIR=$8;
 shift
 REMOVE_SRC_TMP=$8;
 shift
+INST_WITH_GUI=$9;
+shift
 SINGLE_DIR=$9;
 export PRODUCT="GHS3DPLUGIN_${VERSION}"
 export PRODUCT_SRC="GHS3DPLUGIN_SRC_${VERSION}"