From: inv <inv@opencascade.com>
Date: Mon, 2 Apr 2012 13:03:06 +0000 (+0000)
Subject: SALOME 6.5.0 preparation: cgnslib 3.1.3 -> 3.1.3-4
X-Git-Tag: V6_5_0b1~61
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=4f4c78f3e9381328623980ae3aaa919a5c9c3dd0;p=tools%2Finstall.git

SALOME 6.5.0 preparation: cgnslib 3.1.3 -> 3.1.3-4
---

diff --git a/config_CentOS_5.5_64bit.xml b/config_CentOS_5.5_64bit.xml
index 7c9d512..ecfc5e6 100755
--- a/config_CentOS_5.5_64bit.xml
+++ b/config_CentOS_5.5_64bit.xml
@@ -531,10 +531,10 @@
 	     type="prerequisite"
 	     description="Provides a standard for recording and recovering computer data associated with the numerical solution of the equations of fluid dynamics.">
       <installation os="CentOS 5.5 64bit"
-                    version="3.1.3" 
+                    version="3.1.3-4" 
 		    disable="false"
 		    installdiskspace="11524,11468,45860"
-		    script="cgnslib-3.1.3.sh"/>
+		    script="cgnslib.sh"/>
     </product>
     <product name="Med"
 	     type="prerequisite"
diff --git a/config_Debian_4.0.xml b/config_Debian_4.0.xml
index 45f5c82..1b926d5 100755
--- a/config_Debian_4.0.xml
+++ b/config_Debian_4.0.xml
@@ -531,10 +531,10 @@
 	     type="prerequisite"
 	     description="Provides a standard for recording and recovering computer data associated with the numerical solution of the equations of fluid dynamics.">
       <installation os="Debian 4.0"
-                    version="3.1.3" 
+                    version="3.1.3-4" 
 		    disable="false"
 		    installdiskspace="11524,11468,45860"
-		    script="cgnslib-3.1.3.sh"/>
+		    script="cgnslib.sh"/>
     </product>
     <product name="Med"
 	     type="prerequisite"
diff --git a/config_Debian_4.0_64bit.xml b/config_Debian_4.0_64bit.xml
index d24503a..340c333 100755
--- a/config_Debian_4.0_64bit.xml
+++ b/config_Debian_4.0_64bit.xml
@@ -531,10 +531,10 @@
 	     type="prerequisite"
 	     description="Provides a standard for recording and recovering computer data associated with the numerical solution of the equations of fluid dynamics.">
       <installation os="Debian 4.0 64bit"
-                    version="3.1.3" 
+                    version="3.1.3-4" 
 		    disable="false"
 		    installdiskspace="11524,11468,45860"
-		    script="cgnslib-3.1.3.sh"/>
+		    script="cgnslib.sh"/>
     </product>
     <product name="Med"
 	     type="prerequisite"
diff --git a/config_Debian_5.0_64bit.xml b/config_Debian_5.0_64bit.xml
index 9beb4ea..b99dba8 100755
--- a/config_Debian_5.0_64bit.xml
+++ b/config_Debian_5.0_64bit.xml
@@ -531,10 +531,10 @@
 	     type="prerequisite"
 	     description="Provides a standard for recording and recovering computer data associated with the numerical solution of the equations of fluid dynamics.">
       <installation os="Debian 5.0 64bit"
-                    version="3.1.3" 
+                    version="3.1.3-4" 
 		    disable="false"
 		    installdiskspace="11524,11468,45860"
-		    script="cgnslib-3.1.3.sh"/>
+		    script="cgnslib.sh"/>
     </product>
     <product name="Med"
 	     type="prerequisite"
diff --git a/config_Debian_6.0_64bit.xml b/config_Debian_6.0_64bit.xml
index 84f9a2e..2dde834 100755
--- a/config_Debian_6.0_64bit.xml
+++ b/config_Debian_6.0_64bit.xml
@@ -531,10 +531,10 @@
 	     type="prerequisite"
 	     description="Provides a standard for recording and recovering computer data associated with the numerical solution of the equations of fluid dynamics.">
       <installation os="Debian 6.0 64bit"
-                    version="3.1.3" 
+                    version="3.1.3-4" 
 		    disable="false"
 		    installdiskspace="11524,11468,45860"
-		    script="cgnslib-3.1.3.sh"/>
+		    script="cgnslib.sh"/>
     </product>
     <product name="Med"
 	     type="prerequisite"
diff --git a/config_Mandriva_2008.0.xml b/config_Mandriva_2008.0.xml
index baec070..580e9b1 100755
--- a/config_Mandriva_2008.0.xml
+++ b/config_Mandriva_2008.0.xml
@@ -531,10 +531,10 @@
 	     type="prerequisite"
 	     description="Provides a standard for recording and recovering computer data associated with the numerical solution of the equations of fluid dynamics.">
       <installation os="Mandriva 2008.0"
-                    version="3.1.3" 
+                    version="3.1.3-4" 
 		    disable="false"
 		    installdiskspace="11524,11468,45860"
