From: Nabil Ghodbane <nabil.ghodbane@cea.fr>
Date: Fri, 28 Oct 2022 15:43:41 +0000 (+0200)
Subject: spns #32755 : TopIIVolMesh: move back to master branch
X-Git-Tag: V9_11_0~206
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=23ee51b59c787fdc576ea62880269a6006bb2172;p=tools%2Fsat_salome.git

spns #32755 : TopIIVolMesh: move back to master branch
---

diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf
index 5666f01..e37a4f9 100644
--- a/applications/SALOME-master-native.pyconf
+++ b/applications/SALOME-master-native.pyconf
@@ -181,7 +181,7 @@ APPLICATION :
         'YDEFX'
         'pmml'
         'SOLVERLAB'
-        'TopIIVolMesh' : 'develop'
+        'TopIIVolMesh'
         #'TESTBASE'
         'CEATESTBASE' : 'SalomeV9'
     }
@@ -235,7 +235,6 @@ __overwrite__ :
         #   - Qt minimal version 5.12
         #   - xmlpatterns executable
         __condition__ : "VARS.dist in ['DB10']"
-        'APPLICATION.products.TopIIVolMesh'    : 'master'
         'APPLICATION.products.opencv'   : '3.2.0'
         'APPLICATION.products.cminpack' : 'native'
         'APPLICATION.products.PyFMI'    : {tag:'2.6',     base: 'no',  section: 'version_2_6_no_pip'                  }
diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf
index 5579f07..5cdcd57 100644
--- a/applications/SALOME-master.pyconf
+++ b/applications/SALOME-master.pyconf
@@ -183,7 +183,7 @@ APPLICATION :
         'YDEFX'
         'pmml'
         'SOLVERLAB' : {tag:'master', base: 'no', section: 'default_MPI', hpc: 'yes'}
-        'TopIIVolMesh' : 'develop'
+        'TopIIVolMesh'
         #'TESTBASE'
         'CEATESTBASE' : 'SalomeV9'
     }
@@ -228,16 +228,10 @@ __overwrite__ :
         'APPLICATION.products.gdal'     : {tag:'2.4.0',   base: 'no', section: 'version_2_4_0_CO8'                 } # spns #29324
         'APPLICATION.products.ParaView' : {tag: '5.11.0', base: 'no', section: 'version_5_11_0_MPI_CO8', hpc: 'yes'}
     }
-    {
-        __condition__ : "VARS.dist in ['DB09']"
-        'APPLICATION.products.TopIIVolMesh' : 'master'
-    }
     {
         __condition__ : "VARS.dist in ['DB10']"
         'APPLICATION.rm_products' : ['gcc', 'gmp', 'mpc', 'mpfr']
         'APPLICATION.products.gdal': {tag:'2.4.0',   base: 'no', section: 'version_2_4_0_DB10'} # spns #29324
-        'APPLICATION.products.SMESH' : 'master'
-        'APPLICATION.products.NETGENPLUGIN' : 'master'
     }
     {
         __condition__ : "VARS.dist in ['UB18.04']"