minor correction:

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

diff --git a/applications/SALOME-master-windows.pyconf b/applications/SALOME-master-windows.pyconf
index 9fb46667ddd833d9abc036faaa35ce803195cba1..f94c9eeacf5e6e0aa6a3db5109a955e47ed63c10 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,10 +77,11 @@ 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 : '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'
@@ -168,18 +170,13 @@ APPLICATION :
         'ADAO'
         'PARAVISADDONS'
         '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"
@@ -199,7 +196,7 @@ __overwrite__ :
 [
   {
     __condition__ : "APPLICATION.debug == 'yes'"
-    'APPLICATION.rm_products' : ['matplotlib', 'openturns']
+    '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'      }
@@ -208,5 +205,6 @@ __overwrite__ :
     '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.9.0',   base: 'no', section : 'version_5_9_0_win_dbg'      }
+    'APPLICATION.products.zlib'       : {tag: '1.2.5',   base: 'no', section : 'version_1_2_5_win_dbg'      }
   }
 ]