X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=config_files%2FSMESH.sh;h=e34b7fc734f038f7c2f19eb62186ae72e77f365f;hb=3b3e059bc6b5a33c778b830eeff8de9bf034ebe9;hp=603e3d50fbfedef786632a8cba92b4ac83f58efa;hpb=5d4b10933b2fcbdcce7d19f299d87e55cc45640a;p=tools%2Finstall.git

diff --git a/config_files/SMESH.sh b/config_files/SMESH.sh
index 603e3d5..e34b7fc 100755
--- a/config_files/SMESH.sh
+++ b/config_files/SMESH.sh
@@ -12,7 +12,7 @@
 #
 ####################################################################################
 
-VERSION="3.2.6"
+VERSION="4.0.0"
 
 check_version(){
 if [ -n "${SMESH_ROOT_DIR}" ]; then
@@ -24,12 +24,9 @@ if [ -n "${SMESH_ROOT_DIR}" ]; then
 	fi
     fi
 elif [ -n "${SMESH_SRC_DIR}" ]; then
-    if [ -f ${SMESH_SRC_DIR}/configure.in.base ]; then
-	ver=`grep -E "^VERSION=" ${SMESH_SRC_DIR}/configure.in.base | awk -F= '{print $NF}' | tr -d '[:space:]' ` 
-	if [ "$ver" = "${VERSION}" ]; then
-	    return 0
-	fi
-    fi
+  check_salome_src_version SMESH_SRC_DIR $VERSION
+  if [ $? -eq 0 ] ; then return 0 ; fi
+  return 1
 fi
 return 1
 }
@@ -80,10 +77,8 @@ source ${INSTALL_WORK}/$SHRC
 
 check_jb tar xfz ${SOURCE_DIR}/SMESHsourcesV${VERSION}.tar.gz -C ${INSTALL_ROOT}
 
-if [ $PROCEDURE == "install_source" ]; then
 # to generate environment scripts
-    try_preinstalled
-fi
+try_preinstalled
 }
 
 install_source_and_build()
@@ -116,7 +111,7 @@ try_preinstalled
 
 install_binary()
 {
-make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
+make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
 source ${INSTALL_WORK}/$SHRC
 
 check_jb tar xfz ${SOURCE_DIR}/SMESHbinariesV${VERSION}.tar.gz -C ${INSTALL_ROOT}