Add gcc product to force using latest gcc (v4.4) on CentOS 5.5.

diff --git a/config_CentOS_5.5_64bit.xml b/config_CentOS_5.5_64bit.xml
index 97707ddda7f97dbdb4f55153322e05c4d9dc88bc..b58f63690f14be339af88a40aaea9b20853ae4fc 100755 (executable)
--- a/config_CentOS_5.5_64bit.xml
+++ b/config_CentOS_5.5_64bit.xml
@@ -373,6 +373,15 @@
                    installdiskspace="0,93200,0"
                    script="SIMAN.sh"/>
     </product>
+    <product name="gcc" 
+             type="prerequisite"
+            description="GNU C/C++ compiler">
+      <installation os="CentOS 5.5 64bit"
+                   version="" 
+                   disable="false"
+                   installdiskspace="0,0,0"
+                   script="gcc.sh"/>
+    </product>
     <product name="tcltk" 
              type="prerequisite"
             description="Tcl/Tk library">
@@ -467,10 +476,10 @@
             type="prerequisite"
             description="Library for supporting different graphical formats PNG, BMP, JPEG, TIFF and others">
       <installation os="CentOS 5.5 64bit"
-                    version="3.15.4" 
+                    version="3.16.0" 
                    disable="false"
                    installdiskspace="20110,25378,92558"
-                   script="freeimage_3.15.4.sh"/>
+                   script="freeimage.sh"/>
     </product>
     <product name="cmake"
             type="prerequisite"
@@ -700,6 +709,7 @@
   </products>
   <dependencies>
     <product name="KERNEL">
+      <dep>gcc</dep>
       <dep>boost</dep>
       <dep>Python</dep>
       <dep>numpy</dep>
@@ -714,6 +724,7 @@
       <dep>simanio</dep>
     </product>
     <product name="GUI">
+      <dep>gcc</dep>
       <dep>boost</dep>
       <dep>OpenCascade</dep>
       <dep>Python</dep>
@@ -731,6 +742,7 @@
       <dep>KERNEL</dep>
     </product>
     <product name="GEOM">
+      <dep>gcc</dep>
       <dep>boost</dep>
       <dep>OpenCascade</dep>
       <dep>Python</dep>
@@ -745,6 +757,7 @@
       <dep>GUI</dep>
     </product>
     <product name="MED">
+      <dep>gcc</dep>
       <dep>boost</dep>
       <dep>OpenCascade</dep>
       <dep>Python</dep>
@@ -762,6 +775,7 @@
       <dep>GUI</dep>
     </product>
     <product name="SMESH">
+      <dep>gcc</dep>
       <dep>cgnslib</dep>
       <dep>boost</dep>
       <dep>OpenCascade</dep>
@@ -780,6 +794,7 @@
       <dep>MED</dep>
     </product>
     <product name="HEXABLOCK">
+      <dep>gcc</dep>
       <dep>boost</dep>
       <dep>Python</dep>
       <dep>OmniORB</dep>
@@ -793,6 +808,7 @@
       <dep>GEOM</dep>
     </product>
     <product name="HOMARD">
+      <dep>gcc</dep>
       <dep>homard</dep>
       <dep>boost</dep>
       <dep>OpenCascade</dep>
@@ -811,6 +827,7 @@
       <dep>SMESH</dep>      
     </product>
     <product name="VISU">
+      <dep>gcc</dep>
       <dep>boost</dep>
       <dep>OpenCascade</dep>
       <dep>Python</dep>
@@ -828,6 +845,7 @@
       <dep>MED</dep>
     </product>
     <product name="PARAVIS">
+      <dep>gcc</dep>
       <dep>boost</dep>
       <dep>OpenCascade</dep>
       <dep>Python</dep>
@@ -845,6 +863,7 @@
       <dep>MED</dep>
     </product>
     <product name="HEXABLOCKPLUGIN">
+      <dep>gcc</dep>
       <dep>boost</dep>
       <dep>OmniORB</dep>
       <dep>OpenCascade</dep>
@@ -863,6 +882,7 @@
       <dep>HEXABLOCK</dep>
     </product>
     <product name="NETGENPLUGIN">
