From: inv <inv@opencascade.com>
Date: Wed, 4 Apr 2012 07:20:10 +0000 (+0000)
Subject: SALOME 6.5.0 preparation: libBatch 1.4.0 -> 1.5.0
X-Git-Tag: V6_5_0b1~40
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=7f2e1b988002ab272471aabb17e7fa4a5feccbc6;p=tools%2Finstall.git

SALOME 6.5.0 preparation: libBatch 1.4.0 -> 1.5.0
---

diff --git a/config_CentOS_5.5_64bit.xml b/config_CentOS_5.5_64bit.xml
index 6db969b..36626e8 100755
--- a/config_CentOS_5.5_64bit.xml
+++ b/config_CentOS_5.5_64bit.xml
@@ -585,10 +585,10 @@
 	     type="prerequisite"
              description="Generic batch management library">
       <installation os="CentOS 5.5 64bit"
-                    version="1.4.0" 
+                    version="1.5.0" 
 		    disable="false"
 		    installdiskspace="1552,1148,7192"
-		    script="libBatch-1.4.0.sh"/>
+		    script="libBatch.sh"/>
     </product>
     <product name="expat"
 	     type="prerequisite"
diff --git a/config_Debian_4.0.xml b/config_Debian_4.0.xml
index b5359d7..f51ac0e 100755
--- a/config_Debian_4.0.xml
+++ b/config_Debian_4.0.xml
@@ -585,10 +585,10 @@
 	     type="prerequisite"
              description="Generic batch management library">
       <installation os="Debian 4.0"
-                    version="1.4.0" 
+                    version="1.5.0" 
 		    disable="false"
 		    installdiskspace="1552,1148,7192"
-		    script="libBatch-1.4.0.sh"/>
+		    script="libBatch.sh"/>
     </product>
     <product name="expat"
 	     type="prerequisite"
diff --git a/config_Debian_4.0_64bit.xml b/config_Debian_4.0_64bit.xml
index 5d2f6fe..d728cc3 100755
--- a/config_Debian_4.0_64bit.xml
+++ b/config_Debian_4.0_64bit.xml
@@ -585,10 +585,10 @@
 	     type="prerequisite"
              description="Generic batch management library">
       <installation os="Debian 4.0 64bit"
-                    version="1.4.0" 
+                    version="1.5.0" 
 		    disable="false"
 		    installdiskspace="1552,1148,7192"
-		    script="libBatch-1.4.0.sh"/>
+		    script="libBatch.sh"/>
     </product>
     <product name="expat"
 	     type="prerequisite"
diff --git a/config_Debian_5.0_64bit.xml b/config_Debian_5.0_64bit.xml
index 9a3b7df..ac49a92 100755
--- a/config_Debian_5.0_64bit.xml
+++ b/config_Debian_5.0_64bit.xml
@@ -585,10 +585,10 @@
 	     type="prerequisite"
              description="Generic batch management library">
       <installation os="Debian 5.0 64bit"
-                    version="1.4.0" 
+                    version="1.5.0" 
 		    disable="false"
 		    installdiskspace="1552,1148,7192"
-		    script="libBatch-1.4.0.sh"/>
+		    script="libBatch.sh"/>
     </product>
     <product name="expat"
 	     type="prerequisite"
diff --git a/config_Debian_6.0_64bit.xml b/config_Debian_6.0_64bit.xml
index 0d4ecb1..1999675 100755
--- a/config_Debian_6.0_64bit.xml
+++ b/config_Debian_6.0_64bit.xml
@@ -585,10 +585,10 @@
 	     type="prerequisite"
              description="Generic batch management library">
       <installation os="Debian 6.0 64bit"
-                    version="1.4.0" 
+                    version="1.5.0" 
 		    disable="false"
 		    installdiskspace="1552,1148,7192"
-		    script="libBatch-1.4.0.sh"/>
+		    script="libBatch.sh"/>
     </product>
     <product name="expat"
 	     type="prerequisite"
diff --git a/config_Mandriva_2008.0.xml b/config_Mandriva_2008.0.xml
index 5eb8ff0..81702fc 100755
--- a/config_Mandriva_2008.0.xml
+++ b/config_Mandriva_2008.0.xml
@@ -585,10 +585,10 @@
 	     type="prerequisite"
              description="Generic batch management library">
       <installation os="Mandriva 2008.0"
-                    version="1.4.0" 
+                    version="1.5.0" 
 		    disable="false"
 		    installdiskspace="1552,1148,7192"
-		    script="libBatch-1.4.0.sh"/>
+		    script="libBatch.sh"/>
     </product>
     <product name="expat"
 	     type="prerequisite"
diff --git a/config_Mandriva_2008.0_64bit.xml b/config_Mandriva_2008.0_64bit.xml
index cedd5e4..dc65fc4 100755
--- a/config_Mandriva_2008.0_64bit.xml
+++ b/config_Mandriva_2008.0_64bit.xml
@@ -585,10 +585,10 @@
 	     type="prerequisite"
              description="Generic batch management library">
       <installation os="Mandriva 2008.0 64bit"
