*** empty log message ***

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

diff --git a/config_files/GUI.sh b/config_files/GUI.sh
index 241f2133e5e423fea748b70e214697b2b81d91b4..930114b2b7a05e1f8cb723d946859b8cb78e87d3 100755 (executable)
--- a/config_files/GUI.sh
+++ b/config_files/GUI.sh
@@ -12,7 +12,7 @@
 #
 ####################################################################################
 
-VERSION="3.2.6"
+VERSION="4.1.1"
 
 check_version(){
 if [ -n "${GUI_ROOT_DIR}" ]; then
@@ -24,12 +24,9 @@ if [ -n "${GUI_ROOT_DIR}" ]; then
        fi
     fi
 elif [ -n "${GUI_SRC_DIR}" ]; then
-    if [ -f ${GUI_SRC_DIR}/configure.in.base ]; then
-       ver=`grep -E "^VERSION=" ${GUI_SRC_DIR}/configure.in.base | awk -F= '{print $NF}' | tr -d '[:space:]' ` 
-       if [ "$ver" = "${VERSION}" ]; then
-           return 0
-       fi
-    fi
+  check_salome_src_version GUI_SRC_DIR $VERSION
+  if [ $? -eq 0 ] ; then return 0 ; fi
+  return 1
 fi
 return 1
 }
@@ -42,7 +39,7 @@ export LIB_PREFIX=""
 fi
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
-export GUI_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT}
+export GUI_ROOT_DIR=\${INSTALL_ROOT}/${SINGLE_DIR:-${PRODUCT}}
 if [ -n "\${ENV_FOR_LAUNCH}" ] ; then
   if [ "\${ENV_FOR_LAUNCH}" == "1" ] ; then
     export PATH=\${GUI_ROOT_DIR}/bin/salome:\${PATH}
@@ -90,7 +87,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}
@@ -117,12 +114,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}/GUIbinariesV${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}/GUIbinariesV${VERSION}.tar.gz -C ${PRODUCT_DIR}
 check_jb tar xfz ${SRC_DIR}/GUIsourcesV${VERSION}.tar.gz -C ${INSTALL_ROOT}
 
 # modify all *.la files
 export GUI_ROOT_DIR=${PRODUCT_DIR}
-modif_la_files ${PRODUCT_DIR}
+test -z ${SINGLE_DIR} && modif_la_files ${PRODUCT_DIR}
 
 # to generate environment scripts
 try_preinstalled
@@ -138,9 +138,11 @@ export INSTALL_PRODUCTS=$7;
 SRC_DIR=$8;
 shift
 REMOVE_SRC_TMP=$8;
+shift
+SINGLE_DIR=$9;
 export PRODUCT="GUI_${VERSION}"
 export PRODUCT_SRC="GUI_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