move back to master branch for SMESH/NETGENPLUGIN

[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 1d16fc0bd7ab37d4e468d0f1fbbd4b0c911d5997..5856fa44f37b6b9d0dad89f846d2c13d588c44fb 100644 (file)
--- a/applications/SALOME-9.7.0.pyconf
+++ b/applications/SALOME-9.7.0.pyconf
@@ -1,11 +1,11 @@
-s#!/usr/bin/env python
+#!/usr/bin/env python
 #-*- coding:utf-8 -*-
 
 APPLICATION :
 {
     name : 'SALOME-9.7.0'
     workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name + '-' + $VARS.dist
-    tag : 'V9_7_BR'
+    tag : 'V9_7_0'
     dev : 'no'
     verbose :'no'
     debug : 'no'
@@ -23,6 +23,7 @@ APPLICATION :
         launch : {PYTHONIOENCODING:"UTF_8", SALOME_MODULES_ORDER:"SHAPER:SHAPERSTUDY:GEOM:SMESH"}
         SALOME_trace : "local" # local/file:.../with_logger
         SALOME_MODULES : "SHAPER,SHAPERSTUDY,GEOM,SMESH,PARAVIS,YACS,JOBMANAGER"  # specify the first modules to display in gui
+        SALOME_ACTOR_DELEGATE_TO_VTK : '1'
     }
     products :
     {
@@ -30,7 +31,7 @@ APPLICATION :
         alabaster : '0.7.6'
         Babel : '2.7.0'
         boost : '1.71.0'
-        CAS : {tag: 'CR750-SALOME-PATCH', section: 'version_V7_5_0'}
+        CAS : {tag: 'V7_5_0p1', section: 'version_V7_5_0'}
         certifi : '2018.8.24'
         cgns : '4.1.1'
         chardet : '3.0.4'
@@ -69,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'
@@ -91,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'
@@ -114,7 +115,7 @@ APPLICATION :
         'SHAPER'
         'SHAPERSTUDY'
         'RESTRICTED'
-        'LIBBATCH' : {tag : 'V2_4_4'}
+        'LIBBATCH' : {tag : 'V2_4_5'}
         'KERNEL'
         'MEDCOUPLING'
         'GUI'
@@ -135,7 +136,7 @@ APPLICATION :
         'JOBMANAGER'
         'YACS'
         'YACSGEN'
-        'SOLVERLAB' : {tag: 'master'}
+        'SOLVERLAB'
         'DOCUMENTATION'
         'SAMPLES'
         'COMPONENT'
@@ -143,13 +144,13 @@ 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'}
-        'CEATESTBASE' : {tag: 'SalomeV9'}
+        'EFICAS'
+        'EFICAS_TOOLS'
+        'PY2CPP'
+        'ADAO'
+        'ADAO_INTERFACE'
+        'PARAVISADDONS'
+        'CEATESTBASE'
     }
     profile :
     {
@@ -179,25 +180,6 @@ __overwrite__ :
   {
    __condition__ : "VARS.dist in ['FD32']"
    # https://github.com/scipy/scipy/issues/11611
-    'APPLICATION.products.scipy' : '1.5.2'
-   # https://bugs.gentoo.org/708730 : llvm 8.0.1 build issue with gcc/clang 10.X
-    'PRODUCTS.llvm.version_8_0_1_clang.patches' : ['llvm-8.0.1-clang-FD32.patch']
-   #
-    'PRODUCTS.mesa.version_19_0_8.patches' : ['mesa-19.0.8-debug_symbol.patch']
-   #
-    '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']
+   'APPLICATION.products.scipy' : '1.5.2'
   }
 ]