From: Nabil Ghodbane <nabil.ghodbane@cea.fr>
Date: Tue, 3 May 2022 10:03:28 +0000 (+0200)
Subject: sat #29870] mode incrémental et section multiple
X-Git-Tag: V9_9_0~57
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=311f92746848c5d37ef763962b4a8c5b56a5c1fb;p=tools%2Fsat_salome.git

sat #29870] mode incrémental et section multiple
---

diff --git a/products/MEDCOUPLING.pyconf b/products/MEDCOUPLING.pyconf
index ec8eb18..0c2ba21 100644
--- a/products/MEDCOUPLING.pyconf
+++ b/products/MEDCOUPLING.pyconf
@@ -257,11 +257,46 @@ version_V9_5_0_MPI:
     opt_depend : ["ParMetis"]
 }
 
-version_V9_6_0_to_V9_8_0:
+version_V9_9_0:
 {
     cmake_options : "-DMEDCOUPLING_ENABLE_PYTHON=ON -DMEDCOUPLING_ENABLE_PARTITIONER=ON -DMEDCOUPLING_ENABLE_RENUMBER=ON -DMEDCOUPLING_PARTITIONER_METIS=ON -DMEDCOUPLING_PARTITIONER_SCOTCH=ON -DMEDCOUPLING_PARTITIONER_PARMETIS=OFF -DMEDCOUPLING_MICROMED=OFF -DMEDCOUPLING_USE_MPI=OFF -DMEDCOUPLING_USE_64BIT_IDS=ON"
 }
 
