embed mesa 19.0.8 in archive

diff --git a/applications/SALOME-9.6.0-MPI.pyconf b/applications/SALOME-9.6.0-MPI.pyconf
index 9262173b9092979e4dd6074c11c5d37173359031..e052ab86bfaff3794249964e3531c0b50029bffb 100644 (file)
--- a/applications/SALOME-9.6.0-MPI.pyconf
+++ b/applications/SALOME-9.6.0-MPI.pyconf
@@ -177,6 +177,6 @@ __overwrite__ :
   {
     #
     __condition__ : "VARS.dist in ['UB20.04']"
   {
     #
     __condition__ : "VARS.dist in ['UB20.04']"

-      'APPLICATION.products.qt'    : {tag: '5.9.1', base: 'no', section: 'version_5_9_1_UB20_0_4'}
+      'APPLICATION.products.qt'    : {tag: '5.9.1', base: 'no', section: 'version_5_9_1_UB20_04'}

   }
 ]
   }
 ]

diff --git a/applications/SALOME-9.6.0.pyconf b/applications/SALOME-9.6.0.pyconf
index 7164315760f3b96e12ac7969f88bcad25aec0e3b..bebe629cf2e2a3eb7a71b380bc66cba8a646e553 100644 (file)
--- a/applications/SALOME-9.6.0.pyconf
+++ b/applications/SALOME-9.6.0.pyconf
@@ -225,7 +225,7 @@ __overwrite__ :
 
   {
     __condition__ : "VARS.dist in ['UB20.04']"
 
   {
     __condition__ : "VARS.dist in ['UB20.04']"

-    'APPLICATION.products.qt'       : {tag: '5.9.1', base: 'no', section: 'version_5_9_1_UB20_0_4' }
+    'APPLICATION.products.qt'       : {tag: '5.9.1', base: 'no', section: 'version_5_9_1_UB20_04' }

   }
 
 ]
   }
 
 ]

diff --git a/applications/SALOME-9.8.0-native.pyconf b/applications/SALOME-9.8.0-native.pyconf
index dedd8434637f35ed2f4300ed6a83e046c11d7c2b..3d4a4c825b2cbda0254195a48a381b651531e2a3 100644 (file)
--- a/applications/SALOME-9.8.0-native.pyconf
+++ b/applications/SALOME-9.8.0-native.pyconf
@@ -197,7 +197,7 @@ __overwrite__ :
         'APPLICATION.products.opencv'  : '3.2.0'
         'APPLICATION.products.cminpack': 'native'
         'APPLICATION.products.PyFMI'    : {tag: '2.5',   base: 'no', section: 'version_2_5_no_pip'                }
         'APPLICATION.products.opencv'  : '3.2.0'
         'APPLICATION.products.cminpack': 'native'
         'APPLICATION.products.PyFMI'    : {tag: '2.5',   base: 'no', section: 'version_2_5_no_pip'                }

