From 9d6c911ce64942eef951dbfbf78528854ba8548b Mon Sep 17 00:00:00 2001 From: Nicolas OTTON Date: Tue, 26 Apr 2022 16:35:05 +0200 Subject: [PATCH] passage sur la branch 9_9_0 --- applications/SALOME-9.9.0-MPI.pyconf | 15 +++++++-------- applications/SALOME-9.9.0-native.pyconf | 9 ++++----- applications/SALOME-9.9.0-windows.pyconf | 7 +++---- applications/SALOME-9.9.0.pyconf | 9 ++++----- 4 files changed, 18 insertions(+), 22 deletions(-) diff --git a/applications/SALOME-9.9.0-MPI.pyconf b/applications/SALOME-9.9.0-MPI.pyconf index db5b5ab..de25b2e 100644 --- a/applications/SALOME-9.9.0-MPI.pyconf +++ b/applications/SALOME-9.9.0-MPI.pyconf @@ -8,8 +8,7 @@ APPLICATION : # ne pas oublier de rallumer lundi et bien fixer pour MEDCOUPLING, PARAVIS, etc. BIEN REGARDER LES FIXME!!! # Lundi: pour les FIXME: si la branch V9_9_BR existe, passer à la branch # si la branch n'existe pas, repasser sur la branch master - #tag : 'V9_9_BR' - tag : 'V9_9_0b1' + tag : 'V9_9_BR' dev : 'no' verbose :'no' debug : 'no' @@ -145,8 +144,8 @@ APPLICATION : 'SHAPERSTUDY' 'RESTRICTED' 'LIBBATCH' : {tag : 'V2_4_5'} - 'KERNEL' : {tag:'V9_9_0b1', base: 'no', section: 'version_V9_9_0_MPI', hpc: 'yes'} # FIXME - 'MEDCOUPLING' : {tag:'V9_9_0b1', base: 'no', section: 'version_V9_9_0_MPI', hpc: 'yes'} # FIXME + 'KERNEL' : {tag:'V9_9_BR', base: 'no', section: 'version_V9_9_0_MPI', hpc: 'yes'} + 'MEDCOUPLING' : {tag:'V9_9_BR', base: 'no', section: 'version_V9_9_0_MPI', hpc: 'yes'} 'GUI' 'GEOM' 'SMESH' @@ -157,13 +156,13 @@ APPLICATION : 'HYBRIDPLUGIN' 'HexoticPLUGIN' 'GMSHPLUGIN' - 'HEXABLOCK' : {tag:'V9_9_0b1', base: 'no', section: 'version_V9_9_0_MPI', hpc: 'yes'} # FIXME + 'HEXABLOCK' : {tag:'V9_9_BR', base: 'no', section: 'version_V9_9_0_MPI', hpc: 'yes'} 'HEXABLOCKPLUGIN' 'HOMARD' 'FIELDS' : {tag:'V9_9_0b1', base: 'no', section: 'version_V9_9_0_MPI', hpc: 'yes'} # FIXME 'OPENTURNS_SALOME': 'master' # FIXME 'PARAVIS' : {tag:'V9_9_0b1', base: 'no', section: 'version_V9_9_0_MPI', hpc: 'yes'} # FIXME - 'JOBMANAGER' : {tag:'V9_9_0b1', base: 'no', section: 'version_V9_9_0_MPI', hpc: 'yes'} # FIXME + 'JOBMANAGER' : {tag:'V9_9_BR', base: 'no', section: 'version_V9_9_0_MPI', hpc: 'yes'} # FIXME 'YACS' 'YACSGEN' 'SOLVERLAB' : {tag:'V9_9_0b1', base: 'no', section: 'version_V9_9_0_MPI', hpc: 'yes'} # FIXME @@ -174,8 +173,8 @@ APPLICATION : 'CALCULATOR' 'HELLO' 'PYHELLO' - 'EFICAS' : 'master' # FIXME - 'EFICAS_TOOLS' : 'master' # FIXME + 'EFICAS' : 'V9_9_0b1' # FIXME + 'EFICAS_TOOLS' : 'V9_9_0b1' # FIXME 'PY2CPP' 'ADAO' : 'V9_9_0b1' # FIXME 'ADAO_INTERFACE': 'master' # FIXME diff --git a/applications/SALOME-9.9.0-native.pyconf b/applications/SALOME-9.9.0-native.pyconf index c8ae6c9..14a09f7 100644 --- a/applications/SALOME-9.9.0-native.pyconf +++ b/applications/SALOME-9.9.0-native.pyconf @@ -6,8 +6,7 @@ APPLICATION : name : 'SALOME-9.9.0-native' workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name + '-' + $VARS.dist # ne pas oublier de rallumer lundi et bien fixer pour MEDCOUPLING, PARAVIS, etc. BIEN REGARDER LES FIXME!!! - #tag : 'V9_9_BR' - tag : 'V9_9_0b1' + tag : 'V9_9_BR' dev : 'no' verbose :'no' debug : 'no' @@ -145,7 +144,7 @@ APPLICATION : 'RESTRICTED' 'LIBBATCH' : {tag : 'V2_4_5'} 'KERNEL' - 'MEDCOUPLING' : {tag:'V9_9_0b1', base: 'no', section: 'version_V9_9_0_MPI', hpc: 'yes'} # FIXME + 'MEDCOUPLING' : {tag:'V9_9_BR', base: 'no', section: 'version_V9_9_0_MPI', hpc: 'yes'} 'GUI' 'GEOM' 'SMESH' @@ -173,8 +172,8 @@ APPLICATION : 'CALCULATOR' 'HELLO' 'PYHELLO' - 'EFICAS' : 'master' # FIXME - 'EFICAS_TOOLS' : 'master' # FIXME + 'EFICAS' : 'V9_9_0b1' # FIXME + 'EFICAS_TOOLS' : 'V9_9_0b1' # FIXME 'PY2CPP' 'ADAO' : 'V9_9_0b1' # FIXME 'ADAO_INTERFACE': 'master' # FIXME diff --git a/applications/SALOME-9.9.0-windows.pyconf b/applications/SALOME-9.9.0-windows.pyconf index 6f83fc5..ade612e 100644 --- a/applications/SALOME-9.9.0-windows.pyconf +++ b/applications/SALOME-9.9.0-windows.pyconf @@ -7,8 +7,7 @@ APPLICATION : workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name cmake_generator : 'Visual Studio 15 2017 Win64' # ne pas oublier de rallumer lundi et bien fixer pour MEDCOUPLING, PARAVIS, etc. BIEN REGARDER LES FIXME!!! - #tag : 'V9_9_BR' - tag : 'V9_9_0b1' + tag : 'V9_9_BR' dev : 'no' verbose : 'no' debug : 'no' @@ -166,8 +165,8 @@ APPLICATION : 'CALCULATOR' 'HELLO' 'PYHELLO' - 'EFICAS' : 'master' # FIXME - 'EFICAS_TOOLS' : 'master' # FIXME + 'EFICAS' : 'V9_9_0b1' # FIXME + 'EFICAS_TOOLS' : 'V9_9_0b1' # FIXME 'ADAO' : 'V9_9_0b1' # FIXME 'PARAVISADDONS' : 'V9_9_0b1' # FIXME 'pmml' : 'V9_9_0b1' # FIXME diff --git a/applications/SALOME-9.9.0.pyconf b/applications/SALOME-9.9.0.pyconf index 8ccf42f..a149fbe 100644 --- a/applications/SALOME-9.9.0.pyconf +++ b/applications/SALOME-9.9.0.pyconf @@ -6,8 +6,7 @@ APPLICATION : name : 'SALOME-9.9.0' workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name + '-' + $VARS.dist # ne pas oublier de rallumer lundi et bien fixer pour MEDCOUPLING, PARAVIS, etc. BIEN REGARDER LES FIXME!!! - #tag : 'V9_9_BR' - tag : 'V9_9_0b1' + tag : 'V9_9_BR' dev : 'no' verbose :'no' debug : 'no' @@ -144,7 +143,7 @@ APPLICATION : 'RESTRICTED' 'LIBBATCH' : {tag : 'V2_4_5'} 'KERNEL' - 'MEDCOUPLING' : {tag:'V9_9_0b1', base: 'no', section: 'version_V9_9_0_MPI', hpc: 'yes'} # FIXME + 'MEDCOUPLING' : {tag:'V9_9_BR', base: 'no', section: 'version_V9_9_0_MPI', hpc: 'yes'} 'GUI' 'GEOM' 'SMESH' @@ -172,8 +171,8 @@ APPLICATION : 'CALCULATOR' 'HELLO' 'PYHELLO' - 'EFICAS' : 'master' # FIXME - 'EFICAS_TOOLS' : 'master' # FIXME + 'EFICAS' : 'V9_9_0b1' # FIXME + 'EFICAS_TOOLS' : 'V9_9_0b1' # FIXME 'PY2CPP' 'ADAO' : 'V9_9_0b1' # FIXME 'ADAO_INTERFACE': 'master' # FIXME -- 2.39.2