spns #26766 : renommage de la section binaire de mesa, ajout champ platform

diff --git a/applications/SALOME-9.9.0-native.pyconf b/applications/SALOME-9.9.0-native.pyconf
index ec1ce90c1b00a77e95c649e23666c2ce7443622e..7ac0e1e656b21bda9a58561307d287fd296e55aa 100644 (file)
--- 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'
         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'
         MeshGems : '2.14-4'
         metis : 'native'
         mpi4py: 'native'

diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf
index ee1f94a75d828e538f0f6e4b7b94c162d3709a2f..587a2bc39f1f63bf2dd0336fc46a930f636ec9a8 100644 (file)
--- a/applications/SALOME-master-native.pyconf
+++ b/applications/SALOME-master-native.pyconf
@@ -11,6 +11,7 @@ APPLICATION :
     debug : 'no'
     base : 'no'
     python3 : 'yes'
     debug : 'no'
     base : 'no'
     python3 : 'yes'

+    platform : ["FD34", "FD34", "DB11", "DB10", "FD32", "UB22.04"]

     environ :
     {
         build :
     environ :
     {
         build :


@@ -74,7 +75,7 @@ APPLICATION :
         markupsafe : 'native'
         matplotlib : 'native'
         medfile : '4.1.1'
         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'
         MeshGems : '2.14-4'
         metis : 'native'
         mpi4py: 'native'

diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf
index c927cb693474d1cb5e7472165fd9188b2bd02c4f..80af2d77cf9f2ef407d564c6035f06a56f861c1c 100644 (file)
--- a/applications/SALOME-master.pyconf
+++ b/applications/SALOME-master.pyconf
@@ -11,6 +11,7 @@ APPLICATION :
     debug : 'no'
     base : 'no'
     python3 : 'yes'
     debug : 'no'
     base : 'no'
     python3 : 'yes'

+    platform : ["CO8", "DB9"]

     environ :
     {
         build : 
     environ :
     {
         build : 

diff --git a/products/compil_scripts/mesa-19.0.8-x86_64.sh b/products/compil_scripts/mesa-19.0.8-x86_64.sh
deleted file mode 100755 (executable)
index 1d59fed..0000000
--- a/products/compil_scripts/mesa-19.0.8-x86_64.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-echo "##########################################################################"
-echo "mesa" $VERSION
-echo "##########################################################################"
-
-echo "Installing binary version"
-if [ -d $PRODUCT_INSTALL ]; then
-    :
-else
-    mkdir -p $PRODUCT_INSTALL
-fi
-cp -r $SOURCE_DIR/* $PRODUCT_INSTALL
-
-echo
-echo "########## END"
-

diff --git a/products/compil_scripts/mesa-bin.sh b/products/compil_scripts/mesa-bin.sh
new file mode 100755 (executable)
index 0000000..1d59fed
--- /dev/null
+++ b/products/compil_scripts/mesa-bin.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+echo "##########################################################################"
+echo "mesa" $VERSION
+echo "##########################################################################"
+
+echo "Installing binary version"
+if [ -d $PRODUCT_INSTALL ]; then
+    :
+else
+    mkdir -p $PRODUCT_INSTALL
+fi
+cp -r $SOURCE_DIR/* $PRODUCT_INSTALL
+
+echo
+echo "########## END"
+

diff --git a/products/mesa.pyconf b/products/mesa.pyconf
index ed7bf5b43b3508bff1e32369af8fae359978d173..1c5545ff4de4566d020c79d2d4792dea9ed1a811 100644 (file)
--- a/products/mesa.pyconf
+++ b/products/mesa.pyconf
@@ -44,8 +44,7 @@ version_19_0_8_win:
   patches: []
 }
 
   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'

 }
 }