align SALOME master on SALOME 9.8.0

diff --git a/applications/SALOME-master-MPI.pyconf b/applications/SALOME-master-MPI.pyconf
index ccc6177315e32ff5423b18c39e55e21b354decad..ee8517ea7d9602ff169ba6a98b7757cac86bc446 100644 (file)
--- a/applications/SALOME-master-MPI.pyconf
+++ b/applications/SALOME-master-MPI.pyconf
@@ -15,10 +15,10 @@ APPLICATION :
     {
         build : 
         {
-           CONFIGURATION_ROOT_DIR : $workdir + $VARS.sep + "SOURCES" + $VARS.sep + "CONFIGURATION"
-           RESTRICTED_ROOT_DIR : $workdir + $VARS.sep + "SOURCES" + $VARS.sep + "RESTRICTED"
-           SALOME_USE_64BIT_IDS : '1'
-           VTK_SMP_IMPLEMENTATION_TYPE : OpenMP # OpenMP # choose among: sequential / OpenMP / TBB switches
+            CONFIGURATION_ROOT_DIR : $workdir + $VARS.sep + "SOURCES" + $VARS.sep + "CONFIGURATION"
+            RESTRICTED_ROOT_DIR : $workdir + $VARS.sep + "SOURCES" + $VARS.sep + "RESTRICTED"
+            SALOME_USE_64BIT_IDS : '1'
+            VTK_SMP_IMPLEMENTATION_TYPE : OpenMP # OpenMP # choose among: sequential / OpenMP / TBB switches
         }
         launch : {PYTHONIOENCODING:"UTF_8", SALOME_MODULES_ORDER:"SHAPER:SHAPERSTUDY:GEOM:SMESH"}
         SALOME_trace : "local" # local/file:.../with_logger
@@ -31,7 +31,7 @@ APPLICATION :
         alabaster : '0.7.6'
         Babel : '2.7.0'
         boost : '1.71.0'
-        CAS : {tag: 'b08cd044f9', section: 'version_7_5_3p1'}
+        CAS : {tag: 'V7_5_3p1', section: 'version_V7_5_3p1'}
         certifi : '2018.8.24'
         cgns : {tag : '4.1.1', hpc : 'yes'}
         chardet : '3.0.4'
@@ -127,7 +127,7 @@ APPLICATION :
         'SHAPER'
         'SHAPERSTUDY'
         'RESTRICTED'
-        'LIBBATCH' : {tag :'V2_4_5'}
+        'LIBBATCH' : {tag : 'V2_4_5'}
         'KERNEL' : {section : 'default_MPI', verbose : 'yes'}
         'MEDCOUPLING' : {section : 'default_MPI', verbose : 'yes'}
         'GUI' : {verbose : 'yes'}
@@ -162,8 +162,9 @@ APPLICATION :
         'ADAO'
         'ADAO_INTERFACE'
         'PARAVISADDONS'
-        'TESTBASE'
-        'CEATESTBASE' : {tag: 'SalomeV9'}
+        'YDEFX'
+        'TESTBASE': {tag: 'master'}
+        'CEATESTBASE' : {tag: 'SSL'}
     }
     profile :
     {
@@ -190,18 +191,18 @@ APPLICATION :
 }
 __overwrite__ :
 [
-  {
-   __condition__ : "VARS.dist in ['FD32']"
-   # https://github.com/scipy/scipy/issues/11611
-   'APPLICATION.products.scipy' : '1.5.2'
-  }
-  {
-   __condition__ : "VARS.dist in ['FD30']"
-   # https://github.com/scipy/scipy/issues/11611
-   'APPLICATION.products.gcc' : '9.3.0'
-  }
-  {
-   __condition__ : "VARS.dist not in ['DB08','DB09', 'FD30']"
-   'APPLICATION.rm_products' : ['gcc', 'gmp', 'mpc', 'mpfr']
-  }
+    {
+        __condition__ : "VARS.dist in ['FD32']"
+        # https://github.com/scipy/scipy/issues/11611
+        'APPLICATION.products.scipy' : '1.5.2'
+    }
+    {
+        __condition__ : "VARS.dist in ['FD30']"
+        # https://github.com/scipy/scipy/issues/11611
+        'APPLICATION.products.gcc' : '9.3.0'
+    }
+    {
+        __condition__ : "VARS.dist not in ['DB08','DB09', 'FD30']"
+        'APPLICATION.rm_products' : ['gcc', 'gmp', 'mpc', 'mpfr']
+    }
 ]

diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf
index 6ccc5408f5527f5b885ca67652b1bae220b3a0af..02588e629a11de960e6ce43bf1781df38ac5e795 100644 (file)
--- a/applications/SALOME-master-native.pyconf
+++ b/applications/SALOME-master-native.pyconf
@@ -15,10 +15,10 @@ APPLICATION :
     {
         build :
         {
-           CONFIGURATION_ROOT_DIR : $workdir + $VARS.sep + "SOURCES" + $VARS.sep + "CONFIGURATION"
-           RESTRICTED_ROOT_DIR : $workdir + $VARS.sep + "SOURCES" + $VARS.sep + "RESTRICTED"
-           SALOME_USE_64BIT_IDS : '1'
-           VTK_SMP_IMPLEMENTATION_TYPE : 'OpenMP' # OpenMP # choose among: sequential / OpenMP / TBB switches
+            CONFIGURATION_ROOT_DIR : $workdir + $VARS.sep + "SOURCES" + $VARS.sep + "CONFIGURATION"
+            RESTRICTED_ROOT_DIR : $workdir + $VARS.sep + "SOURCES" + $VARS.sep + "RESTRICTED"
+            SALOME_USE_64BIT_IDS : '1'
+            VTK_SMP_IMPLEMENTATION_TYPE : OpenMP # OpenMP # choose among: sequential / OpenMP / TBB switches
         }
         launch : {PYTHONIOENCODING:"UTF_8"} # alternative is to encode every accentued string with .encode('utf-8')
         SALOME_trace : "local" # local/file:.../with_logger
@@ -68,7 +68,7 @@ APPLICATION :
         llvm : 'native'
         markupsafe : 'native'
         matplotlib : 'native'
-        medfile : {section: 'default_Autotools', tag: '4.1.1rc1'}
+        medfile : {section: 'default_Autotools', tag: '4.1.1'}
         mesa : 'native'
         MeshGems : '2.13-1'
         metis : 'native'
@@ -127,7 +127,7 @@ APPLICATION :
         'SHAPER'
         'SHAPERSTUDY'
         'RESTRICTED'
-        'LIBBATCH' : {tag :'V2_4_5'}
+        'LIBBATCH' : {tag : 'V2_4_5'}
         'KERNEL'
         'MEDCOUPLING'
         'GUI'
@@ -162,8 +162,9 @@ APPLICATION :
         'ADAO'
         'ADAO_INTERFACE'
         'PARAVISADDONS'
-        'TESTBASE'
-        'CEATESTBASE' : {tag: 'SalomeV9'}
+        'YDEFX'
+        'TESTBASE': {tag: 'master'}
+        'CEATESTBASE' : {tag: 'SSL'}
     }
     profile :
     {
@@ -181,7 +182,7 @@ APPLICATION :
     }
     properties :
     {
-        mesa_launcher_in_package : "yes"
+        mesa_launcher_in_package : "no"
         repo_dev : "yes"
         pip : 'yes'
         pip_install_dir : 'python'
@@ -190,82 +191,56 @@ APPLICATION :
 }
 __overwrite__ :
 [
-   {
-      # Although recent adaptations of GEOM CMake procedure to be compliant with openCV 4.X, some
-      # deeper investigations need to be done in its sources. Use embedded openCV product where
-      # native one is 4.X.
-      __condition__ : "VARS.dist in ['FD32', 'UB20.04', 'FD34']"
-      'APPLICATION.products.opencv' : '3.2.0'
-   }
-   {
-      #
-      __condition__ : "VARS.dist in ['UB20.04', 'CO8', 'FD32']"
-      'PRODUCTS.ParaView.version_5_9_0.patches' : ['paraview.0003-ParaViewClient.patch',
-                                                   'paraview.0005-ParaView_find_cgns.patch',
-                                                   'paraview.0010-ParaView_CATALYST_cmake.patch',
-                                                   'paraview.0008-ParaView_coincident_rendering.patch',
-                                                   'paraview.0017-ParaView_protobuf_crash.patch',
-                                                   'paraview.0015-Paraview_VTKM_ioss.patch'
-                                                   'paraview.0018-spns-26351-autoconvert.patch',
-                                                   'paraview.0019-spns-26344-VTK-OpenMP.patch'
-                                                  ]
-   }
-   {
-      # On DB10, ParaView fails to find xmlpatterns executable : ParaViewClient.cmake try to find it
-      # from Qt5_DIR, going back from it in filesystem (hardcoded).
-      # The standard patch is also needed to be able to build PARAVIS (same kind of issue).
-      # What is more, ParaView 5.9 CMake procedure requires Qt 5.12 as minimum version (5.11 here).
-      # As this version is compliant too, let's force it as the new minimum needed version.
-      __condition__ : "VARS.dist in ['DB10']"
-      'PRODUCTS.ParaView.version_5_9_0.patches' : ['paraview.0003-ParaViewClient.patch',
-                                                   'paraview.0005-ParaView_find_cgns.patch',
-                                                   'paraview-5.9_qt-minimum-version.patch',
-                                                   'paraview.0003-ParaViewClient_native.patch',
-                                                   'paraview.0010-ParaView_CATALYST_cmake.patch',
-                                                   'paraview.0008-ParaView_coincident_rendering.patch',
-                                                   'paraview.0017-ParaView_protobuf_crash.patch',
-                                                   'paraview.0015-Paraview_VTKM_ioss.patch'
-                                                   'paraview.0018-spns-26351-autoconvert.patch',
-                                                   'paraview.0019-spns-26344-VTK-OpenMP.patch'
-                                                  ]
-   }
-   {
-      # CentOS 8 repositories don't include sphinxintl package which must be installed through pip.
-      # To avoid its missing (system_info pyconf key doesn't handle this use case), we embed it.
-      __condition__ : "VARS.dist in ['CO8']"
-      'APPLICATION.products.sphinxintl' : '0.9.10'
-      'PRODUCTS.sphinxintl.default.properties.pip' : "no"
-      'APPLICATION.products.cmake' : '3.12.1'
-   }
-   {
-      # FD 34 qt5 package is qt5-qtbase-devel.
-      __condition__ : "VARS.dist in ['FD34']"
-      'APPLICATION.products.omniORB'  : '4.2.4'
-      'APPLICATION.products.omniORBpy': '4.2.4'
-      'PRODUCTS.root.version_6_22_02.patches' : ['root-6.22.02.patch', 'root-6.22.02-gcc-11.0.patch']
-      'PRODUCTS.qt.default.system_info.rpm' : []
-      'PRODUCTS.qt.default.system_info.rpm_dev' : ["qt5-qtbase-devel"]
-      'PRODUCTS.PyFMI.version_2_5.properties.pip' : "no"
-      'PRODUCTS.PyFMI.version_2_5.compil_script' : "PyFMI-2.5.sh"
-   }
-   {
-     __condition__ : "VARS.dist in ['FD32']"
-      'PRODUCTS.PyFMI.version_2_5.properties.pip' : "no"
-      'PRODUCTS.PyFMI.version_2_5.compil_script' : "PyFMI-2.5.sh"
-   }
-   {
-     __condition__ : "VARS.dist in ['DB10', 'UB20.04']"
-      'APPLICATION.products.cminpack': 'native'
-      'PRODUCTS.PyFMI.version_2_5.properties.pip' : "no"
-      'PRODUCTS.PyFMI.version_2_5.compil_script' : "PyFMI-2.5.sh"
-   }
-   {
-     __condition__ : "VARS.dist in ['CO8']"
-      'APPLICATION.products.statsmodels' :  '0.6.1'  # will fail otherwise -  0.8.0 does not match Cython.
-      'APPLICATION.products.cminpack': '1.3.6'
-      'PRODUCTS.PyFMI.version_2_5.properties.pip' : "no"
-      'PRODUCTS.PyFMI.version_2_5.compil_script' : "PyFMI-2.5.sh"
-      'PRODUCTS.statsmodels.version_0_6_1.properties.pip' : "no"
-      'PRODUCTS.statsmodels.version_0_6_1.compil_script' : "statsmodels-0.6.1.sh"
-   }
+    {
+        # Although recent adaptations of GEOM CMake procedure to be compliant with openCV 4.X, some
+        # deeper investigations need to be done in its sources. Use embedded openCV product where
+        # native one is 4.X.
+        __condition__ : "VARS.dist in ['FD32', 'UB20.04', 'FD34']"
+        'APPLICATION.products.opencv' : '3.2.0'
+    }
+    {
+        #
+        __condition__ : "VARS.dist in ['UB20.04', 'CO8', 'FD32']"
+       'APPLICATION.products.ParaView' : {tag: '5.9.0', base: 'no', section: 'version_5_9_0_CO8_FD32_UB20_0_4'}
+    }
+    {
+        # On DB10, ParaView fails to find xmlpatterns executable : ParaViewClient.cmake try to find it
+        # from Qt5_DIR, going back from it in filesystem (hardcoded).
+        # The standard patch is also needed to be able to build PARAVIS (same kind of issue).
+        # What is more, ParaView 5.9 CMake procedure requires Qt 5.12 as minimum version (5.11 here).
+        # As this version is compliant too, let's force it as the new minimum needed version.
+        __condition__ : "VARS.dist in ['DB10']"
+        'APPLICATION.products.ParaView' : {tag: '5.9.0', base : 'no', section: 'version_5_9_0_DB10'}
+    }
+    {
+        # CentOS 8 repositories don't include sphinxintl package which must be installed through pip.
+        # To avoid its missing (system_info pyconf key doesn't handle this use case), we embed it.
+        __condition__ : "VARS.dist in ['CO8']"
+        'APPLICATION.products.sphinxintl' : {tag: '0.9.10', base: 'no', section: 'version_0_9_10_no_pip'}
+        'APPLICATION.products.cmake' : '3.12.1'
+    }
+    {
+        __condition__ : "VARS.dist in ['FD32']"
+        'APPLICATION.products.PyFMI'     : {tag:'2.5',  base:  'no', section: 'version_2_5_no_pip'}
+        'APPLICATION.products.openturns' : {tag:'1.17', base:  'no', section: 'version_1_17_FD32' }
+    }
+    {
+        # FD 34 qt5 package is qt5-qtbase-devel.
+        __condition__ : "VARS.dist in ['FD34']"
+        'APPLICATION.products.omniORB'  : '4.2.4'
+        'APPLICATION.products.omniORBpy': '4.2.4'
+        'APPLICATION.products.PyFMI'    : {tag: '2.5',    base: 'no', section: 'version_2_5_no_pip'  }
+        'APPLICATION.products.root'     : {tag:'6.22.02', base: 'no', section: 'version_6_22_02_FD34'}
+    }
+    {
+        __condition__ : "VARS.dist in ['DB10', 'UB20.04']"
+        'APPLICATION.products.cminpack': 'native'
+        'APPLICATION.products.PyFMI'    : {tag:'2.5', base: 'no', section: 'version_2_5_no_pip'}
+    }
+    {
+        __condition__ : "VARS.dist in ['CO8']"
+        'APPLICATION.products.cminpack'    : '1.3.6'
+        'APPLICATION.products.PyFMI'       : {tag:'2.5',   base: 'no',  section: 'version_2_5_no_pip'  }
+        'APPLICATION.products.statsmodels' : {tag:'0.6.1', base : 'no', section: 'version_0_6_1_no_pip'}
+    }
 ]

