Join modifications from branch BR_For_OCT_611: migration to OCCT6.1.1 with new except...

diff --git a/bin/launchConfigureParser.py b/bin/launchConfigureParser.py
index ed3129933abcb8d0b2bacc6649505102324629a9..f1ae79eaaefdcaacd505ef7126e9909472c16b18 100755 (executable)
--- a/bin/launchConfigureParser.py
+++ b/bin/launchConfigureParser.py
@@ -436,6 +436,10 @@ if 't' in cmd_opts:
     args[script_nam] = cmd_opts['t']
     pass
 
+if args[except_nam] == 1:
+    os.environ["DISABLE_FPE"] = "1"
+    pass
+
 # now modify SalomeAppConfig environment variable
 dirs = re.split('[;|:]', os.environ[config_var] )
 

diff --git a/configure.ac b/configure.ac
index b7f5a63b5505d250ad615977db483dcc40ffb90b..1a623565e8fc6d4b91eaf2105d1640c8460649e2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@
 #
 #AC_PREREQ(2.59)
 #AC_INIT(src)
-AC_INIT([Salome2 Project], [3.2.1], [gboulant@CS], [salome])
+AC_INIT([Salome2 Project], [3.2.2], [gboulant@CS], [salome])
 
 # AC_CONFIG_AUX_DIR defines an alternative directory where to find the auxiliary
 # scripts such as config.guess, install-sh, ...

diff --git a/salome_adm/unix/config_files/check_cas.m4 b/salome_adm/unix/config_files/check_cas.m4
index 2db76b8753ba1dba215a459582afb36ca9484bf7..ab2ba319dd9586d665d06135966fe590c19ec3c9 100644 (file)
--- a/salome_adm/unix/config_files/check_cas.m4
+++ b/salome_adm/unix/config_files/check_cas.m4
@@ -107,6 +107,7 @@ else
   occ_ok=yes
   OCC_VERSION_MAJOR=0
   OCC_VERSION_MINOR=0
+  OCC_VERSION_MAINTENANCE=0
   ff=$CASROOT/inc/Standard_Version.hxx
   if test -f $ff ; then
     grep "define OCC_VERSION_MAJOR" $ff > /dev/null
@@ -117,6 +118,10 @@ else
     if test $? = 0 ; then
       OCC_VERSION_MINOR=`grep "define OCC_VERSION_MINOR" $ff | awk '{i=3 ; print $i}'`
     fi
+    grep "define OCC_VERSION_MAINTENANCE" $ff > /dev/null
+    if test $? = 0 ; then
+      OCC_VERSION_MAINTENANCE=`grep "define OCC_VERSION_MAINTENANCE" $ff | awk '{i=3 ; print $i}'`
+    fi
   fi
 fi
 
@@ -135,10 +140,21 @@ dnl cascade headers
   CPPFLAGS_old="$CPPFLAGS"
 case $host_os in
    linux*)
-      CAS_CPPFLAGS="-DOCC_VERSION_MAJOR=$OCC_VERSION_MAJOR -DLIN -DLINTEL -DCSFDB -DNO_CXX_EXCEPTION -DNo_exception -DHAVE_CONFIG_H -DHAVE_LIMITS_H -DHAVE_WOK_CONFIG_H -I$CASROOT/inc"
+      CAS_CPPFLAGS="-DOCC_VERSION_MAJOR=$OCC_VERSION_MAJOR -DOCC_VERSION_MINOR=$OCC_VERSION_MINOR -DOCC_VERSION_MAINTENANCE=$OCC_VERSION_MAINTENANCE -DLIN -DLINTEL -DCSFDB -DNo_exception -DHAVE_CONFIG_H -DHAVE_LIMITS_H -DHAVE_WOK_CONFIG_H"
+
+      OCC_VERSION_STRING="$OCC_VERSION_MAJOR.$OCC_VERSION_MINOR.$OCC_VERSION_MAINTENANCE"
+      case $OCC_VERSION_STRING in
+        [[0-5]].* | 6.0.* | 6.1.0) # catch versions < 6.1.1
+          CAS_CPPFLAGS="$CAS_CPPFLAGS -DNO_CXX_EXCEPTION"
+          ;;
+        *)
+          CAS_CPPFLAGS="$CAS_CPPFLAGS -DOCC_CONVERT_SIGNALS"
+          ;;
+      esac
+      CAS_CPPFLAGS="$CAS_CPPFLAGS -I$CASROOT/inc"
       ;;
    osf*)
-      CAS_CPPFLAGS="-DOCC_VERSION_MAJOR=$OCC_VERSION_MAJOR -DLIN -DLINTEL -DCSFDB -DNo_exception -DHAVE_CONFIG_H -DHAVE_LIMITS_H -DHAVE_WOK_CONFIG_H -I$CASROOT/inc"
+      CAS_CPPFLAGS="-DOCC_VERSION_MAJOR=$OCC_VERSION_MAJOR -DOCC_VERSION_MINOR=$OCC_VERSION_MINOR -DOCC_VERSION_MAINTENANCE=$OCC_VERSION_MAINTENANCE -DLIN -DLINTEL -DCSFDB -DNo_exception -DHAVE_CONFIG_H -DHAVE_LIMITS_H -DHAVE_WOK_CONFIG_H -I$CASROOT/inc"
       ;;
 esac
   CPPFLAGS="$CPPFLAGS $CAS_CPPFLAGS"
@@ -171,11 +187,10 @@ if test "x$occ_ok" = xyes ; then
   
   AC_CACHE_VAL(salome_cv_lib_occ,[
     AC_TRY_LINK(
-#include <Standard_Type.hxx>
+#include <TCollection_AsciiString.hxx>
 ,   size_t size;
-    const Standard_CString aName="toto";
-    Standard_Type myST(aName) ; 
-    myST.Find(aName);,
+    TCollection_AsciiString aStr ("toto");
+    aStr.Capitalize();, 
     eval "salome_cv_lib_occ=yes",eval "salome_cv_lib_occ=no")
   ])
   occ_ok="$salome_cv_lib_occ"