+version_V9_9_0_win:
+{
+    cmake_options : '  -DMEDCOUPLING_USE_64BIT_IDS=ON -DMEDCOUPLING_ENABLE_PYTHON=ON -DMEDCOUPLING_ENABLE_PARTITIONER=OFF -DMEDCOUPLING_ENABLE_RENUMBER=ON -DMEDCOUPLING_PARTITIONER_METIS=ON -DMEDCOUPLING_PARTITIONER_SCOTCH=OFF -DMEDCOUPLING_PARTITIONER_PARMETIS=OFF -DMEDCOUPLING_MICROMED=OFF -DMEDCOUPLING_USE_MPI=OFF'
+}
+
+version_V9_8_0:
+{
+    cmake_options : "-DMEDCOUPLING_ENABLE_PYTHON=ON -DMEDCOUPLING_ENABLE_PARTITIONER=ON -DMEDCOUPLING_ENABLE_RENUMBER=ON -DMEDCOUPLING_PARTITIONER_METIS=ON -DMEDCOUPLING_PARTITIONER_SCOTCH=ON -DMEDCOUPLING_PARTITIONER_PARMETIS=OFF -DMEDCOUPLING_MICROMED=OFF -DMEDCOUPLING_USE_MPI=OFF -DMEDCOUPLING_USE_64BIT_IDS=ON"
+}
+
+version_V9_8_0_win:
+{
+    cmake_options : '  -DMEDCOUPLING_USE_64BIT_IDS=ON -DMEDCOUPLING_ENABLE_PYTHON=ON -DMEDCOUPLING_ENABLE_PARTITIONER=OFF -DMEDCOUPLING_ENABLE_RENUMBER=ON -DMEDCOUPLING_PARTITIONER_METIS=ON -DMEDCOUPLING_PARTITIONER_SCOTCH=OFF -DMEDCOUPLING_PARTITIONER_PARMETIS=OFF -DMEDCOUPLING_MICROMED=OFF -DMEDCOUPLING_USE_MPI=OFF'
+}
+
+version_V9_7_0:
+{
+    cmake_options : "-DMEDCOUPLING_ENABLE_PYTHON=ON -DMEDCOUPLING_ENABLE_PARTITIONER=ON -DMEDCOUPLING_ENABLE_RENUMBER=ON -DMEDCOUPLING_PARTITIONER_METIS=ON -DMEDCOUPLING_PARTITIONER_SCOTCH=ON -DMEDCOUPLING_PARTITIONER_PARMETIS=OFF -DMEDCOUPLING_MICROMED=OFF -DMEDCOUPLING_USE_MPI=OFF -DMEDCOUPLING_USE_64BIT_IDS=ON"
+}
+
+version_V9_7_0_win:
+{
+    cmake_options : '  -DMEDCOUPLING_USE_64BIT_IDS=ON -DMEDCOUPLING_ENABLE_PYTHON=ON -DMEDCOUPLING_ENABLE_PARTITIONER=OFF -DMEDCOUPLING_ENABLE_RENUMBER=ON -DMEDCOUPLING_PARTITIONER_METIS=ON -DMEDCOUPLING_PARTITIONER_SCOTCH=OFF -DMEDCOUPLING_PARTITIONER_PARMETIS=OFF -DMEDCOUPLING_MICROMED=OFF -DMEDCOUPLING_USE_MPI=OFF'
+}
+
+version_V9_6_0:
+{
+    cmake_options : "-DMEDCOUPLING_ENABLE_PYTHON=ON -DMEDCOUPLING_ENABLE_PARTITIONER=ON -DMEDCOUPLING_ENABLE_RENUMBER=ON -DMEDCOUPLING_PARTITIONER_METIS=ON -DMEDCOUPLING_PARTITIONER_SCOTCH=ON -DMEDCOUPLING_PARTITIONER_PARMETIS=OFF -DMEDCOUPLING_MICROMED=OFF -DMEDCOUPLING_USE_MPI=OFF -DMEDCOUPLING_USE_64BIT_IDS=ON"
+}
+
+version_V9_6_0_win:
+{
+    cmake_options : '  -DMEDCOUPLING_USE_64BIT_IDS=ON -DMEDCOUPLING_ENABLE_PYTHON=ON -DMEDCOUPLING_ENABLE_PARTITIONER=OFF -DMEDCOUPLING_ENABLE_RENUMBER=ON -DMEDCOUPLING_PARTITIONER_METIS=ON -DMEDCOUPLING_PARTITIONER_SCOTCH=OFF -DMEDCOUPLING_PARTITIONER_PARMETIS=OFF -DMEDCOUPLING_MICROMED=OFF -DMEDCOUPLING_USE_MPI=OFF'
+}
+
 version_V9_5_0 :
 {
     cmake_options : "-DMEDCOUPLING_ENABLE_PYTHON=ON -DMEDCOUPLING_ENABLE_PARTITIONER=ON -DMEDCOUPLING_ENABLE_RENUMBER=ON -DMEDCOUPLING_PARTITIONER_METIS=ON -DMEDCOUPLING_PARTITIONER_SCOTCH=ON -DMEDCOUPLING_PARTITIONER_PARMETIS=OFF -DMEDCOUPLING_MICROMED=OFF -DMEDCOUPLING_USE_MPI=OFF"
@@ -299,35 +334,36 @@ version_V9_3_0_win :
 
 version_V8_5_0 :
 {
-    depend : ["Babel",
-	      "boost",
-	      "click",
-	      "cmake",
-	      "cppunit",
-	      "Cython",
-	      "docutils",
-              "doxygen",
-	      "graphviz",
-	      "hdf5",
-	      "Jinja2",
-	      "lapack",
-	      "libxml2",
-              "markupsafe",
-	      "medfile",
-	      "metis",
-	      "numpy",
-	      "Pygments",
-	      "Python",
-	      "pytz",
-              "scipy",
-	      "scotch",
-	      "setuptools",
-	      "six",
-	      "Sphinx",
-	      "sphinxintl",
-              "swig",
-	      "CONFIGURATION"
-	     ]
+    depend : [
+               "Babel",
+               "boost",
+               "click",
+               "cmake",
+               "cppunit",
+               "Cython",
+               "docutils",
+               "doxygen",
+               "graphviz",
+               "hdf5",
+               "Jinja2",
+               "lapack",
+               "libxml2",
+               "markupsafe",
+               "medfile",
+               "metis",
+               "numpy",
+               "Pygments",
+               "Python",
+               "pytz",
+               "scipy",
+               "scotch",
+               "setuptools",
+               "six",
+               "Sphinx",
+               "sphinxintl",
+               "swig",
+               "CONFIGURATION"
+          ]
 }
 
 version_V7_8_2_CO8 :
diff --git a/products/compil_scripts/omniORB.bat b/products/compil_scripts/omniORB.bat
index b75192b..dbcf83f 100755
--- a/products/compil_scripts/omniORB.bat
+++ b/products/compil_scripts/omniORB.bat
@@ -35,12 +35,9 @@ set CONFIG_MK=%BUILD_DIR%\config\config.mk
 set CONFIG_REF=%BUILD_DIR%\config\config.mk.ref
 set CONFIG_DBG=%BUILD_DIR%\config\config.mk.dbg
 copy %CONFIG_MK% %CONFIG_REF%
-echo INFO: activating platform target: x86_win32_vs_15
-sed "s/#platform = x86_win32_vs_15/platform = x86_win32_vs_15/g" < %CONFIG_REF% >  %CONFIG_MK%
-if %SAT_DEBUG% == 1 (
-  copy %CONFIG_MK% %CONFIG_DBG%
-  sed "s/#BuildDebugBinary = 1/BuildDebugBinary = 1/g" < %CONFIG_DBG% >  %CONFIG_MK% 
-  sed -i '199s/\.lib/\_d\.lib/' %BUILD_DIR%\src\tool\omniidl\cxx\dir.mk
+if %SAT_DEBUG% == 0 (
+  echo INFO: activating platform target: x86_win32_vs_15
+  sed "s/#platform = x86_win32_vs_15/platform = x86_win32_vs_15/g" < %CONFIG_REF% >  %CONFIG_MK%
 )
 
 REM target our Python in the configuration file