Windows: use 64 bits IDS as default for both MEDCOUPLING-master and SALOME-master...

diff --git a/applications/MEDCOUPLING-master-windows.pyconf b/applications/MEDCOUPLING-master-windows.pyconf
index 731f3c699a44f18b447b53df4069fa769f1527cd..c9a42bd2da4f311975e2a326501feed734ceaddd 100644 (file)
--- a/applications/MEDCOUPLING-master-windows.pyconf
+++ b/applications/MEDCOUPLING-master-windows.pyconf
@@ -12,9 +12,16 @@ APPLICATION :
     python3 : 'yes'
     environ :
     {
-        build : {CONFIGURATION_ROOT_DIR : $workdir + $VARS.sep + "SOURCES" + $VARS.sep + "CONFIGURATION"}
-        launch : {PYTHONIOENCODING:"UTF_8"}
-        SALOME_HAS_GLOBAL_ENV: "1"
+        build : 
+        {
+          CONFIGURATION_ROOT_DIR : $workdir + $VARS.sep + "SOURCES" + $VARS.sep + "CONFIGURATION"
+          SALOME_HAS_GLOBAL_ENV: "1"
+          SALOME_USE_64BIT_IDS : '1'
+        }
+        launch :
+        {
+          PYTHONIOENCODING:"UTF_8"
+        }
     }
     products :
     {
@@ -50,6 +57,7 @@ APPLICATION :
         pockets : '0.7.2'
         Pygments : '2.4.2'
         pyparsing : '2.4.0'
+        pyreadline : '2.1'
         Python : '3.6.5'
         pytz : '2019.1'
         requests : '2.22.0'

diff --git a/applications/SALOME-master-windows.pyconf b/applications/SALOME-master-windows.pyconf
index 7b4344b3176dffe9d383f9eb429e59151ad0dcda..f955f7d917d6a6ba368b84fbcd148772219b5808 100644 (file)
--- a/applications/SALOME-master-windows.pyconf
+++ b/applications/SALOME-master-windows.pyconf
@@ -18,14 +18,14 @@ APPLICATION :
         {
            CONFIGURATION_ROOT_DIR : $workdir + $VARS.sep + "SOURCES" + $VARS.sep + "CONFIGURATION"
            RESTRICTED_ROOT_DIR : $workdir + $VARS.sep + "SOURCES" + $VARS.sep + "RESTRICTED"
+           SALOME_HAS_GLOBAL_ENV : "1"
+           SET_usr_docs_VARS : "1" # required for PyEditor build
         }
         launch : {PYTHONIOENCODING:"UTF_8", SALOME_MODULES_ORDER:"SHAPER:SHAPERSTUDY:GEOM:SMESH"}
         SALOME_trace : "local" # local/file:.../with_logger
         SALOME_MODULES : "SHAPER,SHAPERSTUDY,GEOM,SMESH,PARAVIS,YACS,JOBMANAGER"  # specify the first modules to display in gui
         SALOME_TMP_DIR : "%appdata%"
-        SALOME_HAS_GLOBAL_ENV : "1"
         HOME : "%userprofile%"
-        SET_usr_docs_VARS : "1" # required for PyEditor build
     }
     products :
     {

diff --git a/products/GUI.pyconf b/products/GUI.pyconf
index ed1328b9dabe9f6fc309582696f52de4b93dfe37..641279bd326fe44b7bb3ba57cd723ab0d3132f70 100644 (file)
--- a/products/GUI.pyconf
+++ b/products/GUI.pyconf
@@ -66,7 +66,8 @@ default_win :
               "sphinxcontrib_websupport",
               "sphinxcontrib_applehelp",
               "sphinxcontrib_serializinghtml",
-              "sphinxcontrib_napoleon"
+              "sphinxcontrib_napoleon",
+              "graphviz"
              ]
     opt_depend : ["sphinx_rtd_theme"]
     build_depend : ["cmake", "swig", "doxygen", "cppunit"]

diff --git a/products/KERNEL.pyconf b/products/KERNEL.pyconf
index 7f2319715ce6f4ae3c173051fcb83936a8b80517..98a6b78c8a0629ccbf133e02404146ea4a856923 100644 (file)
--- a/products/KERNEL.pyconf
+++ b/products/KERNEL.pyconf
@@ -60,7 +60,8 @@ default_win :
               "setuptools",
               "Pygments",
               "pytz",
-              "LIBBATCH"
+              "LIBBATCH",
+              "graphviz"
               ]
     build_depend : ["cmake", "swig", "doxygen", "cppunit"]
 }
@@ -143,6 +144,7 @@ ALAMOS_SALOME_9_win :
               "omniORB",
               "omniORBpy",
               "docutils",
+              "graphviz",
               "libxml2",
               "Sphinx",
               "sphinxintl",

