X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=applications%2FSALOME-9.8.0-native.pyconf;h=dedd8434637f35ed2f4300ed6a83e046c11d7c2b;hb=18bc5ccaefd4b32de6ec98b7d6575e18a4993f04;hp=4f5cc60b8df7eb6a199a73144155a7ecee559868;hpb=985f9b54c27b35286967f4c2a68f95fd2e20c4f9;p=tools%2Fsat_salome.git diff --git a/applications/SALOME-9.8.0-native.pyconf b/applications/SALOME-9.8.0-native.pyconf index 4f5cc60..dedd843 100644 --- a/applications/SALOME-9.8.0-native.pyconf +++ b/applications/SALOME-9.8.0-native.pyconf @@ -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' @@ -182,7 +182,7 @@ APPLICATION : } properties : { - mesa_launcher_in_package : "yes" + mesa_launcher_in_package : "no" repo_dev : "yes" pip : 'yes' pip_install_dir : 'python' @@ -191,25 +191,13 @@ 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' - ] + __condition__ : "VARS.dist in ['UB20.04']" + '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'} } { # On DB10, ParaView fails to find xmlpatterns executable : ParaViewClient.cmake try to find it @@ -218,55 +206,41 @@ __overwrite__ : # 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' - ] + 'APPLICATION.products.ParaView' : {tag: '5.9.0', base : 'no', section: 'version_5_9_0_DB10'} + 'APPLICATION.products.cminpack' : 'native' + 'APPLICATION.products.PyFMI' : {tag:'2.5', base: 'no', section: 'version_2_5_no_pip'} + } + { + __condition__ : "VARS.dist in ['DB11']" + '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_DB11'} } { # 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' + 'APPLICATION.products.sphinxintl' : {tag: '0.9.10', base: 'no', section: 'version_0_9_10_no_pip'} + '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' } + 'APPLICATION.products.ParaView' : {tag: '5.9.0', base: 'no', section: 'version_5_9_0_CO8' } + } + { + __condition__ : "VARS.dist in ['FD32']" + 'APPLICATION.products.opencv' : '3.2.0' + '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' } + 'APPLICATION.products.ParaView' : {tag: '5.9.0', base: 'no', section: 'version_5_9_0_FD32'} } { # FD 34 qt5 package is qt5-qtbase-devel. __condition__ : "VARS.dist in ['FD34']" + 'APPLICATION.products.opencv' : '3.2.0' '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" + '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'} } ]