diff --git a/applications/SALOME-master-windows.pyconf b/applications/SALOME-master-windows.pyconf
index bf5832a0dd9108bde8cd0776594453364927ed66..2e5742c0ab554b042a7f530349de446337383190 100644 (file)
--- a/applications/SALOME-master-windows.pyconf
+++ b/applications/SALOME-master-windows.pyconf
@@ -16,12 +16,12 @@ APPLICATION :
     {
         build : 
         {
-           CONFIGURATION_ROOT_DIR : $workdir + $VARS.sep + "SOURCES" + $VARS.sep + "CONFIGURATION"
-           RESTRICTED_ROOT_DIR : $workdir + $VARS.sep + "SOURCES" + $VARS.sep + "RESTRICTED"
-           SALOME_HAS_GLOBAL_ENV : "1"
-           SALOME_USE_64BIT_IDS : '1'
-           SET_usr_docs_VARS : "1" # required for PyEditor build
-           CMAKE_GENERATOR : '"Visual Studio 15 2017 Win64"'
+            CONFIGURATION_ROOT_DIR : $workdir + $VARS.sep + "SOURCES" + $VARS.sep + "CONFIGURATION"
+            RESTRICTED_ROOT_DIR : $workdir + $VARS.sep + "SOURCES" + $VARS.sep + "RESTRICTED"
+            SALOME_HAS_GLOBAL_ENV : "1"
+            SALOME_USE_64BIT_IDS : '1'
+            SET_usr_docs_VARS : "1" # required for PyEditor build
+            CMAKE_GENERATOR : '"Visual Studio 15 2017 Win64"'
         }
         launch : {PYTHONIOENCODING:"UTF_8", SALOME_MODULES_ORDER:"SHAPER:SHAPERSTUDY:GEOM:SMESH"}
         SALOME_trace : "local" # local/file:.../with_logger
@@ -36,7 +36,7 @@ APPLICATION :
         alabaster : '0.7.6'
         Babel : '2.7.0'
         boost : '1.67.0'
-        CAS : 'V7_5_3p1'
+        CAS : {tag: 'V7_5_3p1', section: 'version_V7_5_3p1_win'}
         certifi : '2019.6.16'
         cgns : '4.1.1'
         chardet : '3.0.4'
@@ -94,7 +94,7 @@ APPLICATION :
         Pygments : '2.4.2'
         pyparsing : '2.4.0'
         PyQt : '5.15.3'
-       # PyQtChart : '5.15.4'
+        # PyQtChart : '5.15.4'
         pyreadline : '2.1'
         Python : '3.6.5'
         pytz : '2019.1'
@@ -163,7 +163,7 @@ APPLICATION :
         'EFICAS_TOOLS'
         'ADAO'
         'PARAVISADDONS'
-        'TESTBASE'
+        'TESTBASE': {tag: 'master'}
         'CEATESTBASE' : {tag: 'SSL'}
     }
     profile :