+      <dep>gcc</dep>
       <dep>boost</dep>
       <dep>OpenCascade</dep>
       <dep>Python</dep>
@@ -880,6 +900,7 @@
       <dep>SMESH</dep>
     </product>
     <product name="GHS3DPLUGIN">
+      <dep>gcc</dep>
       <dep>boost</dep>
       <dep>OpenCascade</dep>
       <dep>Python</dep>
@@ -895,6 +916,7 @@
       <dep>SMESH</dep>
     </product>
     <product name="GHS3DPRLPLUGIN">
+      <dep>gcc</dep>
       <dep>boost</dep>
       <dep>OpenCascade</dep>
       <dep>Python</dep>
@@ -912,6 +934,7 @@
       <dep>SMESH</dep>
     </product>
     <product name="BLSURFPLUGIN">
+      <dep>gcc</dep>
       <dep>boost</dep>
       <dep>OpenCascade</dep>
       <dep>Python</dep>
@@ -928,6 +951,7 @@
       <dep>SMESH</dep>
     </product>
     <product name="HexoticPLUGIN">
+      <dep>gcc</dep>
       <dep>boost</dep>
       <dep>OpenCascade</dep>
       <dep>Python</dep>
@@ -945,6 +969,7 @@
       <dep>BLSURFPLUGIN</dep>
     </product>
     <product name="COMPONENT">
+      <dep>gcc</dep>
       <dep>OpenCascade</dep>
       <dep>Python</dep>
       <dep>Swig</dep>
@@ -962,6 +987,7 @@
       <dep>MED</dep>
     </product>
     <product name="PYCALCULATOR">
+      <dep>gcc</dep>
       <dep>Python</dep>
       <dep>OmniORB</dep>
       <dep>Med</dep>
@@ -971,6 +997,7 @@
       <dep>MED</dep>
     </product>
     <product name="CALCULATOR">
+      <dep>gcc</dep>
       <dep>boost</dep>
       <dep>OpenCascade</dep>
       <dep>Python</dep>
@@ -984,6 +1011,7 @@
       <dep>MED</dep>
     </product>
     <product name="HELLO">
+      <dep>gcc</dep>
       <dep>boost</dep>
       <dep>OpenCascade</dep>
       <dep>Python</dep>
@@ -993,12 +1021,14 @@
       <dep>GUI</dep>
     </product>
     <product name="PYHELLO">
+      <dep>gcc</dep>
       <dep>Python</dep>
       <dep>OmniORB</dep>
       <dep>KERNEL</dep>
       <dep>GUI</dep>
     </product>
     <product name="LIGHT">
+      <dep>gcc</dep>
       <dep>OpenCascade</dep>
       <dep>Python</dep>
       <dep>Qt</dep>
@@ -1010,6 +1040,7 @@
       <dep>GUI</dep>
     </product>
     <product name="PYLIGHT">
+      <dep>gcc</dep>
       <dep>OpenCascade</dep>
       <dep>Python</dep>
       <dep>Qt</dep>
@@ -1021,6 +1052,7 @@
       <dep>GUI</dep>
     </product>
     <product name="RANDOMIZER">
+      <dep>gcc</dep>
       <dep>Python</dep>
       <dep>OmniORB</dep>
       <dep>Doxygen</dep>
@@ -1029,6 +1061,7 @@
       <dep>GUI</dep>
     </product>
     <product name="SIERPINSKY">
+      <dep>gcc</dep>
       <dep>boost</dep>
       <dep>OpenCascade</dep>
       <dep>Python</dep>
@@ -1046,6 +1079,7 @@
       <dep>RANDOMIZER</dep>
     </product>
     <product name="FILTER">
+      <dep>gcc</dep>
       <dep>boost</dep>
       <dep>OpenCascade</dep>
       <dep>Python</dep>
@@ -1063,6 +1097,7 @@
       <dep>MED</dep>
     </product>
     <product name="YACS">
+      <dep>gcc</dep>
       <dep>OpenCascade</dep>
       <dep>Python</dep>
       <dep>Swig</dep>
@@ -1075,42 +1110,67 @@
       <dep>KERNEL</dep>
       <dep>GUI</dep>
     </product>
+    <product name="tcltk">
+      <dep>gcc</dep>
+    </product>
     <product name="Python">
