From 542d5c218fe458add2cac7e6e2bbaf799075290b Mon Sep 17 00:00:00 2001 From: crouzet Date: Thu, 13 Oct 2022 10:53:49 +0200 Subject: [PATCH] spns #26766 : renommage de la section binaire de mesa, ajout champ platform --- applications/SALOME-9.9.0-native.pyconf | 2 +- applications/SALOME-master-native.pyconf | 3 ++- applications/SALOME-master.pyconf | 1 + .../compil_scripts/{mesa-19.0.8-x86_64.sh => mesa-bin.sh} | 0 products/mesa.pyconf | 5 ++--- 5 files changed, 6 insertions(+), 5 deletions(-) rename products/compil_scripts/{mesa-19.0.8-x86_64.sh => mesa-bin.sh} (100%) diff --git a/applications/SALOME-9.9.0-native.pyconf b/applications/SALOME-9.9.0-native.pyconf index ec1ce90..7ac0e1e 100644 --- a/applications/SALOME-9.9.0-native.pyconf +++ b/applications/SALOME-9.9.0-native.pyconf @@ -72,7 +72,7 @@ APPLICATION : markupsafe : 'native' matplotlib : 'native' medfile : '4.1.1' - mesa : {tag : '19.0.8', base: 'no', section: 'version_19_0_8_x86_64'} + mesa : {tag : '19.0.8-x86_64-'+$VARS.dist, base: 'no', section: 'version_bin'} MeshGems : '2.14-4' metis : 'native' mpi4py: 'native' diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf index ee1f94a..587a2bc 100644 --- a/applications/SALOME-master-native.pyconf +++ b/applications/SALOME-master-native.pyconf @@ -11,6 +11,7 @@ APPLICATION : debug : 'no' base : 'no' python3 : 'yes' + platform : ["FD34", "FD34", "DB11", "DB10", "FD32", "UB22.04"] environ : { build : @@ -74,7 +75,7 @@ APPLICATION : markupsafe : 'native' matplotlib : 'native' medfile : '4.1.1' - mesa : {tag : '19.0.8', base: 'no', section: 'version_19_0_8_x86_64'} + mesa : {tag : '19.0.8-x86_64-'+$VARS.dist, base: 'no', section: 'version_bin'} MeshGems : '2.14-4' metis : 'native' mpi4py: 'native' diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf index c927cb6..80af2d7 100644 --- a/applications/SALOME-master.pyconf +++ b/applications/SALOME-master.pyconf @@ -11,6 +11,7 @@ APPLICATION : debug : 'no' base : 'no' python3 : 'yes' + platform : ["CO8", "DB9"] environ : { build : diff --git a/products/compil_scripts/mesa-19.0.8-x86_64.sh b/products/compil_scripts/mesa-bin.sh similarity index 100% rename from products/compil_scripts/mesa-19.0.8-x86_64.sh rename to products/compil_scripts/mesa-bin.sh diff --git a/products/mesa.pyconf b/products/mesa.pyconf index ed7bf5b..1c5545f 100644 --- a/products/mesa.pyconf +++ b/products/mesa.pyconf @@ -44,8 +44,7 @@ version_19_0_8_win: patches: [] } -version_19_0_8_x86_64: +version_bin: { - compil_script: 'mesa-19.0.8-x86_64.sh' - archive_info : {archive_name : "mesa-19.0.8-x86_64-" + $VARS.dist + ".tar.gz"} + compil_script: 'mesa-bin.sh' } -- 2.30.2