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

diff --git a/applications/SALOME-master-windows.pyconf b/applications/SALOME-master-windows.pyconf
index bf5832a..a1ee13d 100644
--- a/applications/SALOME-master-windows.pyconf
+++ b/applications/SALOME-master-windows.pyconf
@@ -16,12 +16,12 @@ 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"
-           SALOME_USE_64BIT_IDS : '1'
-           SET_usr_docs_VARS : "1" # required for PyEditor build
-           CMAKE_GENERATOR : '"Visual Studio 15 2017 Win64"'
+            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
@@ -36,7 +36,7 @@ APPLICATION :
         alabaster : '0.7.6'
         Babel : '2.7.0'
         boost : '1.67.0'
-        CAS : 'V7_5_3p1'
+        CAS : {tag: 'V7_5_3p1', section: 'version_V7_5_3p1_win'}
         certifi : '2019.6.16'
         cgns : '4.1.1'
         chardet : '3.0.4'
@@ -72,7 +72,7 @@ APPLICATION :
         matplotlib : '3.1.0'
         medfile : '4.1.1'
         mesa : '19.2.3'
-        MeshGems : '2.13-1'
+        MeshGems : '2.14-1'
         metis : '5.1.0'
         msvc : '2017'
         netgen : '6.2.2101'
@@ -94,7 +94,7 @@ APPLICATION :
         Pygments : '2.4.2'
         pyparsing : '2.4.0'
         PyQt : '5.15.3'
-       # PyQtChart : '5.15.4'
+        # PyQtChart : '5.15.4'
         pyreadline : '2.1'
         Python : '3.6.5'
         pytz : '2019.1'
@@ -163,7 +163,7 @@ APPLICATION :
         'EFICAS_TOOLS'
         'ADAO'
         'PARAVISADDONS'
-        'TESTBASE'
+        'TESTBASE': {tag: 'master'}
         'CEATESTBASE' : {tag: 'SSL'}
     }
     profile :
@@ -194,11 +194,13 @@ __overwrite__ :
 [
   {
     __condition__ : "APPLICATION.debug == 'yes'"
-    'APPLICATION.products.numpy'      : '1.16.4-win-dbg'
-    'APPLICATION.products.sphinxintl' : '2.0.0-win-dbg'
-    'PRODUCTS.llvm.version_8_0_1_clang_win.build_source' : 'script'
-    'PRODUCTS.llvm.version_8_0_1_clang_win.compil_script' : 'llvm-8.0.1.bat'
-    'PRODUCTS.tbb.version_2019_U8_win.patches' : ['tbb-2019_U8_windows10.patch', 'tbb-2019_U8_windows10_debug.patch']
-    'PRODUCTS.omniORB.default.patches': ['omniORB-4.2.3-windows-debug.patch']
+    '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'      }
   }
 ]