-		    script="cgnslib-3.1.3.sh"/>
+		    script="cgnslib.sh"/>
     </product>
     <product name="Med"
 	     type="prerequisite"
diff --git a/config_Mandriva_2008.0_64bit.xml b/config_Mandriva_2008.0_64bit.xml
index b465c7d..f8a663e 100755
--- a/config_Mandriva_2008.0_64bit.xml
+++ b/config_Mandriva_2008.0_64bit.xml
@@ -531,10 +531,10 @@
 	     type="prerequisite"
 	     description="Provides a standard for recording and recovering computer data associated with the numerical solution of the equations of fluid dynamics.">
       <installation os="Mandriva 2008.0 64bit"
-                    version="3.1.3" 
+                    version="3.1.3-4" 
 		    disable="false"
 		    installdiskspace="11524,11468,45860"
-		    script="cgnslib-3.1.3.sh"/>
+		    script="cgnslib.sh"/>
     </product>
     <product name="Med"
 	     type="prerequisite"
diff --git a/config_Mandriva_2010.0.xml b/config_Mandriva_2010.0.xml
index cf6b67d..81a830e 100755
--- a/config_Mandriva_2010.0.xml
+++ b/config_Mandriva_2010.0.xml
@@ -531,10 +531,10 @@
 	     type="prerequisite"
 	     description="Provides a standard for recording and recovering computer data associated with the numerical solution of the equations of fluid dynamics.">
       <installation os="Mandriva 2010.0"
-                    version="3.1.3" 
+                    version="3.1.3-4" 
 		    disable="false"
 		    installdiskspace="11524,11468,45860"
-		    script="cgnslib-3.1.3.sh"/>
+		    script="cgnslib.sh"/>
     </product>
     <product name="Med"
 	     type="prerequisite"
diff --git a/config_Mandriva_2010.0_64bit.xml b/config_Mandriva_2010.0_64bit.xml
index 47a05d2..0fe944d 100755
--- a/config_Mandriva_2010.0_64bit.xml
+++ b/config_Mandriva_2010.0_64bit.xml
@@ -531,10 +531,10 @@
 	     type="prerequisite"
 	     description="Provides a standard for recording and recovering computer data associated with the numerical solution of the equations of fluid dynamics.">
       <installation os="Mandriva 2010.0 64bit"
-                    version="3.1.3" 
+                    version="3.1.3-4" 
 		    disable="false"
 		    installdiskspace="11524,11468,45860"
-		    script="cgnslib-3.1.3.sh"/>
+		    script="cgnslib.sh"/>
     </product>
     <product name="Med"
 	     type="prerequisite"
diff --git a/config_Red_Hat_Enterprise_WS_4_64bit.xml b/config_Red_Hat_Enterprise_WS_4_64bit.xml
index be9173a..7f20f4b 100755
--- a/config_Red_Hat_Enterprise_WS_4_64bit.xml
+++ b/config_Red_Hat_Enterprise_WS_4_64bit.xml
@@ -531,10 +531,10 @@
 	     type="prerequisite"
 	     description="Provides a standard for recording and recovering computer data associated with the numerical solution of the equations of fluid dynamics.">
       <installation os="Red Hat Enterprise WS 4 64bit"
-                    version="3.1.3" 
+                    version="3.1.3-4" 
 		    disable="false"
 		    installdiskspace="11524,11468,45860"
-		    script="cgnslib-3.1.3.sh"/>
+		    script="cgnslib.sh"/>
     </product>
     <product name="Med"
 	     type="prerequisite"
diff --git a/config_Scientific_SL_5.1_64bit.xml b/config_Scientific_SL_5.1_64bit.xml
index e63c317..6a33736 100755
--- a/config_Scientific_SL_5.1_64bit.xml
+++ b/config_Scientific_SL_5.1_64bit.xml
@@ -531,10 +531,10 @@
 	     type="prerequisite"
 	     description="Provides a standard for recording and recovering computer data associated with the numerical solution of the equations of fluid dynamics.">
       <installation os="Scientific SL 5.1 64bit"
-                    version="3.1.3" 
+                    version="3.1.3-4" 
 		    disable="false"
 		    installdiskspace="11524,11468,45860"
-		    script="cgnslib-3.1.3.sh"/>
+		    script="cgnslib.sh"/>
     </product>
     <product name="Med"
 	     type="prerequisite"