diff --git a/products/MEDCOUPLING.pyconf b/products/MEDCOUPLING.pyconf
index 69be477641aa9e38549ff0f8867170fe1c66f8da..23649704f39657f174c4cb8c7376d1c92a2317fa 100644 (file)
--- a/products/MEDCOUPLING.pyconf
+++ b/products/MEDCOUPLING.pyconf
@@ -44,7 +44,7 @@ default :
 
 default_win :
 {
-    cmake_options : ' -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 '
+    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 '
     depend : [
               "boost",
               "Python",
@@ -52,6 +52,7 @@ default_win :
               "medfile",
               "metis",
               "docutils",
+              "graphviz",
               "libxml2",
               "Sphinx",
               "sphinxintl",
@@ -60,7 +61,8 @@ default_win :
               "pytz",
               "numpy",
               "CONFIGURATION"
-              ]
+             ]
+    build_depend : ["cmake", "swig", "doxygen", "cppunit"]
 }
 
 default_int64:
@@ -69,6 +71,14 @@ default_int64:
 
 }
 
+version_V9_5_0 :
+{
+}
+version_V9_5_0_win :
+{
+    cmake_options : ' -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_7_8_2_to_8_4_0 :
 {
     depend : [

diff --git a/products/compil_scripts/ParaView.bat b/products/compil_scripts/ParaView.bat
index 1efac77f002fa55c5d1a35812cb2673f8e3002ba..52c56d014b215d4ef9b52fdfeb117eb5fbec8613 100644 (file)
--- a/products/compil_scripts/ParaView.bat
+++ b/products/compil_scripts/ParaView.bat
@@ -50,7 +50,14 @@ set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DVTK_PYTHON_FULL_THREADSAFE:BOOL=ON
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DVTK_PYTHON_VERSION:STRING=3
 
 REM VTK general settings
-set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DVTK_USE_64BIT_IDS:BOOL=OFF
+
+REM Use 64 bits IDS on request
+if DEFINED SALOME_USE_64BIT_IDS (
+    set CMAKE_OPTIONS=%CMAKE_OPTIONS%  -DVTK_USE_64BIT_IDS:BOOL=ON
+) else (
+    set CMAKE_OPTIONS=%CMAKE_OPTIONS%  -DVTK_USE_64BIT_IDS:BOOL=OFF
+)
+
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DVTK_INSTALL_LIBRARY_DIR=lib/paraview-%PVLIBVERSION%
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DVTK_INSTALL_ARCHIVE_DIR=lib/paraview-%PVLIBVERSION%
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DVTK_PYTHON_SITE_PACKAGES_SUFFIX=site-packages

diff --git a/products/compil_scripts/medCMake.bat b/products/compil_scripts/medCMake.bat
index 4338f96604f412bb1b73d3bd8a3fa0683ceb85df..640260e58ad94eb061d03d933fa77a28093333b2 100755 (executable)
--- a/products/compil_scripts/medCMake.bat
+++ b/products/compil_scripts/medCMake.bat
@@ -25,16 +25,20 @@ SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DMEDFILE_BUILD_STATIC_LIBS:BOOL=OFF
 SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DMEDFILE_BUILD_SHARED_LIBS:BOOL=ON\r
 SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DHDF5_ROOT_DIR:STRING=%HDF5_ROOT_DIR%\r
 \r
+if DEFINED SALOME_USE_64BIT_IDS (\r
+    SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DMED_MEDINT_TYPE:STRING="long long"\r
+)\r
+\r
 if DEFINED SAT_HPC (\r
     SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DMEDFILE_USE_MPI:BOOL=ON\r
 ) else (\r
-       SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DMEDFILE_USE_MPI:BOOL=OFF\r
+    SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DMEDFILE_USE_MPI:BOOL=OFF\r
 )\r
 \r
 if defined CMAKE_GENERATOR (\r
-    set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR%\r
+    SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR%\r
 ) else (\r
-    set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR="Visual Studio 15 2017 Win64"\r
+    SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR="Visual Studio 15 2017 Win64"\r
 )\r
 \r
 cd %BUILD_DIR%\r

diff --git a/products/env_scripts/ParaView.py b/products/env_scripts/ParaView.py
index b8554c2f68fef416c97206f8b0e9c95b1b993d91..ee4520a770ce53af97bc2804256d525cab5d3627 100644 (file)
--- a/products/env_scripts/ParaView.py
+++ b/products/env_scripts/ParaView.py
@@ -45,10 +45,9 @@ def set_paraview_env(env, version):
         paralib = os.path.join(root, 'lib', 'paraview-' + version)
         env.prepend('PATH', paralib)
         env.prepend('PV_PLUGIN_PATH', paralib)
-        env.prepend('PYTHONPATH', os.path.join(root,'bin', 'Lib', 'site-packages'))
-        env.prepend('PYTHONPATH', os.path.join(root,'bin', 'Lib', 'site-packages'))
         env.prepend('PYTHONPATH', os.path.join(root,'bin', 'Lib', 'site-packages', 'paraview'))
         env.prepend('PYTHONPATH', os.path.join(root,'bin', 'Lib', 'site-packages', 'vtk'))
+        env.prepend('PYTHONPATH', os.path.join(root,'bin', 'Lib', 'site-packages'))
     else:
         paralib = os.path.join(root, lib_dir, 'paraview-' + version)
         env.prepend('PV_PLUGIN_PATH', paralib)