From 7f2e1b988002ab272471aabb17e7fa4a5feccbc6 Mon Sep 17 00:00:00 2001
From: inv <inv@opencascade.com>
Date: Wed, 4 Apr 2012 07:20:10 +0000
Subject: [PATCH] SALOME 6.5.0 preparation: libBatch 1.4.0 -> 1.5.0

---
 config_CentOS_5.5_64bit.xml                    |  4 ++--
 config_Debian_4.0.xml                          |  4 ++--
 config_Debian_4.0_64bit.xml                    |  4 ++--
 config_Debian_5.0_64bit.xml                    |  4 ++--
 config_Debian_6.0_64bit.xml                    |  4 ++--
 config_Mandriva_2008.0.xml                     |  4 ++--
 config_Mandriva_2008.0_64bit.xml               |  4 ++--
 config_Mandriva_2010.0.xml                     |  4 ++--
 config_Mandriva_2010.0_64bit.xml               |  4 ++--
 config_Red_Hat_Enterprise_WS_4_64bit.xml       |  4 ++--
 config_Scientific_SL_5.1_64bit.xml             |  4 ++--
 .../{libBatch-1.4.0.sh => libBatch.sh}         | 18 +++++++-----------
 12 files changed, 29 insertions(+), 33 deletions(-)
 rename config_files/{libBatch-1.4.0.sh => libBatch.sh} (91%)

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.sh
similarity index 91%
rename from config_files/libBatch-1.4.0.sh
rename to config_files/libBatch.sh
index af1d033..4d41477 100755
--- a/config_files/libBatch-1.4.0.sh
+++ b/config_files/libBatch.sh
@@ -1,18 +1,18 @@
 #!/bin/bash -noprofile
 
 ####################################################################################
-#  File      : libBatch-1.4.0.sh
+#  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-2008 CEA
+#  Copyright : 2002-2012 CEA
 #
 #  This script is the part of the SALOME installation procedure.
 #
 ####################################################################################
 
-LIBBATCH_VERSION=1.4.0
+LIBBATCH_VERSION=1.5.0
 
 check_version(){
 # No way to check version!
@@ -24,7 +24,6 @@ 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}
 ##
@@ -55,7 +54,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}/${PRODUCT}.tar.gz -C ${INST_ROOT}
+check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${INST_ROOT}
 
 # to generate environment scripts
 try_preinstalled
@@ -104,8 +103,6 @@ check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${PRODUCT_DIR}
 try_preinstalled
 }
 
-source ./common.sh
-
 export PROCEDURE=$1;
 export INSTALL_WORK=$2;
 export SOURCE_DIR=$3;
@@ -113,13 +110,12 @@ 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
+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
-- 
2.39.2