diff --git a/config_files/cgnslib-3.1.3.sh b/config_files/cgnslib-3.1.3.sh
deleted file mode 100755
index 58b6738..0000000
--- a/config_files/cgnslib-3.1.3.sh
+++ /dev/null
@@ -1,148 +0,0 @@
-#!/bin/bash -noprofile
-
-####################################################################################
-#  File      : cgnslib-3.1.3.sh
-#  Created   : Thu Oct 10 12:01:00 2011
-#  Author    : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com)
-#  Project   : SALOME
-#  Module    : Installation Wizard
-#  Copyright : 2002-2011 CEA
-#
-#  This script is the part of the SALOME installation procedure.
-#
-####################################################################################
-
-#
-# Paraview version and lib version
-#
-CGNSVERSION=3.1.3
-
-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 CGNSHOME=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
-export PATH=\${CGNSHOME}/bin:\${PATH}
-export LD_LIBRARY_PATH=\${CGNSHOME}/lib:\${LD_LIBRARY_PATH}
-##
-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
-test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
-
-export PRODUCT_BUILD_DIR=${PRODUCT_DIR}_build
-mkdir ${PRODUCT_BUILD_DIR}
-cd ${PRODUCT_BUILD_DIR}
-    
-CMAKE_OPTIONS=""
-
-### common settings
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_INSTALL_PREFIX:STRING=${PRODUCT_DIR}"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_BUILD_TYPE:STRING=Release"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DBUILD_SHARED_LIBS:BOOL=ON"
-
-### HDF5 settings
-if [ "${HDF5HOME}" != "" ]; then
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DENABLE_HDF5:BOOL=ON"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DHDF5_INCLUDE_PATH:PATH=${HDF5HOME}/include"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DHDF5_LIBRARY:FILEPATH=${HDF5HOME}/lib/libhdf5.so"
-fi
-
-cat > ${PRODUCT_DIR}/CONFIGURE.LOG <<EOF
-cmake  : `which cmake`
-
-used settings:
-$CMAKE_OPTIONS
-EOF
-check_job ${PRODUCT_DIR}/CONFIGURE.LOG cmake ${PRODUCT_SRC_DIR} $CMAKE_OPTIONS
-cat > ${PRODUCT_DIR}/MAKE.LOG <<EOF
-used gcc=$GCC
-EOF
-check_job ${PRODUCT_DIR}/MAKE.LOG make -j4
-check_job ${PRODUCT_DIR}/MAKEINSTALL.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}
-    test -d ${PRODUCT_BUILD_DIR} && rm -fr ${PRODUCT_BUILD_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 product directory
-test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
-
-check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${PRODUCT_DIR}
-
-cd ${PRODUCT_DIR}
-
-# to generate environment script for sources
-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="cgnslib-${CGNSVERSION}"
-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 
diff --git a/config_files/cgnslib.sh b/config_files/cgnslib.sh
new file mode 100755
index 0000000..6f7aa5d
--- /dev/null
+++ b/config_files/cgnslib.sh
@@ -0,0 +1,148 @@
+#!/bin/bash -noprofile
+
+####################################################################################
+#  File      : cgnslib.sh
+#  Created   : Thu Oct 10 12:01:00 2011
+#  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.
+#
+####################################################################################
+
+#
+# cgns library version
+#
+CGNSVERSION=3.1.3
+
+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 CGNSHOME=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
+export PATH=\${CGNSHOME}/bin:\${PATH}
+export LD_LIBRARY_PATH=\${CGNSHOME}/lib:\${LD_LIBRARY_PATH}
+##
+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
+test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
+
+export PRODUCT_BUILD_DIR=${PRODUCT_DIR}_build
+mkdir ${PRODUCT_BUILD_DIR}
+cd ${PRODUCT_BUILD_DIR}
+    
+CMAKE_OPTIONS=""
+
+### common settings
+CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_INSTALL_PREFIX:STRING=${PRODUCT_DIR}"
+CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_BUILD_TYPE:STRING=Release"
+CMAKE_OPTIONS=$CMAKE_OPTIONS" -DBUILD_SHARED_LIBS:BOOL=ON"
+
+### HDF5 settings
+if [ "${HDF5HOME}" != "" ]; then
+CMAKE_OPTIONS=$CMAKE_OPTIONS" -DENABLE_HDF5:BOOL=ON"
+CMAKE_OPTIONS=$CMAKE_OPTIONS" -DHDF5_INCLUDE_PATH:PATH=${HDF5HOME}/include"
+CMAKE_OPTIONS=$CMAKE_OPTIONS" -DHDF5_LIBRARY:FILEPATH=${HDF5HOME}/lib/libhdf5.so"
+fi
+
+cat > ${PRODUCT_DIR}/CONFIGURE.LOG <<EOF
+cmake  : `which cmake`
+
+used settings:
+$CMAKE_OPTIONS
+EOF
+check_job ${PRODUCT_DIR}/CONFIGURE.LOG cmake ${PRODUCT_SRC_DIR} $CMAKE_OPTIONS
+cat > ${PRODUCT_DIR}/MAKE.LOG <<EOF
+used gcc=$GCC
+EOF
+check_job ${PRODUCT_DIR}/MAKE.LOG make -j4
+check_job ${PRODUCT_DIR}/MAKEINSTALL.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}
+    test -d ${PRODUCT_BUILD_DIR} && rm -fr ${PRODUCT_BUILD_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 product directory
+test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
+
+check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${PRODUCT_DIR}
+
+cd ${PRODUCT_DIR}
+
+# to generate environment script for sources
+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="cgnslib-${CGNSVERSION}"
+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