SALOME 6.5.0 preparation: homard 10.3 -> 10.4

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

diff --git a/config_files/SAMPLES.sh b/config_files/SAMPLES.sh
index 8c031ee1653ca20b989b53e5caee3eec1bbd7467..fc238bd0ca1ac3a3b35a7c52f841cd505e6f2ff9 100755 (executable)
--- a/config_files/SAMPLES.sh
+++ b/config_files/SAMPLES.sh
@@ -6,14 +6,12 @@
 #  Author    : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com)
 #  Project   : SALOME
 #  Module    : Installation Wizard
-#  Copyright : 2002-2007 CEA
+#  Copyright : 2002-2008 CEA
 #
 #  This script is the part of the SALOME installation procedure.
 #
 ####################################################################################
 
-VERSION="5.0.0"
-
 check_version(){
 # There is no possibility to check version number
 return 0
@@ -43,7 +41,7 @@ install_source()
 make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src
 source ${INSTALL_WORK}/$SHRC
 
-check_jb tar xfz ${SRC_DIR}/SAMPLESsourcesV${VERSION}.tar.gz -C ${INST_ROOT}
+check_jb tar xfz ${SRC_DIR}/SAMPLESsourcesV${SALOME_VERSION}.tar.gz -C ${INST_ROOT}
 
 # to generate environment scripts
 try_preinstalled
@@ -59,6 +57,8 @@ install_binary()
 install_source
 }
 
+source ./common.sh
+
 export PROCEDURE=$1;
 export INSTALL_WORK=$2;
 export SOURCE_DIR=$3;
@@ -70,9 +70,7 @@ SRC_DIR=$8;
 shift
 shift
 SINGLE_DIR=$9;
-export PRODUCT="SAMPLES_${VERSION}"
-export PRODUCT_SRC="SAMPLES_SRC_${VERSION}"
-export PRODUCT_DIR=${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
+export PRODUCT="SAMPLES_${SALOME_VERSION}"
+export PRODUCT_SRC="SAMPLES_SRC_${SALOME_VERSION}"
 export PRODUCT_SRC_DIR=${INST_ROOT}/${PRODUCT_SRC}
-source ./common.sh
 $PROCEDURE