windows: remove a duplicate patch

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

diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf
index 76c87eb370d9058dded3dc29d5a868764902b3b7..902b865a8064633ff01f0a25d3d47f5d65e32b83 100644 (file)
--- a/applications/SALOME-master-native.pyconf
+++ b/applications/SALOME-master-native.pyconf
@@ -37,7 +37,7 @@ APPLICATION :
         alabaster : 'native'
         Babel : 'native'
         boost : 'native'
-        CAS : 'V7_5_3p1'
+        CAS : 'V7_5_3p2'
         C3PO: 'v2.0'
         certifi : 'native'
         # Standalone native cgns works well. Unfortunately, it's directly linked to native hdf which uses a higher version than us.
@@ -77,11 +77,12 @@ APPLICATION :
         markupsafe : 'native'
         matplotlib : 'native'
         medfile : '4.1.1'
-        mesa : '19.0.8'
+        mesa : {tag : '19.0.8', base: 'no', section: 'version_19_0_8_x86_64'}
         MeshGems : '2.14-4'
         metis : 'native'
         mpi4py: 'native'
-        netgen : '6.2.2101'
+        netgen : '5.3.1_with_CAS_7.2'
+        #netgen : '6.2.2101'
         netcdf : 'native'
         nlopt : '2.4.2'
         nose: 'native'
@@ -132,7 +133,7 @@ APPLICATION :
         tbb : 'native'
         tcl : 'native'
         tk : 'native'
-        TopIIVolMesh: 'develop'
+        TopIIVolMesh
         urllib3 : 'native'
         zeromq: '4.3.1'
         URANIE : '4.5.0'
@@ -160,8 +161,8 @@ APPLICATION :
         'HEXABLOCKPLUGIN'
         'HOMARD'
         'FIELDS'
-        'PARAVIS': {tag:'master', base: 'no', section: 'default_MPI', hpc: 'yes'}
         'OPENTURNS_SALOME'
+        'PARAVIS': {tag:'master', base: 'no', section: 'default_MPI', hpc: 'yes'}
         'JOBMANAGER'
         'YACS'
         'YACSGEN'
@@ -180,6 +181,7 @@ APPLICATION :
         'ADAO_INTERFACE'
         'PARAVISADDONS'
         'YDEFX'
+        'pmml'
         'TESTBASE': {tag: 'master'}
         'CEATESTBASE' : {tag: 'SalomeV9'}
     }
@@ -240,22 +242,29 @@ __overwrite__ :
         'APPLICATION.products.cminpack'    : '1.3.6'
         'APPLICATION.products.PyFMI'       : {tag: '2.5',    base: 'no', section: 'version_2_5_no_pip'             }
         'APPLICATION.products.statsmodels' : {tag: '0.6.1',  base: 'no', section: 'version_0_6_1_no_pip'           }
+        'APPLICATION.products.gdal'        : {tag:'2.4.0',   base: 'no', section: 'version_2_4_0_CO8'              } # spns #29324
     }
     {
         __condition__ : "VARS.dist in ['FD32']"
         'APPLICATION.products.opencv'    : '3.2.0'
         'APPLICATION.products.PyFMI'     : {tag: '2.5',   base: 'no', section: 'version_2_5_no_pip'              }
-        'APPLICATION.products.openturns' : {tag: '1.17',  base: 'no', section: 'version_1_17_FD32'               }
+        'APPLICATION.products.openturns' : {tag: '1.18',  base: 'no', section: 'version_1_18_FD32'               }
         'APPLICATION.products.Sphinx'    : {tag: '1.7.6', base: 'no', section: 'version_1_7_6_no_pip'            }
-        'APPLICATION.products.gdal'      : {tag:'2.4.0',   base: 'no', section: 'version_2_4_0_FD32'             } # spns #29324
+        'APPLICATION.products.gdal'      : {tag:'2.4.0',  base: 'no', section: 'version_2_4_0_FD32'              } # spns #29324
     }
     {
         __condition__ : "VARS.dist in ['FD34']"
-        'APPLICATION.products.opencv'   : '3.2.0'
-        'APPLICATION.products.omniORB'  : '4.2.4'
-        'APPLICATION.products.omniORBpy': '4.2.4'
-        'APPLICATION.products.PyFMI'    : {tag: '2.5',    base: 'no', section: 'version_2_5_no_pip'             }
-        'APPLICATION.products.root'     : {tag:'6.22.02', base: 'no', section: 'version_6_22_02_FD34'           }
-        'APPLICATION.products.gdal'     : {tag:'2.4.0',   base: 'no', section: 'version_2_4_0_FD34'             } # spns #29324
+        'APPLICATION.products.opencv'    : '3.2.0'
+        'APPLICATION.products.omniORB'   : '4.2.4'
+        'APPLICATION.products.omniORBpy' : '4.2.4'
+        'APPLICATION.products.PyFMI'     : {tag: '2.5',    base: 'no', section: 'version_2_5_no_pip'             }
+        'APPLICATION.products.openturns' : {tag: '1.18',   base: 'no', section: 'version_1_18_FD34'              }
+        'APPLICATION.products.root'      : {tag:'6.22.02', base: 'no', section: 'version_6_22_02_FD34'           }
+        'APPLICATION.products.gdal'      : {tag:'2.4.0',   base: 'no', section: 'version_2_4_0_FD34'             } # spns #29324
+    }
+    {
+        # FIXME: to be removed once CEA License for 2.14-4 is renewed.
+        __condition__ : "VARS.dist not in ['DB09', 'DB10', 'DB11']"
+        'APPLICATION.products.MeshGems' : '2.13-1'
     }
 ]