X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=config_files%2FCALCULATOR_SRC.sh;h=a4de58fa899da33a56abbd86128eb7d4324321cf;hb=eaf31aa384f20241a93e726b0baeb34aa1091e35;hp=6ef219a435e0091bea792035a0dc1d8b673ecce4;hpb=32d2fa76852104794187a7ba6f6bf62b3e87ac1b;p=tools%2Finstall.git

diff --git a/config_files/CALCULATOR_SRC.sh b/config_files/CALCULATOR_SRC.sh
index 6ef219a..a4de58f 100755
--- a/config_files/CALCULATOR_SRC.sh
+++ b/config_files/CALCULATOR_SRC.sh
@@ -1,11 +1,24 @@
-#!/bin/sh
+#!/bin/bash -noprofile
+
+####################################################################################
+#  File      : CALCULATOR_SRC.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.6"
 
 check_version(){
 if [ -n "${CALCULATOR_SRC_DIR}" ]; then
-    check_lib_version VERSION ${CALCULATOR_SRC_DIR}/bin
-    if [ "$?" -eq "0" ]; then
-	ver=`cat ${CALCULATOR_SRC_DIR}/bin/VERSION | awk -F: '{print $2}' | tr -d '[:space:]' ` 
-	if [ "$ver" = "3.2.0b1" ]; then
+    if [ -f ${CALCULATOR_SRC_DIR}/configure.in.base ]; then
+	ver=`grep -E "^VERSION=" ${CALCULATOR_SRC_DIR}/configure.in.base | awk -F= '{print $NF}' | tr -d '[:space:]' ` 
+	if [ "$ver" = "${VERSION}" ]; then
 	    return 0
 	fi
     fi
@@ -19,6 +32,7 @@ cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF
 export CALCULATOR_SRC_DIR=\${INSTALL_ROOT}/${PRODUCT}
 ##
 EOF
+
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
 make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
 }
@@ -48,11 +62,33 @@ install_source()
 make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
 source ${INSTALL_WORK}/$SHRC
 
-check_jb tar xfz ${SOURCE_DIR}/CALCULATORsourcesV3.2.0b1.tar.gz -C ${INSTALL_ROOT}
+check_jb tar xfz ${SOURCE_DIR}/CALCULATORsourcesV${VERSION}.tar.gz -C ${INSTALL_ROOT}
 
 print_env
 }
 
+install_source_and_build()
+{
+# install sources
+install_source
+
+# build sources
+prod_bin=`echo $PRODUCT_TYPE | sed "s%src%bin%g"`
+mkdir -p ${INSTALL_ROOT}/CALCULATOR_${VERSION}
+
+if [ -e ./build.sh ] ; then
+    cp -f ./build.sh ${INSTALL_ROOT}
+fi
+
+CUR_DIR=`pwd`
+cd ${INSTALL_ROOT}
+check_jb build.sh -o -b -d -v 0 -p $INSTALL_ROOT CALCULATOR
+
+# create environment for the built binaries
+cd $CUR_DIR
+./CALCULATOR_BIN.sh print_env $INSTALL_WORK $SOURCE_DIR $INSTALL_ROOT $PRODUCT_SEQUENCE $prod_bin
+}
+
 install_binary()
 {
 return 1
@@ -63,8 +99,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="CalculatorSrc" ; fi
-export PRODUCT="CALCULATOR_SRC_3.2.0b1"
+if [ $# == 6 ] ; then export PRODUCT_TYPE=$6 ; else export PRODUCT_TYPE="CALCULATORsrc" ; fi
+export PRODUCT="CALCULATOR_SRC_${VERSION}"
 export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT}
 export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
 source ./common.sh