@@ -192,13 +192,4 @@ APPLICATION :
 
 __overwrite__ :
 [
-  {
-    __condition__ : "APPLICATION.debug == 'yes'"
-    'APPLICATION.products.numpy'      : '1.16.4-win-dbg'
-    'APPLICATION.products.sphinxintl' : '2.0.0-win-dbg'
-    'PRODUCTS.llvm.version_8_0_1_clang_win.build_source' : 'script'
-    'PRODUCTS.llvm.version_8_0_1_clang_win.compil_script' : 'llvm-8.0.1.bat'
-    'PRODUCTS.tbb.version_2019_U8_win.patches' : ['tbb-2019_U8_windows10.patch', 'tbb-2019_U8_windows10_debug.patch']
-    'PRODUCTS.omniORB.default.patches': ['omniORB-4.2.3-windows-debug.patch']
-  }
 ]

diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf
index f3c65ea7a761337ee7418a0d9cc5a8df0c1419b2..de09443203cda535ed7a0cb2f8283da1b0175c05 100644 (file)
--- a/applications/SALOME-master.pyconf
+++ b/applications/SALOME-master.pyconf
@@ -160,8 +160,9 @@ APPLICATION :
         'ADAO'
         'ADAO_INTERFACE'
         'PARAVISADDONS'
