move to SALOME-9.7.0 rc2 tag

[tools/sat_salome.git] / applications / SALOME-9.7.0.pyconf

diff --git a/applications/SALOME-9.7.0.pyconf b/applications/SALOME-9.7.0.pyconf
index 6575602f685a19151c9989e05e446bde8f713df0..08e5c5327d3fc0149d2b6194b930a947984bb306 100644 (file)
--- a/applications/SALOME-9.7.0.pyconf
+++ b/applications/SALOME-9.7.0.pyconf
@@ -5,7 +5,7 @@ APPLICATION :
 {
     name : 'SALOME-9.7.0'
     workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name + '-' + $VARS.dist
-    tag : 'V9_7_BR'
+    tag : 'V9_7_0rc2'
     dev : 'no'
     verbose :'no'
     debug : 'no'
@@ -70,7 +70,6 @@ APPLICATION :
         omniORB : '4.2.2'
         omniORBpy : '4.2.2'
         opencv : '3.2.0'
-        openssl : "native"
         openturns: '1.16'
         openVKL: '0.11.0'
         ospray : '2.4.0'
@@ -92,6 +91,7 @@ APPLICATION :
         requests : '2.19.1'
         rkCommon : '1.5.1'
         root: '6.22.02'
+        salome_system : 'native'
         scipy : '1.4.1'
         scotch : '6.0.4'
         setuptools : '38.4.0'
@@ -115,7 +115,7 @@ APPLICATION :
         'SHAPER'
         'SHAPERSTUDY'
         'RESTRICTED'
-        'LIBBATCH' : {tag : 'V2_4_4'}
+        'LIBBATCH' : {tag : 'V2_4_5rc1'}
         'KERNEL'
         'MEDCOUPLING'
         'GUI'
@@ -144,12 +144,12 @@ APPLICATION :
         'CALCULATOR'
         'HELLO'
         'PYHELLO'
-        'EFICAS' : {tag : 'V9_7_0b1'}
-        'EFICAS_TOOLS' : {tag : 'V9_7_0b1'}
-        'PY2CPP' : {tag: 'v2.0'}
-        'ADAO' : {tag : 'V9_7_0b1'}
-        'ADAO_INTERFACE' : {tag : 'V9_7_0b1'}
-        'PARAVISADDONS' : {tag : 'master'}
+        'EFICAS'
+        'EFICAS_TOOLS'
+        'PY2CPP'
+        'ADAO'
+        'ADAO_INTERFACE'
+        'PARAVISADDONS'
         'CEATESTBASE' : {tag: 'SalomeV9'}
     }
     profile :
@@ -188,17 +188,4 @@ __overwrite__ :
    #
     'PRODUCTS.qt.version_5_12_10.patches' : ['qt-mapbox-FD32.patch']
   }
-  {
-   __condition__ : "APPLICATION.debug == 'yes'"
-   # https://cplusplus.com/forum/general/250854 : DEBUG symbol is defined twice, need an additional patch
-    'PRODUCTS.ParaView.version_5_9_0.patches' : ['paraview.0003-ParaViewClient.patch',
-                                                 'paraview.0004-ParaView_hdf5.patch',
-                                                 'paraview.0005-ParaView_find_cgns.patch',
-                                                 'paraview.0006-ParaView_find_libxml2.patch',
-                                                 'paraview.0007-ParaView_find_freetype.patch',
-                                                 'paraview.0010-ParaView_CATALYST_cmake.patch',
-                                                 'paraview.0008-ParaView_coincident_rendering.patch',
-                                                 'paraview.0015-Paraview_VTKM_ioss.patch',
-                                                 'paraview.0011-ParaView_protobuf_crash.patch']
-  }
 ]