From 77096b8baa73a8245eedef728e7d9d6cf7e2132f Mon Sep 17 00:00:00 2001
From: inv <inv@opencascade.com>
Date: Wed, 4 Apr 2012 07:46:55 +0000
Subject: [PATCH] SALOME 6.5.0 preparation: update script for numpy (1.5.1)

---
 config_CentOS_5.5_64bit.xml               |  2 +-
 config_Debian_4.0.xml                     |  2 +-
 config_Debian_4.0_64bit.xml               |  2 +-
 config_Debian_5.0_64bit.xml               |  2 +-
 config_Debian_6.0_64bit.xml               |  2 +-
 config_Mandriva_2008.0.xml                |  2 +-
 config_Mandriva_2008.0_64bit.xml          |  2 +-
 config_Mandriva_2010.0.xml                |  2 +-
 config_Mandriva_2010.0_64bit.xml          |  2 +-
 config_Red_Hat_Enterprise_WS_4_64bit.xml  |  2 +-
 config_Scientific_SL_5.1_64bit.xml        |  2 +-
 config_files/{numpy-1.5.1.sh => numpy.sh} | 38 ++++++++++++-----------
 12 files changed, 31 insertions(+), 29 deletions(-)
 rename config_files/{numpy-1.5.1.sh => numpy.sh} (78%)

diff --git a/config_CentOS_5.5_64bit.xml b/config_CentOS_5.5_64bit.xml
index ecf8468..7595872 100755
--- a/config_CentOS_5.5_64bit.xml
+++ b/config_CentOS_5.5_64bit.xml
@@ -579,7 +579,7 @@
                     version="1.5.1" 
 		    disable="false"
 		    installdiskspace="22100,51768,143392"
-		    script="numpy-1.5.1.sh"/>
+		    script="numpy.sh"/>
     </product>
     <product name="libBatch" 
 	     type="prerequisite"
diff --git a/config_Debian_4.0.xml b/config_Debian_4.0.xml
index e1dc1ba..634c727 100755
--- a/config_Debian_4.0.xml
+++ b/config_Debian_4.0.xml
@@ -579,7 +579,7 @@
                     version="1.5.1" 
 		    disable="false"
 		    installdiskspace="22100,51768,143392"
-		    script="numpy-1.5.1.sh"/>
+		    script="numpy.sh"/>
     </product>
     <product name="libBatch" 
 	     type="prerequisite"
diff --git a/config_Debian_4.0_64bit.xml b/config_Debian_4.0_64bit.xml
index 491a5a7..55665ca 100755
--- a/config_Debian_4.0_64bit.xml
+++ b/config_Debian_4.0_64bit.xml
@@ -579,7 +579,7 @@
                     version="1.5.1" 
 		    disable="false"
 		    installdiskspace="22100,51768,143392"
-		    script="numpy-1.5.1.sh"/>
+		    script="numpy.sh"/>
     </product>
     <product name="libBatch" 
 	     type="prerequisite"
diff --git a/config_Debian_5.0_64bit.xml b/config_Debian_5.0_64bit.xml
index ee7c7bb..d7feb84 100755
--- a/config_Debian_5.0_64bit.xml
+++ b/config_Debian_5.0_64bit.xml
@@ -579,7 +579,7 @@
                     version="1.5.1" 
 		    disable="false"
 		    installdiskspace="22100,51768,143392"
-		    script="numpy-1.5.1.sh"/>
+		    script="numpy.sh"/>
     </product>
     <product name="libBatch" 
 	     type="prerequisite"
diff --git a/config_Debian_6.0_64bit.xml b/config_Debian_6.0_64bit.xml
index 50063d6..e8c2baf 100755
--- a/config_Debian_6.0_64bit.xml
+++ b/config_Debian_6.0_64bit.xml
@@ -579,7 +579,7 @@
                     version="1.5.1" 
 		    disable="false"
 		    installdiskspace="22100,51768,143392"
-		    script="numpy-1.5.1.sh"/>
+		    script="numpy.sh"/>
     </product>
     <product name="libBatch" 
 	     type="prerequisite"
diff --git a/config_Mandriva_2008.0.xml b/config_Mandriva_2008.0.xml
index 1593fd7..d9b2956 100755
--- a/config_Mandriva_2008.0.xml
+++ b/config_Mandriva_2008.0.xml
@@ -579,7 +579,7 @@
                     version="1.5.1" 
 		    disable="false"
 		    installdiskspace="22100,51768,143392"