-        'TESTBASE'
-        'CEATESTBASE' : {tag: 'SalomeV9'}
+        'YDEFX'
+        'TESTBASE': {tag: 'master'}
+        'CEATESTBASE' : {tag: 'SSL'}
     }
     profile :
     {
@@ -188,18 +189,18 @@ APPLICATION :
 }
 __overwrite__ :
 [
-  {
-   __condition__ : "VARS.dist in ['FD32']"
-   # https://github.com/scipy/scipy/issues/11611
-   'APPLICATION.products.scipy' : '1.5.2'
-  }
-  {
-   __condition__ : "VARS.dist in ['FD30']"
-   # https://github.com/scipy/scipy/issues/11611
-   'APPLICATION.products.gcc' : '9.3.0'
-  }
-  {
-   __condition__ : "VARS.dist not in ['DB08','DB09', 'FD30']"
-   'APPLICATION.rm_products' : ['gcc', 'gmp', 'mpc', 'mpfr']
-  }
+    {
+        __condition__ : "VARS.dist in ['FD32']"
+        # https://github.com/scipy/scipy/issues/11611
+        'APPLICATION.products.scipy' : '1.5.2'
+    }
+    {
+        __condition__ : "VARS.dist in ['FD30']"
+        # https://github.com/scipy/scipy/issues/11611
+        'APPLICATION.products.gcc' : '9.3.0'
+    }
+    {
+        __condition__ : "VARS.dist not in ['DB08','DB09', 'FD30']"
+        'APPLICATION.rm_products' : ['gcc', 'gmp', 'mpc', 'mpfr']
+    }
 ]