apply changes from master

[tools/sat_salome.git] / applications / SALOME-master-windows.pyconf

diff --git a/applications/SALOME-master-windows.pyconf b/applications/SALOME-master-windows.pyconf
index 9c9987f2028dbb5b630a447c634f11a61fd42327..746b2a158d5f2c11cd64336f61d22b36ae76b50a 100644 (file)
--- a/applications/SALOME-master-windows.pyconf
+++ b/applications/SALOME-master-windows.pyconf
@@ -8,9 +8,9 @@ APPLICATION :
     cmake_generator : 'Visual Studio 15 2017 Win64'
     tag : 'master'
     dev : 'no'
-    verbose :'no'
-    debug : 'no'
-    base : 'no'
+    verbose : 'no'
+    debug   : 'no'
+    base    : 'no'
     python3 : 'yes'
     environ :
     {
@@ -39,7 +39,8 @@ APPLICATION :
         alabaster : '0.7.6'
         Babel : '2.7.0'
         boost : '1.67.0'
-        CAS : {tag: 'V7_5_3p2', section: 'version_V7_5_3p2_win'}
+        #CAS : {tag: 'CR753-SALOME-PATCH', section: 'version_CR753_SALOME_PATCH_win'}
+        CAS : {tag : 'cfcbf4e', section: 'version_CR753_SALOME_PATCH_win', base: 'no'}
         certifi : '2019.6.16'
         cgns : '4.2.0'
         chardet : '3.0.4'
@@ -59,7 +60,7 @@ APPLICATION :
         f2c : '1.0.0'
         freeimage : '3.18.0'
         freetype : '2.9.1'
-        gmsh : '4.8.4'
+        gmsh : '4.10.3'
         graphviz : '2.44.1'
         hdf5 : '1.10.3'
         idna : '2.8'
@@ -76,23 +77,25 @@ APPLICATION :
         matplotlib : '3.1.0'
         medfile : '4.1.1'
         mesa : '19.2.3'
-        MeshGems : '2.13-1'  # FIXME: to be removed once CEA License for 2.14-4 is renewed.
+        MeshGems : '2.13-1'
         metis : '5.1.0'
         msvc : '2017'
-        netgen : '6.2.2101'
+        netgen : '5.3.1_with_CAS_7.2'
+        # comment out line above and uncomment the line below to use Netgen 6.
+        #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.18'
+        openturns: '1.19'
         ospray : '2.4.0'
         packaging : '19.0'
-        ParaView : '5.9.0'
+        ParaView : {tag:'5.11.0', base: 'no',  section: 'version_5_11_0'}
         perl : '5.28.1.1'
         Pillow : '7.1.1'
-        planegcs : '0.18-3cb6890'
+        planegcs : '0.20'
         psutil : '5.7.2'
         pthreads : '2.9.1'
         Pygments : '2.4.2'
@@ -121,7 +124,7 @@ APPLICATION :
         sphinxcontrib_websupport : '1.1.2'
         sphinx_rtd_theme : '0.4.3'
         sphinxintl: '2.0.0'
-        StaticMeshPlugin: '5.8.0'
+        StaticMeshPlugin: '5.11.0'
         swig : '3.0.12'
         tbb : '2019_U8_win'
         toml : '0.10.2'
@@ -135,12 +138,12 @@ APPLICATION :
         'SHAPER'
         'SHAPERSTUDY'
         'RESTRICTED'
-        'LIBBATCH' : {tag :'V2_4_5'}
+        'LIBBATCH' : {tag :'V2_4_6'}
         'KERNEL'
         'MEDCOUPLING'
-        'GUI'
+        'GUI' : 'po/pv-master'
         'GEOM'
-        'SMESH'
+        'SMESH' : 'po/pv-master'
         'NETGENPLUGIN'
         'BLSURFPLUGIN'
         'GHS3DPLUGIN'
@@ -151,7 +154,7 @@ APPLICATION :
         'HEXABLOCKPLUGIN'
         #'HOMARD'
         'FIELDS'
-        'PARAVIS'
+        'PARAVIS' : 'agy/pv-master'
         'JOBMANAGER'
         'YACS'
         'YACSGEN'
@@ -165,20 +168,15 @@ APPLICATION :
         'EFICAS'
         'EFICAS_TOOLS'
         'ADAO'
-        'PARAVISADDONS'
+        'PARAVISADDONS' : 'po/pv-master'
         'pmml'
-        'TESTBASE': {tag: 'master'}
-        'CEATESTBASE' : {tag: 'SalomeV9'}
+        'TESTBASE'
+        'CEATESTBASE' : 'SalomeV9'
     }
     profile :
     {
         launcher_name : "salome"
     }
-    virtual_app:
-    {
-        name : "salome"
-        application_name : "APPLI"
-    }
     test_base : 
     {
         name : "SALOME"
@@ -198,7 +196,7 @@ __overwrite__ :
 [
   {
     __condition__ : "APPLICATION.debug == 'yes'"
-    'APPLICATION.rm_products' : ['matplotlib']
+    'APPLICATION.rm_products' : ['matplotlib', 'openturns', 'scipy', 'Pillow']
     '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'      }
@@ -206,5 +204,7 @@ __overwrite__ :
     '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'      }
+    'APPLICATION.products.ParaView'   : {tag: '5.11.0',  base: 'no', section : 'version_5_11_0_win_dbg'     }
+    'APPLICATION.products.zlib'       : {tag: '1.2.5',   base: 'no', section : 'version_1_2_5_win_dbg'      }
   }
 ]