From: Nabil Ghodbane Date: Fri, 12 May 2023 15:26:11 +0000 (+0200) Subject: move back to master branch for SALOME builds X-Git-Tag: V9_11_0~31 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=9afdae4487126204e54627cf393bb35c93e1db88;p=tools%2Fsat_salome.git move back to master branch for SALOME builds --- diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf index 95d3dd0..1ea1cc3 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 : 'V9_11_0a2' + tag : 'master' dev : 'no' verbose :'no' debug : 'no' @@ -145,7 +145,7 @@ APPLICATION : 'RESTRICTED' 'LIBBATCH' : 'V2_4_6' 'KERNEL' - 'MEDCOUPLING' : {tag:'V9_11_0a2', base: 'no', section: 'default_MPI', hpc: 'yes'} + 'MEDCOUPLING' : {tag:'master', base: 'no', section: 'default_MPI', hpc: 'yes'} 'GUI' 'GEOM' 'SMESH' @@ -159,7 +159,7 @@ APPLICATION : 'HEXABLOCKPLUGIN' 'HOMARD' 'FIELDS' - 'PARAVIS': {tag:'V9_11_0a2', base: 'no', section: 'default_MPI', hpc: 'yes'} + 'PARAVIS': {tag:'master', base: 'no', section: 'default_MPI', hpc: 'yes'} 'JOBMANAGER' 'YACS' 'YACSGEN' diff --git a/applications/SALOME-master-windows.pyconf b/applications/SALOME-master-windows.pyconf index d757e35..416a8fd 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 : 'V9_11_0a2' + tag : 'master' dev : 'no' verbose : 'no' debug : 'no' diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf index f1c7866..16ceae6 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 : 'V9_11_0a2' + tag : 'master' dev : 'no' verbose :'no' debug : 'no' @@ -148,7 +148,7 @@ APPLICATION : 'RESTRICTED' 'LIBBATCH' : 'V2_4_6' 'KERNEL' - 'MEDCOUPLING' : {tag:'V9_11_0a2', base: 'no', section: 'default_MPI', hpc: 'yes'} + 'MEDCOUPLING' : {tag:'master', base: 'no', section: 'default_MPI', hpc: 'yes'} 'GUI' 'GEOM' 'SMESH' @@ -162,7 +162,7 @@ APPLICATION : 'HEXABLOCKPLUGIN' 'HOMARD' 'FIELDS' - 'PARAVIS' : {tag:'V9_11_0a2', base: 'no', section: 'default_MPI', hpc: 'yes'} + 'PARAVIS' : {tag:'master', base: 'no', section: 'default_MPI', hpc: 'yes'} 'JOBMANAGER' 'YACS' 'YACSGEN' @@ -182,7 +182,7 @@ APPLICATION : 'OPENTURNS_SALOME' 'YDEFX' 'pmml' - 'SOLVERLAB' : {tag: 'V9_11_0a2', base: 'no', section: 'default_MPI', hpc: 'yes'} + 'SOLVERLAB' : {tag: 'master', base: 'no', section: 'default_MPI', hpc: 'yes'} 'SOLVERLABGUI' 'TopIIVolMesh' #'TESTBASE'