+      <dep>gcc</dep>
       <dep>tcltk</dep>
     </product>
+    <product name="Qt">
+      <dep>gcc</dep>
+    </product>
     <product name="Sip">
+      <dep>gcc</dep>
       <dep>Python</dep>
       <dep>Qt</dep>
     </product>
     <product name="PyQt">
+      <dep>gcc</dep>
       <dep>Python</dep>
       <dep>Qt</dep>
       <dep>Sip</dep>
     </product>
     <product name="QScintilla">
+      <dep>gcc</dep>
       <dep>Qt</dep>
       <dep>Python</dep>
       <dep>Sip</dep>
       <dep>PyQt</dep>
     </product>
     <product name="Sphinx">
+      <dep>gcc</dep>
       <dep>Python</dep>
     </product>
     <product name="boost">
+      <dep>gcc</dep>
       <dep>Python</dep>
     </product>
     <product name="Swig">
+      <dep>gcc</dep>
       <dep>Python</dep>
       <dep>tcltk</dep>
       <dep>boost</dep>
     </product>
+    <product name="freetype">
+      <dep>gcc</dep>
+    </product>
     <product name="ftgl">
+      <dep>gcc</dep>
       <dep>freetype</dep>
     </product>
+    <product name="freeimage">
+      <dep>gcc</dep>
+    </product>
+    <product name="cmake">
+      <dep>gcc</dep>
+    </product>
     <product name="gl2ps">
+      <dep>gcc</dep>
       <dep>cmake</dep>
     </product>
     <product name="OpenCascade">
+      <dep>gcc</dep>
       <dep>tbb</dep>
       <dep>gl2ps</dep>
       <dep>freeimage</dep>
@@ -1118,26 +1178,39 @@
       <dep>tcltk</dep>
     </product>
     <product name="PatchForOpenCascade">
+      <dep>gcc</dep>
       <dep>OpenCascade</dep>
     </product>
     <product name="Qwt">
+      <dep>gcc</dep>
       <dep>Qt</dep>
     </product>
     <product name="OmniORB">
+      <dep>gcc</dep>
       <dep>Python</dep>
     </product>
     <product name="Hdf5">
+      <dep>gcc</dep>
       <dep>cmake</dep>
     </product>
     <product name="Med">
+      <dep>gcc</dep>
       <dep>Hdf5</dep>
       <dep>Python</dep>
       <dep>cmake</dep>
     </product>
+    <product name="Metis">
+      <dep>gcc</dep>
+    </product>
+    <product name="Scotch">
+      <dep>gcc</dep>
+    </product>
     <product name="cgnslib">
+      <dep>gcc</dep>
       <dep>Hdf5</dep>
     </product>
     <product name="ParaView">
+      <dep>gcc</dep>
       <dep>Python</dep>
       <dep>tcltk</dep>
       <dep>Hdf5</dep>
@@ -1147,36 +1220,48 @@
       <dep>gl2ps</dep>
     </product>
     <product name="numpy">
+      <dep>gcc</dep>
       <dep>Python</dep>
     </product>
+    <product name="expat">
+      <dep>gcc</dep>
+    </product>
     <product name="Graphviz">
+      <dep>gcc</dep>
       <dep>Python</dep>
       <dep>tcltk</dep>
       <dep>Swig</dep>
       <dep>expat</dep>
     </product>
     <product name="Doxygen">
+      <dep>gcc</dep>
       <dep>Graphviz</dep>
     </product>
     <product name="docutils">
+      <dep>gcc</dep>
       <dep>Python</dep>
     </product>
     <product name="libxml2">
+      <dep>gcc</dep>
       <dep>Python</dep>
     </product>    
     <product name="netgen">
+      <dep>gcc</dep>
       <dep>tcltk</dep>
       <dep>OpenCascade</dep>
     </product>
     <product name="libBatch">
+      <dep>gcc</dep>
       <dep>Python</dep>
       <dep>Swig</dep>
       <dep>cmake</dep>
     </product>
     <product name="YACSGEN">
+      <dep>gcc</dep>
       <dep>Python</dep>
     </product>
     <product name="JOBMANAGER">
+      <dep>gcc</dep>
       <dep>Qt</dep>
       <dep>OmniORB</dep>
       <dep>Sphinx</dep>
