From: Quentin Cozette <quentin.cozette@cea.fr>
Date: Mon, 26 Oct 2020 14:03:38 +0000 (+0100)
Subject: Align current native configuration to master one - use native qwt and improve system... 
X-Git-Tag: V9_6_0^2~28
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=300b5bfa9e9be223bbfaad5274a0fdb083b85c25;p=tools%2Fsat_salome.git

Align current native configuration to master one - use native qwt and improve system checking
---

diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf
index 858c61e..9454e4d 100644
--- a/applications/SALOME-master-native.pyconf
+++ b/applications/SALOME-master-native.pyconf
@@ -27,36 +27,26 @@ APPLICATION :
         # PREREQUISITES :
         alabaster : 'native'
         Babel : 'native'
-        # Previous master version : '1.58.0'
         boost : 'native'
-        CAS : 'V7_4_0p1'
+        CAS : 'CR740-SALOME-PATCH'
         certifi : 'native'
-        # Previous master version : '3.3.1'
         cgns : 'native'
         chardet : 'native'
         click : 'native'
-        # Previous master version : '3.12.1'
         cmake : 'native'
-        # Previous master version : '1.13.2'
         cppunit : 'native'
         cycler : 'native'
         Cython : 'native'
         dateutil : 'native'
         docutils : 'native'
-        # Previous master version : '1.8.14'
         doxygen : 'native'
-        # Previous master version : '3.3.4'
         eigen : 'native'
         embree : '3.3.0'
-        # Previous master version : '3.16.0'
         freeimage : 'native'
-        # Previous master version : '2.9.1'
         freetype : 'native'
-        # Previous master version : '1.4.0_4037312'
         gl2ps : 'native'
         # 'native' too difficult here : need python-pip package (gmsh-sdk) besides system packages
         gmsh : '4.1.4'
-        # Previous master version : '2.38.0'
         graphviz : 'native'
         hdf5 : '1.10.3'
         homard_bin : '11.12_hdf51103med410'
@@ -66,26 +56,20 @@ APPLICATION :
         ispc : '1.9.2'
         Jinja2 : 'native'
         kiwisolver : 'native'
-        # Previous master version : '3.8.0'
         lapack : 'native'
-        # Previous master version : '2.9.1'
         libxml2 : 'native'
-        # 'native' is conflicting : version 7 which needs a higher ispc version than above
         llvm : 'native'
         markupsafe : 'native'
         matplotlib : 'native'
-        medfile : '4.1.0'
-        # Previous master version : '13.0.6'
+        medfile : {section: 'default_Autotools', tag: '4.1.0'}
         mesa : 'native'
         MeshGems : '2.11-5'
-        # Previous master version : '5.1.0'
         metis : 'native'
         netgen : '5.3.1_with_CAS_7.2'
         nlopt : '2.4.2'
         numpy : 'native'
         omniORB : '4.2.2'
         omniORBpy : '4.2.2'
-        # Previous master version : '3.2.0'
         opencv : 'native'
         openssl : 'native'
         ospray : '1.8.4'
@@ -102,10 +86,9 @@ APPLICATION :
         Python : 'native'
         pytz : 'native'
         qt : 'native'
-        qwt : '6.1.2'
+        qwt : 'native'
         requests : 'native'
         scipy : 'native'
-        # Previous master version : '6.0.4' (too old for native metis)
         scotch : 'native'
         setuptools : 'native'
         sip : 'native'
@@ -116,11 +99,8 @@ APPLICATION :
         sphinxcontrib_websupport : 'native'
         sphinxintl: 'native'
         sphinx_rtd_theme : 'native'
-        # Previous master version : '3.0.12'
         swig : 'native'
-        # Previous master version : '4.4'
         tbb : 'native'
-        # 'native' isn't compliant with netgen5 on Debian
         tcl : 'native'
         tk : 'native'
         urllib3 : 'native'
@@ -131,9 +111,9 @@ APPLICATION :
         'SHAPER'
         'SHAPERSTUDY'
         'RESTRICTED'
-        'LIBBATCH' : {tag :'V2_4_3'}
+        'LIBBATCH' : {tag :'V2_4_4rc1'}
         'KERNEL'
-        'MEDCOUPLING'
+        'MEDCOUPLING' : {section: 'default_int64'}
         'GUI'
         'GEOM'
         'SMESH'
@@ -192,15 +172,9 @@ APPLICATION :
 __overwrite__ :
 [
    {
-      #
-      __condition__ : "VARS.dist in ['DB10']"
-      'PRODUCTS.embree.default.depend' : ['ispc']
-   }
-
-   {
-      # as agreed, we don't build SALOME with OSpray support.
-      __condition__ : "VARS.dist in ['FD30']"
-      'APPLICATION.rm_products' : ['embree', 'ispc', 'ospray']
+      # Overwrite dedicated to older distributions for a further native use
+      # (Some system packages are missing for now on CentOS 8)
+      __condition__ : "VARS.dist in ['FD32', 'DB10']"
       'APPLICATION.products.omniORB' : 'native'
       'APPLICATION.products.omniORBpy' : 'native'
    }
diff --git a/products/PyQt.pyconf b/products/PyQt.pyconf
index 1054ca2..6c265b9 100644
--- a/products/PyQt.pyconf
+++ b/products/PyQt.pyconf
@@ -7,9 +7,9 @@ default :
     system_info : 
     {
         rpm : ["python3-qt5"]
-        rpm_dev : []
+        rpm_dev : ["python3-qt5-devel"]
         apt : ["python3-pyqt5"]
-        apt_dev : []
+        apt_dev : ["pyqt5-dev"]
     }
     environ :
     {
diff --git a/products/Python.pyconf b/products/Python.pyconf
index 0812669..8e18b56 100755
--- a/products/Python.pyconf
+++ b/products/Python.pyconf
@@ -6,9 +6,11 @@ default :
     get_source : "archive"
     system_info : 
     {
-        rpm : ["python36"]
+        # Python is a mandatory part of current used Linux platforms, no need to check its presence therefore.
+        # As version of Python 3.x differs on each of them, a better solution would to eventually check the binary presence.
+        rpm : []
         rpm_dev : []
-        apt : ["python36"]
+        apt : []
         apt_dev : []
     }
     environ :
diff --git a/products/llvm.pyconf b/products/llvm.pyconf
index d125f9d..14ce5ae 100644
--- a/products/llvm.pyconf
+++ b/products/llvm.pyconf
@@ -6,10 +6,10 @@ default :
     get_source : "archive"
     system_info :
     {
-       rpm : ["llvm-toolset"]
-       rpm_dev : []
-       apt : []
-       apt_dev : []
+       rpm : []
+       rpm_dev : ["llvm-devel", "clang-devel"]
+       apt : ["clang"]
+       apt_dev : ["llvm-dev"]
     }
     environ :
     {
diff --git a/products/qwt.pyconf b/products/qwt.pyconf
index 1f8ff3c..036c221 100644
--- a/products/qwt.pyconf
+++ b/products/qwt.pyconf
@@ -4,6 +4,13 @@ default :
     build_source : "script"
     compil_script :  $name + $VARS.scriptExtension
     get_source : "archive"
+    system_info :
+    {
+       rpm : ["qwt-qt5"]
+       rpm_dev : ["qwt-qt5-devel"]
+       apt : ["libqwt-qt5"]
+       apt_dev : ["libqwt-qt5-dev"]
+    }
     environ :
     {
        env_script : $name + ".py"