X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=applications%2FSALOME-master-windows.pyconf;h=a1ee13db5f8ef398ec8b5d74867a36c40d5bca25;hb=18bc5ccaefd4b32de6ec98b7d6575e18a4993f04;hp=5f97f66559941fecf37b7bb25f823624b1ac96eb;hpb=1c39dcd3637a934036964d95f63f1174e4da30e3;p=tools%2Fsat_salome.git

diff --git a/applications/SALOME-master-windows.pyconf b/applications/SALOME-master-windows.pyconf
index 5f97f66..a1ee13d 100644
--- a/applications/SALOME-master-windows.pyconf
+++ b/applications/SALOME-master-windows.pyconf
@@ -16,16 +16,19 @@ APPLICATION :
     {
         build : 
         {
-           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
+            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"
+            SALOME_USE_64BIT_IDS : '1'
+            SET_usr_docs_VARS : "1" # required for PyEditor build
+            CMAKE_GENERATOR : '"Visual Studio 15 2017 Win64"'
         }
         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%"
         HOME : "%userprofile%"
+        SALOME_ACTOR_DELEGATE_TO_VTK : '1'
     }
     products :
     {
@@ -33,7 +36,7 @@ APPLICATION :
         alabaster : '0.7.6'
         Babel : '2.7.0'
         boost : '1.67.0'
-        CAS : {tag: 'CR750-SALOME-PATCH', section: 'version_V7_5_0_win'}
+        CAS : {tag: 'V7_5_3p1', section: 'version_V7_5_3p1_win'}
         certifi : '2019.6.16'
         cgns : '4.1.1'
         chardet : '3.0.4'
@@ -47,18 +50,17 @@ APPLICATION :
         docutils : '0.14'
         doxygen : '1.8.3.1'
         eigen : '3.3.4'
-        embree : '3.5.2'
+        embree : '3.12.2'
         expat : '2.0.1'
         f2c : '1.0.0'
         freeimage : '3.18.0'
         freetype : '2.9.1'
-        #gmsh : '4.1.4'
+        gmsh : '4.8.4'
         graphviz : '2.44.1'
         hdf5 : '1.10.3'
-        #homard_bin : '11.12'
         idna : '2.8'
         imagesize : '1.1.0'
-        ispc : '1.10.0'
+        ispc : '1.15.0'
         Jinja2 : '2.10.1'
         kiwisolver : '1.1.0'
         lapack : '3.8.0'
@@ -68,19 +70,19 @@ APPLICATION :
         llvm : '8.0.1-clang-win'
         markupsafe : '1.1.1'
         matplotlib : '3.1.0'
-        medfile : '4.1.0'
+        medfile : '4.1.1'
         mesa : '19.2.3'
-        MeshGems : '2.12-1'
+        MeshGems : '2.14-1'
         metis : '5.1.0'
         msvc : '2017'
-        netgen : '5.3.1_with_CAS_7.2'
+        netgen : '6.2.2101'
         nlopt : '2.5.0'
         numpy : '1.16.4'
         omniORB : '4.2.3'
         omniORBpy : '4.2.3'
         opencv : '3.2.0'
         openVKL: '0.11.0'
-        openturns: '1.16'
+        openturns: '1.17'
         ospray : '2.4.0'
         packaging : '19.0'
         ParaView : '5.9.0'
@@ -92,7 +94,7 @@ APPLICATION :
         Pygments : '2.4.2'
         pyparsing : '2.4.0'
         PyQt : '5.15.3'
-#        PyQtChart : '5.9'
+        # PyQtChart : '5.15.4'
         pyreadline : '2.1'
         Python : '3.6.5'
         pytz : '2019.1'
@@ -103,7 +105,7 @@ APPLICATION :
         ruby : '2.5.5-1'
         scipy : '1.4.1'
         setuptools : '41.0.1'
-        sip : '4.19.3'
+        sip : '5.5.0'
         six : '1.12.0'
         snowballstemmer : '1.9.0'
         Sphinx : '2.1.2'
@@ -116,9 +118,10 @@ APPLICATION :
         sphinxcontrib_websupport : '1.1.2'
         sphinx_rtd_theme : '0.4.3'
         sphinxintl: '2.0.0'
-        StaticMeshPlugin : '5.8.0'
+        StaticMeshPlugin: '5.8.0'
         swig : '3.0.12'
         tbb : '2019_U8_win'
+        toml : '0.10.2'
         tcltk : '8.6.9'
         urllib3 : '1.25.3'
         zlib : '1.2.5'
@@ -129,7 +132,7 @@ APPLICATION :
         'SHAPER'
         'SHAPERSTUDY'
         'RESTRICTED'
-        'LIBBATCH' : {tag :'V2_4_4'}
+        'LIBBATCH' : {tag :'V2_4_5'}
         'KERNEL'
         'MEDCOUPLING'
         'GUI'
@@ -140,7 +143,7 @@ APPLICATION :
         'GHS3DPLUGIN'
         'HYBRIDPLUGIN'
         'HexoticPLUGIN'
-        #'GMSHPLUGIN'
+        'GMSHPLUGIN'
         'HEXABLOCK'
         'HEXABLOCKPLUGIN'
         #'HOMARD'
@@ -160,7 +163,8 @@ APPLICATION :
         'EFICAS_TOOLS'
         'ADAO'
         'PARAVISADDONS'
-        'CEATESTBASE' : {tag: 'SalomeV9'}
+        'TESTBASE': {tag: 'master'}
+        'CEATESTBASE' : {tag: 'SSL'}
     }
     profile :
     {
@@ -188,13 +192,15 @@ APPLICATION :
 
 __overwrite__ :
 [
-  {
-   # 
-    'PRODUCTS.PARAVISADDONS.default.patches' : ['paraview-5.9_PARAVISADDONS.patch']
-  }
   {
     __condition__ : "APPLICATION.debug == 'yes'"
-    'APPLICATION.products.numpy'      : '1.16.4-win-dbg'
-    'APPLICATION.products.sphinxintl' : '2.0.0-win-dbg'
+    'APPLICATION.rm_products' : ['matplotlib']
+    'APPLICATION.products.numpy'      : {tag: '1.16.4',  base: 'no', section : 'version_1_16_4_win_dbg'     }
+    'APPLICATION.products.Cython'     : {tag: '0.29.12', base: 'no', section : 'version_0_29_12_win_dbg'    }
+    'APPLICATION.products.sphinxintl' : {tag: '2.0.0',   base: 'no', section : 'version_2_0_0_win_dbg'      }
+    'APPLICATION.products.llvm'       : {tag: '8.0.1',   base: 'no', section : 'version_8_0_1_clang_win_dbg'}
+    'APPLICATION.products.tbb'        : {tag: '2019_U8', base: 'no', section : 'version_2019_U8_win_dbg'    }
+    'APPLICATION.products.omniORB'    : {tag: '4.2.3',   base: 'no', section : 'version_4_2_3_win_dbg'      }
+    'APPLICATION.products.psutil'     : {tag: '5.7.2',   base: 'no', section : 'version_5_7_2_win_dbg'      }
   }
 ]