@@ -1184,6 +1269,7 @@
       <dep>GUI</dep>
     </product>
     <product name="xdata">
+      <dep>gcc</dep>
       <dep>Python</dep>
       <dep>Qt</dep>
       <dep>PyQt</dep>
@@ -1195,10 +1281,12 @@
       <dep>GEOM</dep>
     </product>
     <product name="HXX2SALOME">
+      <dep>gcc</dep>
       <dep>Qt</dep>
       <dep>HXX2SALOMEDOC</dep>
     </product>
     <product name="ATOMGEN">
+      <dep>gcc</dep>
       <dep>Python</dep>
       <dep>Qt</dep>
       <dep>PyQt</dep>
@@ -1207,6 +1295,7 @@
       <dep>GUI</dep>
     </product>
     <product name="ATOMSOLV">
+      <dep>gcc</dep>
       <dep>Python</dep>
       <dep>Qt</dep>
       <dep>OmniORB</dep>
@@ -1217,6 +1306,7 @@
       <dep>ATOMGEN</dep>
     </product>
     <product name="ATOMIC">
+      <dep>gcc</dep>
       <dep>Python</dep>
       <dep>Qt</dep>
       <dep>OmniORB</dep>
@@ -1228,7 +1318,11 @@
       <dep>KERNEL</dep>
       <dep>GUI</dep>
     </product>
+    <product name="wso2">
+      <dep>gcc</dep>
+    </product>
     <product name="simanio">
+      <dep>gcc</dep>
       <dep>wso2</dep>
     </product>
   </dependencies>

diff --git a/config_files/common.sh b/config_files/common.sh
index e3492f753885a2e0f4a1f1c524465ec04d23fcfd..73d43a78615b436d27f3e498d6e36ba4c54cb070 100755 (executable)
--- a/config_files/common.sh
+++ b/config_files/common.sh
@@ -718,7 +718,7 @@ use_latest_gcc(){
            fi
        done
        if [ "${gcc_found}" != "" ] ; then
-           echo "CC=${gcc_found} CXX=${gxx_found}"
+           echo "CC=${gcc_found} CXX=${gxx_found} LD=${gxx_found}"
        fi
     fi
 }

diff --git a/config_files/gcc.sh b/config_files/gcc.sh
new file mode 100755 (executable)
index 0000000..e118734
--- /dev/null
+++ b/config_files/gcc.sh
@@ -0,0 +1,83 @@
+#!/bin/bash -noprofile
+
+####################################################################################
+#  File      : gcc.sh
+#  Created   : Thu May 22 13:42:04 2014
+#  Author    : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com)
+#  Project   : SALOME
+#  Module    : Installation Wizard
+#  Copyright : 2002-2014 CEA
+#
+#  This script is the part of the SALOME installation procedure.
+#
+####################################################################################
+
+check_version()
+{
+return 0
+}
+
+print_env_bin()
+{
+echo "print_env_bin()"
+gcc_found="`use_latest_gcc 040200`"
+if [ "${gcc_found}" != "" ] ; then
+cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+#${DELIM} ${PRODUCT_TYPE} ${DELIM}
+`echo ${gcc_found} | tr " " "\n" | sed -e "s%\(.*\)=%export \1=%g"`
+##
+EOF
+fi
+(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()
+{
+echo "print_env_src()"
+return
+}
+
+# looks for the native product and collects it's environment (used by make_env())
+try_native()
+{
+    echo "try_native()"
+make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}"
+return 0
+}
+
+install_source()
+{
+    echo "install_source()"
+try_existing ${PRODUCT_DIR} ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}                                                                                                                         
+}
+
+install_source_and_build()
+{
+install_source
+}
+
+install_binary()
+{
+    echo "install_binary()"
+try_existing ${PRODUCT_DIR} ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}                                                                                                                         
+}
+
+try_preinstalled()
+{
+    echo "try_preinstalled()"
+try_existing ${PRODUCT_DIR} ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}                                                                                                                         
+}
+
+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;
+export PRODUCT="gcc"
+export PRODUCT_DIR=${INST_ROOT}/${PRODUCT}
+export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
+source ./common.sh
+${PROCEDURE}