-		    script="numpy-1.5.1.sh"/>
+		    script="numpy.sh"/>
     </product>
     <product name="libBatch" 
 	     type="prerequisite"
diff --git a/config_Mandriva_2008.0_64bit.xml b/config_Mandriva_2008.0_64bit.xml
index 09ea5ad..d534d99 100755
--- a/config_Mandriva_2008.0_64bit.xml
+++ b/config_Mandriva_2008.0_64bit.xml
@@ -579,7 +579,7 @@
                     version="1.5.1" 
 		    disable="false"
 		    installdiskspace="22100,51768,143392"
-		    script="numpy-1.5.1.sh"/>
+		    script="numpy.sh"/>
     </product>
     <product name="libBatch" 
 	     type="prerequisite"
diff --git a/config_Mandriva_2010.0.xml b/config_Mandriva_2010.0.xml
index 4ac6cb2..377c0a3 100755
--- a/config_Mandriva_2010.0.xml
+++ b/config_Mandriva_2010.0.xml
@@ -579,7 +579,7 @@
                     version="1.5.1" 
 		    disable="false"
 		    installdiskspace="22100,51768,143392"
-		    script="numpy-1.5.1.sh"/>
+		    script="numpy.sh"/>
     </product>
     <product name="libBatch" 
 	     type="prerequisite"
diff --git a/config_Mandriva_2010.0_64bit.xml b/config_Mandriva_2010.0_64bit.xml
index f351ec2..1df2e32 100755
--- a/config_Mandriva_2010.0_64bit.xml
+++ b/config_Mandriva_2010.0_64bit.xml
@@ -579,7 +579,7 @@
                     version="1.5.1" 
 		    disable="false"
 		    installdiskspace="22100,51768,143392"
-		    script="numpy-1.5.1.sh"/>
+		    script="numpy.sh"/>
     </product>
     <product name="libBatch" 
 	     type="prerequisite"
diff --git a/config_Red_Hat_Enterprise_WS_4_64bit.xml b/config_Red_Hat_Enterprise_WS_4_64bit.xml
index f578eb2..1494ee3 100755
--- a/config_Red_Hat_Enterprise_WS_4_64bit.xml
+++ b/config_Red_Hat_Enterprise_WS_4_64bit.xml
@@ -579,7 +579,7 @@
                     version="1.5.1" 
 		    disable="false"
 		    installdiskspace="22100,51768,143392"
-		    script="numpy-1.5.1.sh"/>
+		    script="numpy.sh"/>
     </product>
     <product name="libBatch" 
 	     type="prerequisite"
diff --git a/config_Scientific_SL_5.1_64bit.xml b/config_Scientific_SL_5.1_64bit.xml
index feb27ff..b5de161 100755
--- a/config_Scientific_SL_5.1_64bit.xml
+++ b/config_Scientific_SL_5.1_64bit.xml
@@ -579,7 +579,7 @@
                     version="1.5.1" 
 		    disable="false"
 		    installdiskspace="22100,51768,143392"
-		    script="numpy-1.5.1.sh"/>
+		    script="numpy.sh"/>
     </product>
     <product name="libBatch" 
 	     type="prerequisite"
diff --git a/config_files/numpy-1.5.1.sh b/config_files/numpy.sh
similarity index 78%
rename from config_files/numpy-1.5.1.sh
rename to config_files/numpy.sh
index 049226b..847cf21 100755
--- a/config_files/numpy-1.5.1.sh
+++ b/config_files/numpy.sh
@@ -1,17 +1,23 @@
 #!/bin/bash -noprofile
 
 ####################################################################################
-#  File      : numpy-1.5.1.sh
+#  File      : numpy.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.
 #
 ####################################################################################
 
+#
+# numpy and lapack versions
+#
+NUMPY_VERSION=1.5.1
+LAPACK_VERSION=3.3
+
 check_version(){
 # It is not necessary to check version!
 return 0
@@ -52,15 +58,10 @@ make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}
 source ${INSTALL_WORK}/$SHRC
 
 makedir ${PRODUCT_SRC_DIR}
-# unpack
 
