From: inv <inv@opencascade.com>
Date: Fri, 30 Mar 2012 14:54:32 +0000 (+0000)
Subject: SALOME 6.5.0 preparation: cmake 2.8.4 -> 2.8.7
X-Git-Tag: V6_5_0b1~70
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=e46031a520ebab2c65550e2eb12eed7a094f08e5;p=tools%2Finstall.git

SALOME 6.5.0 preparation: cmake 2.8.4 -> 2.8.7
---

diff --git a/config_CentOS_5.5_64bit.xml b/config_CentOS_5.5_64bit.xml
index 68ff431..fe29039 100755
--- a/config_CentOS_5.5_64bit.xml
+++ b/config_CentOS_5.5_64bit.xml
@@ -468,10 +468,10 @@
 	     type="prerequisite"
 	     description="The cross-platform, open-source make system">
       <installation os="CentOS 5.5 64bit"
-                    version="2.8.4" 
+                    version="2.8.7" 
 		    disable="false"
 		    installdiskspace="34168,23512,158888"
-		    script="cmake-2.8.4.sh"/>
+		    script="cmake.sh"/>
     </product>
     <product name="gl2ps"
 	     type="prerequisite"
diff --git a/config_Debian_4.0.xml b/config_Debian_4.0.xml
index 81764e3..069bab3 100755
--- a/config_Debian_4.0.xml
+++ b/config_Debian_4.0.xml
@@ -468,10 +468,10 @@
 	     type="prerequisite"
 	     description="The cross-platform, open-source make system">
       <installation os="Debian 4.0"
-                    version="2.8.4" 
+                    version="2.8.7" 
 		    disable="false"
 		    installdiskspace="34168,23512,158888"
-		    script="cmake-2.8.4.sh"/>
+		    script="cmake.sh"/>
     </product>
     <product name="gl2ps"
 	     type="prerequisite"
diff --git a/config_Debian_4.0_64bit.xml b/config_Debian_4.0_64bit.xml
index cb7ae03..5961e09 100755
--- a/config_Debian_4.0_64bit.xml
+++ b/config_Debian_4.0_64bit.xml
@@ -468,10 +468,10 @@
 	     type="prerequisite"
 	     description="The cross-platform, open-source make system">
       <installation os="Debian 4.0 64bit"
-                    version="2.8.4" 
+                    version="2.8.7" 
 		    disable="false"
 		    installdiskspace="34168,23512,158888"
-		    script="cmake-2.8.4.sh"/>
+		    script="cmake.sh"/>
     </product>
     <product name="gl2ps"
 	     type="prerequisite"
diff --git a/config_Debian_5.0_64bit.xml b/config_Debian_5.0_64bit.xml
index e891149..93979dd 100755
--- a/config_Debian_5.0_64bit.xml
+++ b/config_Debian_5.0_64bit.xml
@@ -468,10 +468,10 @@
 	     type="prerequisite"
 	     description="The cross-platform, open-source make system">
       <installation os="Debian 5.0 64bit"
-                    version="2.8.4" 
+                    version="2.8.7" 
 		    disable="false"
 		    installdiskspace="34168,23512,158888"
-		    script="cmake-2.8.4.sh"/>
+		    script="cmake.sh"/>
     </product>
     <product name="gl2ps"
 	     type="prerequisite"
diff --git a/config_Debian_6.0_64bit.xml b/config_Debian_6.0_64bit.xml
index eac4461..9f6c1aa 100755
--- a/config_Debian_6.0_64bit.xml
+++ b/config_Debian_6.0_64bit.xml
@@ -468,10 +468,10 @@
 	     type="prerequisite"
 	     description="The cross-platform, open-source make system">
       <installation os="Debian 6.0 64bit"
-                    version="2.8.4" 
+                    version="2.8.7" 
 		    disable="false"
 		    installdiskspace="34168,23512,158888"
-		    script="cmake-2.8.4.sh"/>
+		    script="cmake.sh"/>
     </product>
     <product name="gl2ps"
 	     type="prerequisite"
diff --git a/config_Mandriva_2008.0.xml b/config_Mandriva_2008.0.xml
index cff5942..6acb39e 100755
--- a/config_Mandriva_2008.0.xml
+++ b/config_Mandriva_2008.0.xml
@@ -468,10 +468,10 @@
 	     type="prerequisite"
 	     description="The cross-platform, open-source make system">
       <installation os="Mandriva 2008.0"
-                    version="2.8.4" 
+                    version="2.8.7" 
 		    disable="false"
 		    installdiskspace="34168,23512,158888"
-		    script="cmake-2.8.4.sh"/>
+		    script="cmake.sh"/>
     </product>
     <product name="gl2ps"
 	     type="prerequisite"
diff --git a/config_Mandriva_2008.0_64bit.xml b/config_Mandriva_2008.0_64bit.xml
index 46e4741..962ea8c 100755
--- a/config_Mandriva_2008.0_64bit.xml
+++ b/config_Mandriva_2008.0_64bit.xml
@@ -468,10 +468,10 @@
 	     type="prerequisite"
 	     description="The cross-platform, open-source make system">
       <installation os="Mandriva 2008.0 64bit"
-                    version="2.8.4" 
+                    version="2.8.7" 
 		    disable="false"
 		    installdiskspace="34168,23512,158888"
-		    script="cmake-2.8.4.sh"/>
+		    script="cmake.sh"/>
     </product>
     <product name="gl2ps"
 	     type="prerequisite"
