X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=config_files%2FGUI_BIN.sh;h=da8f6ae1e689bafa53a9a2b4ce998e4893c0576e;hb=9fc2bfc009ddf32fb0f20cfcf7151b79aec3f62d;hp=979c890274a8bf6dc5f743139d9e061d4339e616;hpb=eac723b794cbc35686079552f16b7b68792578be;p=tools%2Finstall.git

diff --git a/config_files/GUI_BIN.sh b/config_files/GUI_BIN.sh
index 979c890..da8f6ae 100755
--- a/config_files/GUI_BIN.sh
+++ b/config_files/GUI_BIN.sh
@@ -1,11 +1,25 @@
-#!/bin/sh
+#!/bin/bash -noprofile
+
+####################################################################################
+#  File      : GUI_BIN.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
+#
+#  This script is the part of the SALOME installation procedure.
+#
+####################################################################################
+
+VERSION="3.2.4"
 
 check_version(){
 if [ -n "${GUI_ROOT_DIR}" ]; then
     check_lib_version VERSION ${GUI_ROOT_DIR}/bin/salome
     if [ "$?" -eq "0" ]; then
 	ver=`cat ${GUI_ROOT_DIR}/bin/salome/VERSION | awk -F: '{print $2}' | tr -d '[:space:]' ` 
-	if [ "$ver" = "3.1.0a2" ]; then
+	if [ "$ver" = "${VERSION}" ]; then
 	    return 0
 	fi
     fi
@@ -14,14 +28,19 @@ return 1
 }
 
 print_env(){
+if test `uname -m` = "x86_64" ; then
+export LIB_PREFIX=64
+else
+export LIB_PREFIX=""
+fi
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export GUI_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT}
 if [ -n "\${ENV_FOR_LAUNCH}" ] ; then
   if [ "\${ENV_FOR_LAUNCH}" == "1" ] ; then
     export PATH=\${GUI_ROOT_DIR}/bin/salome:\${PATH}
-    export LD_LIBRARY_PATH=\${GUI_ROOT_DIR}/lib/salome:\${LD_LIBRARY_PATH}
-    export PYTHONPATH=\${GUI_ROOT_DIR}/bin/salome:\${GUI_ROOT_DIR}/lib/salome:\${GUI_ROOT_DIR}/lib/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH}
+    export LD_LIBRARY_PATH=\${GUI_ROOT_DIR}/lib${LIB_PREFIX}/salome:\${LD_LIBRARY_PATH}
+    export PYTHONPATH=\${GUI_ROOT_DIR}/bin/salome:\${GUI_ROOT_DIR}/lib${LIB_PREFIX}/salome:\${GUI_ROOT_DIR}/lib${LIB_PREFIX}/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH}
   fi
 fi
 ##
@@ -33,6 +52,11 @@ make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
 # looks for the native product and collects it's environment (used by make_env())
 try_native(){
 check_version
+if test `uname -m` = "x86_64" ; then
+export LIB_PREFIX=64
+else
+export LIB_PREFIX=""
+fi
 if [ $? -eq 0 ] ; then
     cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
@@ -40,8 +64,8 @@ export GUI_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT}
 if [ -n "\${ENV_FOR_LAUNCH}" ] ; then
   if [ "\${ENV_FOR_LAUNCH}" == "1" ] ; then
     export PATH=\${GUI_ROOT_DIR}/bin/salome:\${PATH}
-    export LD_LIBRARY_PATH=\${GUI_ROOT_DIR}/lib/salome:\${LD_LIBRARY_PATH}
-    export PYTHONPATH=\${GUI_ROOT_DIR}/bin/salome:\${GUI_ROOT_DIR}/lib/salome:\${GUI_ROOT_DIR}/lib/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH}
+    export LD_LIBRARY_PATH=\${GUI_ROOT_DIR}/lib${LIB_PREFIX}/salome:\${LD_LIBRARY_PATH}
+    export PYTHONPATH=\${GUI_ROOT_DIR}/bin/salome:\${GUI_ROOT_DIR}/lib${LIB_PREFIX}/salome:\${GUI_ROOT_DIR}/lib${LIB_PREFIX}/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH}
   fi
 fi
 ##
@@ -67,10 +91,11 @@ install_binary()
 make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
 source ${INSTALL_WORK}/$SHRC
 
-check_jb tar xfz ${SOURCE_DIR}/GUIbinariesV3.1.0a2.tar.gz -C ${INSTALL_ROOT}
+check_jb tar xfz ${SOURCE_DIR}/GUIbinariesV${VERSION}.tar.gz -C ${INSTALL_ROOT}
 
-# remove all *.la files
-rm -rf ${PRODUCT_DIR}/lib/salome/*.la
+# modify all *.la files
+export GUI_ROOT_DIR=${PRODUCT_DIR}
+modif_la_files ${PRODUCT_DIR}
 
 print_env
 }
@@ -80,8 +105,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="GUIBin" ; fi
-export PRODUCT="GUI_3.1.0a2"
+if [ $# == 6 ] ; then export PRODUCT_TYPE=$6 ; else export PRODUCT_TYPE="GUIbin" ; fi
+export PRODUCT="GUI_${VERSION}"
 export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT}
 export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
 source ./common.sh