-export LAPACKSUFF="3.3"
-
-export LD_LIBRARY_PATH=${PRODUCT_SRC_DIR}/lapack-${LAPACKSUFF}_SRC/lib:${LD_LIBRARY_PATH}
-
-check_jb tar xfz ${SOURCE_DIR}/lapack-${LAPACKSUFF}.tar.gz -C ${PRODUCT_SRC_DIR}
-
-check_jb tar xfz ${SOURCE_DIR}/numpy-1.5.1.tar.gz -C ${PRODUCT_SRC_DIR}
+# unpack
+check_jb tar xfz ${SOURCE_DIR}/lapack-${LAPACK_VERSION}.tar.gz -C ${PRODUCT_SRC_DIR}
+check_jb tar xfz ${SOURCE_DIR}/numpy-${NUMPY_VERSION}.tar.gz -C ${PRODUCT_SRC_DIR}
 
 # to generate environment scripts
 try_preinstalled
@@ -74,26 +75,27 @@ install_source
 # build sources
 test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
 
-# lapck cmake options
+export LD_LIBRARY_PATH=${PRODUCT_SRC_DIR}/lapack-${LAPACK_VERSION}_SRC/lib:${LD_LIBRARY_PATH}
 
-CMAKE_OPTIONS="-DCMAKE_CXX_FLAGS=-fPIC -DCMAKE_C_FLAGS=-fPIC -DCMAKE_INSTALL_PREFIX:STRING=${PRODUCT_SRC_DIR}/lapack-${LAPACKSUFF}_SRC -DBUILD_SHARED_LIBS:BOOL=ON"
+# lapack cmake options
+CMAKE_OPTIONS="-DCMAKE_CXX_FLAGS=-fPIC -DCMAKE_C_FLAGS=-fPIC -DCMAKE_INSTALL_PREFIX:STRING=${PRODUCT_SRC_DIR}/lapack-${LAPACK_VERSION}_SRC -DBUILD_SHARED_LIBS:BOOL=ON"
 
 # install
 GCC=`which gcc`
 cat >> ${PRODUCT_DIR}/MAKE.LOG <<EOF
 used gcc=$GCC
 EOF
-cd ${PRODUCT_SRC_DIR}/lapack-${LAPACKSUFF}_SRC
+cd ${PRODUCT_SRC_DIR}/lapack-${LAPACK_VERSION}_SRC
 check_job ${PRODUCT_DIR}/CONFIGURE.LOG cmake . ${CMAKE_OPTIONS}
 check_job ${PRODUCT_DIR}/MAKE.LOG make
 check_job ${PRODUCT_DIR}/INSTALL.LOG make install
-cd ${PRODUCT_SRC_DIR}/lapack-${LAPACKSUFF}_SRC/TESTING/MATGEN ; cp -rf *.so ${PRODUCT_SRC_DIR}/lapack-${LAPACKSUFF}_SRC/lib
-cd ${PRODUCT_SRC_DIR}/numpy-1.5.1_SRC ; check_job ${PRODUCT_DIR}/MAKE.LOG python setup.py install --prefix=${PRODUCT_DIR}
+cd ${PRODUCT_SRC_DIR}/lapack-${LAPACK_VERSION}_SRC/TESTING/MATGEN ; cp -rf *.so ${PRODUCT_SRC_DIR}/lapack-${LAPACK_VERSION}_SRC/lib
+cd ${PRODUCT_SRC_DIR}/numpy-${NUMPY_VERSION}_SRC ; check_job ${PRODUCT_DIR}/MAKE.LOG python setup.py install --prefix=${PRODUCT_DIR}
 
-cd ${PRODUCT_SRC_DIR}/lapack-${LAPACKSUFF}_SRC/lib
+cd ${PRODUCT_SRC_DIR}/lapack-${LAPACK_VERSION}_SRC/lib
 list=`ls *.so`
 for aLib in $list; do
-cp -rf ${aLib} ${PRODUCT_DIR}/lib
+    cp -rf ${aLib} ${PRODUCT_DIR}/lib
 done
 
 cd ${PRODUCT_DIR}
@@ -131,7 +133,7 @@ export INSTALL_PRODUCTS=$7;
 shift
 REMOVE_SRC_TMP=$8;
 test $# == 10 && shift && SINGLE_DIR=$9
-export PRODUCT="numpy-1.5.1"
+export PRODUCT="numpy-${NUMPY_VERSION}"
 export PRODUCT_DIR=${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
 export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
 export PRODUCT_SRC_DIR=${INST_ROOT}/${PRODUCT}_SRC
-- 
2.39.2