diff --git a/config_Mandriva_2010.0.xml b/config_Mandriva_2010.0.xml
index e80392a..01c96c1 100755
--- a/config_Mandriva_2010.0.xml
+++ b/config_Mandriva_2010.0.xml
@@ -468,10 +468,10 @@
 	     type="prerequisite"
 	     description="The cross-platform, open-source make system">
       <installation os="Mandriva 2010.0"
-                    version="2.8.4" 
+                    version="2.8.7" 
 		    disable="false"
 		    installdiskspace="34168,23512,158888"
-		    script="cmake-2.8.4.sh"/>
+		    script="cmake.sh"/>
     </product>
     <product name="gl2ps"
 	     type="prerequisite"
diff --git a/config_Mandriva_2010.0_64bit.xml b/config_Mandriva_2010.0_64bit.xml
index 389c260..eaf82dc 100755
--- a/config_Mandriva_2010.0_64bit.xml
+++ b/config_Mandriva_2010.0_64bit.xml
@@ -468,10 +468,10 @@
 	     type="prerequisite"
 	     description="The cross-platform, open-source make system">
       <installation os="Mandriva 2010.0 64bit"
-                    version="2.8.4" 
+                    version="2.8.7" 
 		    disable="false"
 		    installdiskspace="34168,23512,158888"
-		    script="cmake-2.8.4.sh"/>
+		    script="cmake.sh"/>
     </product>
     <product name="gl2ps"
 	     type="prerequisite"
diff --git a/config_Red_Hat_Enterprise_WS_4_64bit.xml b/config_Red_Hat_Enterprise_WS_4_64bit.xml
index 0db4b4c..0df401f 100755
--- a/config_Red_Hat_Enterprise_WS_4_64bit.xml
+++ b/config_Red_Hat_Enterprise_WS_4_64bit.xml
@@ -468,10 +468,10 @@
 	     type="prerequisite"
 	     description="The cross-platform, open-source make system">
       <installation os="Red Hat Enterprise WS 4 64bit"
-                    version="2.8.4" 
+                    version="2.8.7" 
 		    disable="false"
 		    installdiskspace="34168,23512,158888"
-		    script="cmake-2.8.4.sh"/>
+		    script="cmake.sh"/>
     </product>
     <product name="gl2ps"
 	     type="prerequisite"
diff --git a/config_Scientific_SL_5.1_64bit.xml b/config_Scientific_SL_5.1_64bit.xml
index 84b0c2e..da121d5 100755
--- a/config_Scientific_SL_5.1_64bit.xml
+++ b/config_Scientific_SL_5.1_64bit.xml
@@ -468,10 +468,10 @@
 	     type="prerequisite"
 	     description="The cross-platform, open-source make system">
       <installation os="Scientific SL 5.1 64bit"
-                    version="2.8.4" 
+                    version="2.8.7" 
 		    disable="false"
 		    installdiskspace="34168,23512,158888"
-		    script="cmake-2.8.4.sh"/>
+		    script="cmake.sh"/>
     </product>
     <product name="gl2ps"
 	     type="prerequisite"
diff --git a/config_files/cmake-2.8.4.sh b/config_files/cmake-2.8.4.sh
deleted file mode 100755
index 3b9e164..0000000
--- a/config_files/cmake-2.8.4.sh
+++ /dev/null
@@ -1,125 +0,0 @@
-#!/bin/bash -noprofile
-
-####################################################################################
-#  File      : cmake-2.8.4.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.
-#
-####################################################################################
-
-CMAKE_VERSION=2.8.4
-
-check_version()
-{
-# It is not necessary to check version!
-return 0
-}
-
-print_env_bin()
-{
-cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
-#$DELIM ${PRODUCT_TYPE} $DELIM
-export CMAKEHOME=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
-export PATH=\${CMAKEHOME}/bin:\${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}
-
-cd ${PRODUCT_SRC_DIR}
-
-chmod +w ./configure
-#INV - bug in a cmake configure 
-cp configure configure.orig && sed "s/relid'/relid/" configure.orig > configure
-chmod 755 ./configure
-
-check_job ${PRODUCT_DIR}/CONFIGURE.LOG ./configure --prefix=${PRODUCT_DIR}
-cat >> ${PRODUCT_DIR}/MAKE.LOG <<EOF
-used gcc=$GCC
-EOF
-check_job ${PRODUCT_DIR}/MAKE.LOG make
-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}
-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}
-
-# 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="cmake-${CMAKE_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 
diff --git a/config_files/cmake.sh b/config_files/cmake.sh
new file mode 100755
index 0000000..84a7b9f
--- /dev/null
+++ b/config_files/cmake.sh
@@ -0,0 +1,120 @@
+#!/bin/bash -noprofile
+
+####################################################################################
+#  File      : cmake.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.
+#
+####################################################################################
+
+CMAKE_VERSION=2.8.7
+
+check_version()
+{
+# It is not necessary to check version!
+return 0
+}
+
+print_env_bin()
+{
+cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+#$DELIM ${PRODUCT_TYPE} $DELIM
+export CMAKEHOME=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
+export PATH=\${CMAKEHOME}/bin:\${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}
+
+cd ${PRODUCT_SRC_DIR}
+
+check_job ${PRODUCT_DIR}/CONFIGURE.LOG ./configure --prefix=${PRODUCT_DIR}
+cat >> ${PRODUCT_DIR}/MAKE.LOG <<EOF
+used gcc=$GCC
+EOF
+check_job ${PRODUCT_DIR}/MAKE.LOG make
+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}
+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}
+
+# 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="cmake-${CMAKE_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