-                    version="1.4.0" 
+                    version="1.5.0" 
 		    disable="false"
 		    installdiskspace="1552,1148,7192"
-		    script="libBatch-1.4.0.sh"/>
+		    script="libBatch.sh"/>
     </product>
     <product name="expat"
 	     type="prerequisite"
diff --git a/config_Mandriva_2010.0.xml b/config_Mandriva_2010.0.xml
index 044adff..4000527 100755
--- a/config_Mandriva_2010.0.xml
+++ b/config_Mandriva_2010.0.xml
@@ -585,10 +585,10 @@
 	     type="prerequisite"
              description="Generic batch management library">
       <installation os="Mandriva 2010.0"
-                    version="1.4.0" 
+                    version="1.5.0" 
 		    disable="false"
 		    installdiskspace="1552,1148,7192"
-		    script="libBatch-1.4.0.sh"/>
+		    script="libBatch.sh"/>
     </product>
     <product name="expat"
 	     type="prerequisite"
diff --git a/config_Mandriva_2010.0_64bit.xml b/config_Mandriva_2010.0_64bit.xml
index 4d5f4e8..795fc26 100755
--- a/config_Mandriva_2010.0_64bit.xml
+++ b/config_Mandriva_2010.0_64bit.xml
@@ -585,10 +585,10 @@
 	     type="prerequisite"
              description="Generic batch management library">
       <installation os="Mandriva 2010.0 64bit"
-                    version="1.4.0" 
+                    version="1.5.0" 
 		    disable="false"
 		    installdiskspace="1552,1148,7192"
-		    script="libBatch-1.4.0.sh"/>
+		    script="libBatch.sh"/>
     </product>
     <product name="expat"
 	     type="prerequisite"
diff --git a/config_Red_Hat_Enterprise_WS_4_64bit.xml b/config_Red_Hat_Enterprise_WS_4_64bit.xml
index e24c01c..ba884ba 100755
--- a/config_Red_Hat_Enterprise_WS_4_64bit.xml
+++ b/config_Red_Hat_Enterprise_WS_4_64bit.xml
@@ -585,10 +585,10 @@
 	     type="prerequisite"
              description="Generic batch management library">
       <installation os="Red Hat Enterprise WS 4 64bit"
-                    version="1.4.0" 
+                    version="1.5.0" 
 		    disable="false"
 		    installdiskspace="1552,1148,7192"
-		    script="libBatch-1.4.0.sh"/>
+		    script="libBatch.sh"/>
     </product>
     <product name="expat"
 	     type="prerequisite"
diff --git a/config_Scientific_SL_5.1_64bit.xml b/config_Scientific_SL_5.1_64bit.xml
index 2089205..0e7f149 100755
--- a/config_Scientific_SL_5.1_64bit.xml
+++ b/config_Scientific_SL_5.1_64bit.xml
@@ -585,10 +585,10 @@
 	     type="prerequisite"
              description="Generic batch management library">
       <installation os="Scientific SL 5.1 64bit"
-                    version="1.4.0" 
+                    version="1.5.0" 
 		    disable="false"
 		    installdiskspace="1552,1148,7192"
-		    script="libBatch-1.4.0.sh"/>
+		    script="libBatch.sh"/>
     </product>
     <product name="expat"
 	     type="prerequisite"
