X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=config_files%2FHXX2SALOME.sh;h=e840cd3c0511e7b3353df98f95112358a41948cc;hb=7bacfa2f11b13a9c0e38c3b0e17bf6bb311bc9ae;hp=c0ba72969d4327f4a83b99810cf763025ceff845;hpb=715fbfdda61819dd865d2040a9b4f9fb93d8e4b5;p=tools%2Finstall.git

diff --git a/config_files/HXX2SALOME.sh b/config_files/HXX2SALOME.sh
index c0ba729..e840cd3 100755
--- a/config_files/HXX2SALOME.sh
+++ b/config_files/HXX2SALOME.sh
@@ -1,11 +1,25 @@
-#!/bin/sh
+#!/bin/bash -noprofile
+
+####################################################################################
+#  File      : HXX2SALOME.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(){
 # No way to check version!
 return 0
 }
 
-print_env(){
+print_env_bin(){
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export HXX2SALOME_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT}/bin
@@ -13,39 +27,47 @@ export PATH=\${HXX2SALOME_ROOT_DIR}:\${PATH}
 ##
 EOF
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
-make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
+make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}"
 }
 
-# looks for the native product and collects it's environment (used by make_env())
-try_native(){
-HXX2SALOME_ROOT_DIR="`find_in_path hxx2salome ${PATH}`"
-if [ -n "${adir}" ] ; then
-    cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
-#$DELIM ${PRODUCT_TYPE} $DELIM
-export HXX2SALOME_ROOT_DIR=${HXX2SALOME_ROOT_DIR}
-export PATH=\${HXX2SALOME_ROOT_DIR}:\${PATH}
+print_env_src()
+{
+cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh <<EOF
+#$DELIM ${PRODUCT_TYPE}_src $DELIM
+# nothing to do
 ##
 EOF
-    make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
-    return 0
-fi
-return 1;
+(test -w ${PRODUCT_SRC_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh ${PRODUCT_SRC_DIR})
+make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}"
 }
 
 try_preinstalled(){
-try_existing ${PRODUCT_DIR} ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
+try_existing ${PRODUCT_DIR} ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
+try_existing ${PRODUCT_SRC_DIR} ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src
 return $?
 }
 
 install_source()
 {
-make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
+make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src
 source ${INSTALL_WORK}/$SHRC
+# unpack
+check_jb tar xfz ${SOURCE_DIR}/HXX2SALOMEsourcesV${VERSION}.tar.gz -C ${INSTALL_ROOT}
 
-makedir ${PRODUCT_DIR}
+if [ $PROCEDURE == "install_source" ]; then
+# to generate environment scripts
+    try_preinstalled
+fi
+}
+
+install_source_and_build()
+{
+# install sources
+install_source
 
-check_jb tar xfz ${SOURCE_DIR}/HXX2SALOMEsourcesV3.2.2.tar.gz -C ${INSTALL_WORK}
-cd ${PRODUCT_WORK}
+# build sources
+makedir ${PRODUCT_DIR}
+cd ${PRODUCT_SRC_DIR}
 cat >> ${PRODUCT_DIR}/CONFIGURE.LOG <<EOF
 -------------------
 Build configure...
@@ -67,20 +89,27 @@ check_job ${PRODUCT_DIR}/MAKE.LOG make
 
 check_job ${PRODUCT_DIR}/MAKEINSTALL.LOG make install
 
-#du -sk ${PRODUCT_WORK} > ${PRODUCT_DIR}/size.log
-cd ${PRODUCT_DIR}; rm -fr ${PRODUCT_WORK}
+#du -sk ${PRODUCT_SRC_DIR} > ${PRODUCT_DIR}/size.log
+cd ${PRODUCT_DIR};
+
+# remove sources and temporary files after building
+if [ ${REMOVE_SRC_TMP} == "TRUE" ] ; then
+    test -d ${PRODUCT_SRC_DIR} && rm -fr ${PRODUCT_SRC_DIR}
+fi
 
-print_env
+# to generate environment scripts
+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}/HXX2SALOMEbinariesV3.2.2.tar.gz -C ${INSTALL_ROOT}
+check_jb tar xfz ${SOURCE_DIR}/HXX2SALOMEbinariesV${VERSION}.tar.gz -C ${INSTALL_ROOT}
 
-print_env
+# to generate environment scripts
+try_preinstalled
 }
 
 export PROCEDURE=$1;
@@ -88,9 +117,12 @@ 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="HXX2SALOME" ; fi
-export PRODUCT="HXX2SALOME_3.2.2"
+export PRODUCT_TYPE=$6;
+export INSTALL_PRODUCTS=$7;
+shift
+REMOVE_SRC_TMP=$8;
+export PRODUCT="HXX2SALOME_${VERSION}"
 export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT}
-export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
+export PRODUCT_SRC_DIR=${INSTALL_ROOT}/"HXX2SALOME_SRC_${VERSION}"
 source ./common.sh
 $PROCEDURE