From 929f81303d7d2512529ef183e1d79a7c282e8fc5 Mon Sep 17 00:00:00 2001 From: Nabil Ghodbane Date: Tue, 5 Apr 2022 17:12:03 +0200 Subject: [PATCH] test tag V9_9_0a2 --- applications/SALOME-master-native.pyconf | 15 ++++++++++----- applications/SALOME-master-windows.pyconf | 4 ++-- applications/SALOME-master.pyconf | 15 ++++++++++----- 3 files changed, 22 insertions(+), 12 deletions(-) diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf index 74ceb9a..afe2b49 100644 --- a/applications/SALOME-master-native.pyconf +++ b/applications/SALOME-master-native.pyconf @@ -5,7 +5,7 @@ APPLICATION : { name : 'SALOME-master-native' workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name + '-' + $VARS.dist - tag : 'master' + tag : 'V9_9_0a2' dev : 'no' verbose :'no' debug : 'no' @@ -132,7 +132,7 @@ APPLICATION : tbb : 'native' tcl : 'native' tk : 'native' - TopIIVolMesh: 'develop' + TopIIVolMesh urllib3 : 'native' zeromq: '4.3.1' URANIE : '4.5.0' @@ -145,7 +145,7 @@ APPLICATION : 'RESTRICTED' 'LIBBATCH' : {tag : 'V2_4_5'} 'KERNEL' - 'MEDCOUPLING' : {tag:'master', base: 'no', section: 'default_MPI', hpc: 'yes'} + 'MEDCOUPLING' : {tag:'V9_9_0a2', base: 'no', section: 'default_MPI', hpc: 'yes'} 'GUI' 'GEOM' 'SMESH' @@ -160,8 +160,8 @@ APPLICATION : 'HEXABLOCKPLUGIN' 'HOMARD' 'FIELDS' - 'PARAVIS': {tag:'master', base: 'no', section: 'default_MPI', hpc: 'yes'} 'OPENTURNS_SALOME' + 'PARAVIS': {tag:'V9_9_0a2', base: 'no', section: 'default_MPI', hpc: 'yes'} 'JOBMANAGER' 'YACS' 'YACSGEN' @@ -177,7 +177,7 @@ APPLICATION : 'EFICAS_TOOLS' 'PY2CPP' 'ADAO' - 'ADAO_INTERFACE' + 'ADAO_INTERFACE' : 'ce77875' #FIXME 'PARAVISADDONS' 'YDEFX' 'pmml' @@ -261,4 +261,9 @@ __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 } + { + # 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' + } ] diff --git a/applications/SALOME-master-windows.pyconf b/applications/SALOME-master-windows.pyconf index d19621b..deaa519 100644 --- a/applications/SALOME-master-windows.pyconf +++ b/applications/SALOME-master-windows.pyconf @@ -6,7 +6,7 @@ APPLICATION : name : 'SALOME-master' workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name cmake_generator : 'Visual Studio 15 2017 Win64' - tag : 'master' + tag : 'V9_9_0a2' dev : 'no' verbose :'no' debug : 'no' @@ -76,7 +76,7 @@ APPLICATION : matplotlib : '3.1.0' medfile : '4.1.1' mesa : '19.2.3' - MeshGems : '2.14-4' + MeshGems : '2.13-1' # FIXME: to be removed once CEA License for 2.14-4 is renewed. metis : '5.1.0' msvc : '2017' netgen : '6.2.2101' diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf index 76d7d52..d8f58f4 100644 --- a/applications/SALOME-master.pyconf +++ b/applications/SALOME-master.pyconf @@ -5,7 +5,7 @@ APPLICATION : { name : 'SALOME-master' workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name + '-' + $VARS.dist - tag : 'master' + tag : 'V9_9_0a2' dev : 'no' verbose :'no' debug : 'no' @@ -128,7 +128,7 @@ APPLICATION : tbb : '2019_U8' tcl : '8.6.0' tk : '8.6.0' - TopIIVolMesh: 'develop' + TopIIVolMesh urllib3 : '1.23' zeromq: '4.3.1' URANIE : '4.5.0' @@ -140,7 +140,7 @@ APPLICATION : 'RESTRICTED' 'LIBBATCH' : {tag : 'V2_4_5'} 'KERNEL' - 'MEDCOUPLING' : {tag:'master', base: 'no', section: 'default_MPI', hpc: 'yes'} + 'MEDCOUPLING' : {tag:'V9_9_0a2', base: 'no', section: 'default_MPI', hpc: 'yes'} 'GUI' 'GEOM' 'SMESH' @@ -156,7 +156,7 @@ APPLICATION : 'HOMARD' 'FIELDS' 'OPENTURNS_SALOME' - 'PARAVIS' : {tag:'master', base: 'no', section: 'default_MPI', hpc: 'yes'} + 'PARAVIS' : {tag:'V9_9_0a2', base: 'no', section: 'default_MPI', hpc: 'yes'} 'JOBMANAGER' 'YACS' 'YACSGEN' @@ -172,7 +172,7 @@ APPLICATION : 'EFICAS_TOOLS' 'PY2CPP' 'ADAO' - 'ADAO_INTERFACE' + 'ADAO_INTERFACE' : 'ce77875' #FIXME 'PARAVISADDONS' 'YDEFX' 'pmml' @@ -234,4 +234,9 @@ __overwrite__ : __condition__ : "VARS.dist in ['UB20.04']" 'APPLICATION.rm_products' : ['gcc', 'gmp', 'mpc', 'mpfr'] } + + { + __condition__ : "VARS.dist not in ['DB09', 'DB10', 'DB11']" + 'APPLICATION.products.MeshGems' : '2.13-1' + } ] -- 2.39.2