minor correction:

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

diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf
index 2c4fa508498feb4b9c42d552b14cc61a566b8fda..66d418e419b835477be0bacbbcaa76048c68521d 100644 (file)
--- a/applications/SALOME-master-native.pyconf
+++ b/applications/SALOME-master-native.pyconf
@@ -36,7 +36,8 @@ APPLICATION :
         alabaster : 'native'
         Babel : 'native'
         boost : 'native'
-        CAS : 'CR753-SALOME-PATCH'
+        #CAS : 'CR753-SALOME-PATCH'
+        CAS : {tag : 'cfcbf4e', section: 'version_CR753_SALOME_PATCH', base: 'no'}
         C3PO: 'v2.0'
         certifi : 'native'
         cgns : '4.2.0'
@@ -58,7 +59,7 @@ APPLICATION :
         freetype : 'native'
         gl2ps : 'native'
         gdal : 'native'
-        gmsh : '4.8.4'
+        gmsh : '4.10.3'
         graphviz : 'native'
         hdf5 : '1.10.3'
         idna : 'native'
@@ -215,17 +216,19 @@ __overwrite__ :
     {
         #
         __condition__ : "VARS.dist in ['UB22.04']"
-        'APPLICATION.products.opencv'  : '3.2.0'
-        'APPLICATION.products.nlopt'   : '2.5.0'
-        'APPLICATION.products.cminpack': 'native'
-        'APPLICATION.products.PyFMI'   : {tag: '2.5',   base: 'no', section: 'version_2_5_no_pip'           }
-        'APPLICATION.products.netcdf'  : '4.6.2'
-        'APPLICATION.rm_products'      : ['mesa']
-        'APPLICATION.products.omniORB'   : '4.2.5'
-        'APPLICATION.products.omniORBpy' : '4.2.5'
-        'APPLICATION.products.ParaView'  : {tag: '5.9.0', base: 'no',  section: 'version_5_9_0_UB22_04', hpc: 'yes'}
-        'APPLICATION.products.root'      : {tag: '6.22.02', base: 'no',  section: 'version_6_22_02_UB22_04'}
-        'APPLICATION.products.medfile'   : {tag: '4.1.1', base: 'no',  section: 'version_4_1_1_UB22_04'}
+        'APPLICATION.products.opencv'      : '3.2.0'
+        'APPLICATION.products.nlopt'       : '2.5.0'
+        'APPLICATION.products.cminpack'    : 'native'
+        'APPLICATION.products.PyFMI'       : {tag: '2.5',   base: 'no', section: 'version_2_5_no_pip'}
+        'APPLICATION.products.netcdf'      : '4.6.2'
+        'APPLICATION.products.omniORB'     : '4.2.5'
+        'APPLICATION.products.omniORBpy'   : '4.2.5'
+        'APPLICATION.products.ParaView'    : {tag: '5.9.0',   base: 'no',  section: 'version_5_9_0_UB22_04', hpc: 'yes'}
+        'APPLICATION.products.root'        : {tag: '6.22.02', base: 'no',  section: 'version_6_22_02_UB22_04'}
+        'APPLICATION.products.medfile'     : {tag: '4.1.1',   base: 'no',  section: 'version_4_1_1_UB22_04'}
+        'APPLICATION.products.MEDCOUPLING' : {tag:'master',   base: 'no', section: 'version_V9_9_0_MPI_UB22_04', hpc: 'yes'}
+        'APPLICATION.products.HEXABLOCK'   : {tag:'master',   base: 'no', section: 'version_V9_9_0_UB22_04', hpc: 'no'}
+        'APPLICATION.products.SHAPER'      : {tag:'master',   base: 'no', section: 'version_V9_9_0_UB22_04', hpc: 'no'}
     }
     {
         # DB10:
@@ -274,4 +277,22 @@ __overwrite__ :
         '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
     }
+    {
+        __condition__ : "VARS.dist in ['FD36']"
+        'APPLICATION.products.opencv'    : '3.2.0'
+        'APPLICATION.products.omniORB'   : '4.2.5'
+        'APPLICATION.products.omniORBpy' : '4.2.5'
+        'APPLICATION.products.qwt'       : '6.1.6'
+        'APPLICATION.rm_products'      : ['mesa']
+        'APPLICATION.products.nlopt'   : '2.6.0'
+        'APPLICATION.products.numpy'     : {tag: '1.22.2',    base: 'no', section: 'version_1_22_2'              }
+        'APPLICATION.products.PyFMI'     : {tag: '2.5',    base: 'no', section: 'version_2_5_no_pip'             }
+        'APPLICATION.products.netcdf'  : '4.6.2'
+        'APPLICATION.products.ParaView'  : {tag: '5.9.0', base: 'no',  section: 'version_5_9_0_FD36', hpc: 'yes'}
+        'APPLICATION.products.root'      : {tag: '6.22.02', base: 'no',  section: 'version_6_22_02_FD36'}
+        'APPLICATION.products.medfile'   : {tag: '4.1.1', base: 'no',  section: 'version_4_1_1_FD36'}
+        'APPLICATION.products.MEDCOUPLING' : {tag:'master',   base: 'no', section: 'version_V9_9_0_MPI_FD36', hpc: 'yes'}
+        'APPLICATION.products.HEXABLOCK'   : {tag:'master',   base: 'no', section: 'version_V9_9_0_FD36', hpc: 'no'}
+        'APPLICATION.products.SHAPER'      : {tag:'master',   base: 'no', section: 'version_V9_9_0_FD36', hpc: 'no'}
+    }
 ]