Fix bug 0020454: [CEA] Unacessary buggy test of gcc in the InstalWizard

diff --git a/bin/SALOME_InstallWizard b/bin/SALOME_InstallWizard
index f37e5fb5c9a77ced818ba80c77c53d85e9eff878..ff629f4e2faaf7e5fc91fa600e027072e433f511 100755 (executable)
Binary files a/bin/SALOME_InstallWizard and b/bin/SALOME_InstallWizard differ

diff --git a/config_files/BOOST-1.34.1.sh b/config_files/BOOST-1.34.1.sh
index c586a0efca8123b0d01a197c8b398210514b6dfa..a1f26e8ffbbd121d86f76345f5dead2a1d0ec99f 100755 (executable)
--- a/config_files/BOOST-1.34.1.sh
+++ b/config_files/BOOST-1.34.1.sh
@@ -121,10 +121,12 @@ rm -rf boost-1_34_1
 # create additional links for libraries
 cd ${PRODUCT_DIR}/lib
 
-gcc_root="`where_gcc $GCC_VERSION`"
-gcc_root=`cd ${gcc_root}/..; pwd`
-maj_ver=`${gcc_root}/bin/gcc -dumpversion | awk -F[.-] '{if(NF>0) print $1; else print 0}'`
-min_ver=`${gcc_root}/bin/gcc -dumpversion | awk -F[.-] '{if(NF>1) print $2; else print 0}'`
+#gcc_root="`where_gcc $GCC_VERSION`"
+#gcc_root=`cd ${gcc_root}/..; pwd`
+#maj_ver=`${gcc_root}/bin/gcc -dumpversion | awk -F[.-] '{if(NF>0) print $1; else print 0}'`
+#min_ver=`${gcc_root}/bin/gcc -dumpversion | awk -F[.-] '{if(NF>1) print $2; else print 0}'`
+maj_ver=`gcc -dumpversion | awk -F[.-] '{if(NF>0) print $1; else print 0}'`
+min_ver=`gcc -dumpversion | awk -F[.-] '{if(NF>1) print $2; else print 0}'`
 gcc_ver=$maj_ver$min_ver
 
 for aLib in date_time filesystem prg_exec_monitor python regex signals test_exec_monitor thread unit_test_framework ; do

diff --git a/src/SALOME_InstallWizard.cxx b/src/SALOME_InstallWizard.cxx
index 8f40f0393a261e1290ce82d48d0f18a03491a3f4..bd069c2f09be4471a62281c65654caf42bfd2eb2 100644 (file)
--- a/src/SALOME_InstallWizard.cxx
+++ b/src/SALOME_InstallWizard.cxx
@@ -2655,7 +2655,7 @@ void SALOME_InstallWizard::pageChanged( const QString & mytitle)
     }
     // add extra products to install list
     extraProducts.clear();
-    extraProducts.insert( "gcc", "gcc-common.sh" );
+    //extraProducts.insert( "gcc", "gcc-common.sh" );
     if ( refPlatform == commonPlatform && installType == Binaries )
       extraProducts.insert( "DebianLibsForSalome", "DEBIANFORSALOME-3.1.sh" );
   }