-        'APPLICATION.products.ParaView' : {tag: '5.9.0', base: 'no', section: 'version_5_9_0_UB20_0_4'}
+        'APPLICATION.products.ParaView' : {tag: '5.9.0', base: 'no', section: 'version_5_9_0_UB20_04'             }

     }
     {
         # On DB10, ParaView fails to find xmlpatterns executable : ParaViewClient.cmake try to find it
     }
     {
         # On DB10, ParaView fails to find xmlpatterns executable : ParaViewClient.cmake try to find it

diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf
index 3d91d891f3d12219866dc4cfc0881917a4c7c6b1..2b773c7377895e0cf107ede5af9f8cf782d60586 100644 (file)
--- a/applications/SALOME-master-native.pyconf
+++ b/applications/SALOME-master-native.pyconf
@@ -77,7 +77,7 @@ APPLICATION :
         markupsafe : 'native'
         matplotlib : 'native'
         medfile : '4.1.1'
         markupsafe : 'native'
         matplotlib : 'native'
         medfile : '4.1.1'

-        mesa : 'native'
+        mesa : {tag : '19.0.8', base: 'no', section: 'version_19_0_8_x86_64'}

         MeshGems : '2.14-4'
         metis : 'native'
         mpi4py: 'native'
         MeshGems : '2.14-4'
         metis : 'native'
         mpi4py: 'native'


@@ -200,7 +200,7 @@ APPLICATION :
     }
     properties :
     {
     }
     properties :
     {

-        mesa_launcher_in_package : "no"
+        mesa_launcher_in_package : "yes"

         repo_dev : "yes"
         pip : 'yes'
         pip_install_dir : 'python'
         repo_dev : "yes"
         pip : 'yes'
         pip_install_dir : 'python'

diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf
index d062eb1b3e930ad35ab6275e37c8d7bee89e9e23..1a5635a6c8002c7b55001d12e6e46266ffaad1c6 100644 (file)
--- a/applications/SALOME-master.pyconf
+++ b/applications/SALOME-master.pyconf
@@ -236,7 +236,7 @@ __overwrite__ :
     {
         __condition__ : "VARS.dist in ['UB20.04']"
         'APPLICATION.rm_products' : ['gcc', 'gmp', 'mpc', 'mpfr']
     {
         __condition__ : "VARS.dist in ['UB20.04']"
         'APPLICATION.rm_products' : ['gcc', 'gmp', 'mpc', 'mpfr']

-        'APPLICATION.products.gdal': {tag:'2.4.0',   base: 'no', section: 'version_2_4_0_UB20_0_4'} # spns #29324
+        'APPLICATION.products.gdal': {tag:'2.4.0',   base: 'no', section: 'version_2_4_0_UB20_04'} # spns #29324

     }
 
     {
     }
 
     {

diff --git a/products/ParaView.pyconf b/products/ParaView.pyconf
index c696870dd85842e42190bd058364cba1f8de11b5..101c11eb42d49c660f46da041f7decb1c0c9c636 100755 (executable)
--- a/products/ParaView.pyconf
+++ b/products/ParaView.pyconf
@@ -261,7 +261,7 @@ version_5_9_0_FD32 :
               ]
 }
 
               ]
 }
 

-version_5_9_0_UB20_0_4 :
+version_5_9_0_UB20_04 :

 {
     compil_script :  'ParaView-5.9.0.sh'
     archive_info : {archive_name : "ParaView-5.9.0-lata.tar.gz"}
 {
     compil_script :  'ParaView-5.9.0.sh'
     archive_info : {archive_name : "ParaView-5.9.0-lata.tar.gz"}

diff --git a/products/gdal.pyconf b/products/gdal.pyconf
index 628ea0e366d1d6aca23052a3b36d80bcefdaec58..a04959ffb083326870afee4cfa6492bf94dbc726 100644 (file)
--- a/products/gdal.pyconf
+++ b/products/gdal.pyconf
@@ -65,7 +65,7 @@ version_2_4_0_DB10:
               ]
 }
 
               ]
 }
 

-version_2_4_0_UB20_0_4:
+version_2_4_0_UB20_04:

 {
     compil_script :  'gdal-2.4.0.sh'
     patches : ["gdal.0001-r2000.patch",
 {
     compil_script :  'gdal-2.4.0.sh'
     patches : ["gdal.0001-r2000.patch",

diff --git a/products/mesa.pyconf b/products/mesa.pyconf
index 5f76a9d8a02f11a680d6aa288294104db1b2c740..ed7bf5b43b3508bff1e32369af8fae359978d173 100644 (file)
--- a/products/mesa.pyconf
+++ b/products/mesa.pyconf
@@ -43,3 +43,9 @@ version_19_0_8_win:
 {
   patches: []
 }
 {
   patches: []
 }

+
+version_19_0_8_x86_64:
+{
+  compil_script: 'mesa-19.0.8-x86_64.sh'
+  archive_info : {archive_name : "mesa-19.0.8-x86_64-" + $VARS.dist + ".tar.gz"}
+}

diff --git a/products/qt.pyconf b/products/qt.pyconf
index 7b44107d0df45d5d01790127910f647ca6ceafd2..dccf7f2ec949bccbcd5d54aeab73d1d93126a291 100644 (file)
--- a/products/qt.pyconf
+++ b/products/qt.pyconf
@@ -65,7 +65,7 @@ version_5_9_1_FD32 :
            ]
 }
 
            ]
 }
 

-version_5_9_1_UB20_0_4 :
+version_5_9_1_UB20_04 :

 {
   compil_script :  "qt-5.9.1.sh"
   patches : ['qt-5.9.1-UB20-FD32-socketcanbackend.patch',
 {
   compil_script :  "qt-5.9.1.sh"
   patches : ['qt-5.9.1-UB20-FD32-socketcanbackend.patch',