diff --git a/config_files/libBatch-1.4.0.sh b/config_files/libBatch-1.4.0.sh
deleted file mode 100755
index af1d033..0000000
--- a/config_files/libBatch-1.4.0.sh
+++ /dev/null
@@ -1,125 +0,0 @@
-#!/bin/bash -noprofile
-
-####################################################################################
-#  File      : libBatch-1.4.0.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-2008 CEA
-#
-#  This script is the part of the SALOME installation procedure.
-#
-####################################################################################
-
-LIBBATCH_VERSION=1.4.0
-
-check_version(){
-# No way to check version!
-return 0
-}
-
-print_env_bin()
-{
-cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
-#$DELIM ${PRODUCT_TYPE} $DELIM 
-export LIBBATCH_ROOT_DIR=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
-export PYTHON_VERSION=\`python -c "import sys; print sys.version[:3]"\`
-export LD_LIBRARY_PATH=\${LIBBATCH_ROOT_DIR}/lib:\${LD_LIBRARY_PATH}
-export PYTHONPATH=\${LIBBATCH_ROOT_DIR}/lib/python\${PYTHON_VERSION}/site-packages:\${PYTHONPATH}
-##
-EOF
-(test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
-make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}"
-}
-
-print_env_src()
-{
-cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh <<EOF
-#$DELIM ${PRODUCT_TYPE}_src $DELIM
-# nothing to do
-##
-EOF
-(test -w ${PRODUCT_SRC_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh ${PRODUCT_SRC_DIR})
-make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}"
-}
-
-try_preinstalled(){
-try_existing ${PRODUCT_DIR} ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
-try_existing ${PRODUCT_SRC_DIR} ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src
-return $?
-}
-
-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}/${PRODUCT}.tar.gz -C ${INST_ROOT}
-
-# to generate environment scripts
-try_preinstalled
-}
-
-install_source_and_build()
-{
-# install sources
-install_source
-
-# build sources
-
-cd ${PRODUCT_SRC_DIR}
-test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
-
-check_job ${PRODUCT_DIR}/CONFIGURE.LOG cmake -DCMAKE_INSTALL_PREFIX=${PRODUCT_DIR} 
-GCC=`which gcc`
-cat >> ${PRODUCT_DIR}/MAKE.LOG <<EOF
-used gcc=$GCC
-EOF
-check_job ${PRODUCT_DIR}/MAKE.LOG make
-check_job ${PRODUCT_DIR}/INSTALL.LOG make install
-
-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
-
-# to generate environment scripts
-try_preinstalled
-}
-
-install_binary()
-{
-make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
-source ${INSTALL_WORK}/$SHRC
-
-# create a module directory
-test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
-
-check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${PRODUCT_DIR}
-
-# to generate environment scripts
-try_preinstalled
-}
-
-source ./common.sh
-
-export PROCEDURE=$1;
-export INSTALL_WORK=$2;
-export SOURCE_DIR=$3;
-export INST_ROOT=$4;
-export PRODUCT_SEQUENCE=$5;
-export PRODUCT_TYPE=$6;
-export INSTALL_PRODUCTS=$7;
-SRC_DIR=$8;
-shift
-REMOVE_SRC_TMP=$8;
-shift
-SINGLE_DIR=$9;
-if [ -n "$SINGLE_DIR" ] ; then SINGLE_DIR=$SDIR_NAME; fi
-export PRODUCT="libBatch-${LIBBATCH_VERSION}"
-export PRODUCT_DIR=${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
-export PRODUCT_SRC_DIR=${INST_ROOT}/${PRODUCT}_SRC
-$PROCEDURE
diff --git a/config_files/libBatch.sh b/config_files/libBatch.sh
new file mode 100755
index 0000000..4d41477
--- /dev/null
+++ b/config_files/libBatch.sh
@@ -0,0 +1,121 @@
+#!/bin/bash -noprofile
+
+####################################################################################
+#  File      : libBatch.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-2012 CEA
+#
+#  This script is the part of the SALOME installation procedure.
+#
+####################################################################################
+
+LIBBATCH_VERSION=1.5.0
+
+check_version(){
+# No way to check version!
+return 0
+}
+
+print_env_bin()
+{
+cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+#$DELIM ${PRODUCT_TYPE} $DELIM 
+export LIBBATCH_ROOT_DIR=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
+export LD_LIBRARY_PATH=\${LIBBATCH_ROOT_DIR}/lib:\${LD_LIBRARY_PATH}
+export PYTHONPATH=\${LIBBATCH_ROOT_DIR}/lib/python\${PYTHON_VERSION}/site-packages:\${PYTHONPATH}
+##
+EOF
+(test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
+make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}"
+}
+
+print_env_src()
+{
+cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh <<EOF
+#$DELIM ${PRODUCT_TYPE}_src $DELIM
+# nothing to do
+##
+EOF
+(test -w ${PRODUCT_SRC_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh ${PRODUCT_SRC_DIR})
+make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}"
+}
+
+try_preinstalled(){
+try_existing ${PRODUCT_DIR} ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
+try_existing ${PRODUCT_SRC_DIR} ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src
+return $?
+}
+
+install_source()
+{
+make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src
+source ${INSTALL_WORK}/$SHRC
+
+check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${INST_ROOT}
+
+# to generate environment scripts
+try_preinstalled
+}
+
+install_source_and_build()
+{
+# install sources
+install_source
+
+# build sources
+
+cd ${PRODUCT_SRC_DIR}
+test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
+
+check_job ${PRODUCT_DIR}/CONFIGURE.LOG cmake -DCMAKE_INSTALL_PREFIX=${PRODUCT_DIR} 
+GCC=`which gcc`
+cat >> ${PRODUCT_DIR}/MAKE.LOG <<EOF
+used gcc=$GCC
+EOF
+check_job ${PRODUCT_DIR}/MAKE.LOG make
+check_job ${PRODUCT_DIR}/INSTALL.LOG make install
+
+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
+
+# to generate environment scripts
+try_preinstalled
+}
+
+install_binary()
+{
+make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
+source ${INSTALL_WORK}/$SHRC
+
+# create a module directory
+test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
+
+check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${PRODUCT_DIR}
+
+# to generate environment scripts
+try_preinstalled
+}
+
+export PROCEDURE=$1;
+export INSTALL_WORK=$2;
+export SOURCE_DIR=$3;
+export INST_ROOT=$4;
+export PRODUCT_SEQUENCE=$5;
+export PRODUCT_TYPE=$6;
+export INSTALL_PRODUCTS=$7;
+shift
+REMOVE_SRC_TMP=$8;
+test $# == 10 && shift && SINGLE_DIR=$9
+export PRODUCT="libBatch-${LIBBATCH_VERSION}"
+export PRODUCT_DIR=${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
+export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
+export PRODUCT_SRC_DIR=${INST_ROOT}/${PRODUCT}_SRC
+source ./common.sh
+$PROCEDURE