From fcb08a8a2851af7974d08055d4ece83779fd334d Mon Sep 17 00:00:00 2001 From: Nicolas OTTON Date: Fri, 10 Dec 2021 13:57:33 +0100 Subject: [PATCH] prepare V9_8_0 final tag --- applications/MEDCOUPLING-9.8.0-MPI.pyconf | 24 +-- applications/MEDCOUPLING-9.8.0-int32.pyconf | 10 +- applications/MEDCOUPLING-9.8.0-native.pyconf | 24 +-- applications/MEDCOUPLING-9.8.0-windows.pyconf | 12 +- applications/MEDCOUPLING-9.8.0.pyconf | 16 +- applications/SALOME-9.8.0-MPI.pyconf | 42 ++--- applications/SALOME-9.8.0-int32.pyconf | 32 ++-- applications/SALOME-9.8.0-native.pyconf | 168 +++++++++--------- applications/SALOME-9.8.0-windows.pyconf | 24 +-- applications/SALOME-9.8.0.pyconf | 38 ++-- 10 files changed, 195 insertions(+), 195 deletions(-) diff --git a/applications/MEDCOUPLING-9.8.0-MPI.pyconf b/applications/MEDCOUPLING-9.8.0-MPI.pyconf index ad30d05..8c21f4b 100644 --- a/applications/MEDCOUPLING-9.8.0-MPI.pyconf +++ b/applications/MEDCOUPLING-9.8.0-MPI.pyconf @@ -5,7 +5,7 @@ APPLICATION : { name : 'MEDCOUPLING-9.8.0-MPI' workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name + '-' + $VARS.dist - tag : 'V9_8_0rc1' + tag : 'V9_8_0' base : 'no' debug : 'no' python3 : 'yes' @@ -13,12 +13,12 @@ APPLICATION : { build : { - CONFIGURATION_ROOT_DIR : $workdir + $VARS.sep + "SOURCES" + $VARS.sep + "CONFIGURATION" - SALOME_USE_64BIT_IDS : '1' + CONFIGURATION_ROOT_DIR : $workdir + $VARS.sep + "SOURCES" + $VARS.sep + "CONFIGURATION" + SALOME_USE_64BIT_IDS : '1' } launch : { - PYTHONIOENCODING:"UTF_8" + PYTHONIOENCODING:"UTF_8" } } products : @@ -86,12 +86,12 @@ APPLICATION : } __overwrite__ : [ - { - __condition__ : "VARS.dist in ['FD32', 'FD34']" - 'APPLICATION.products.scipy' : '1.5.2' # gcc https://github.com/scipy/scipy/issues/11611 - either patch numpy to include -fallow-argument-mismatch or move to that version - } - { - __condition__: "VARS.dist in ['FD34']" - 'PRODUCTS.Python.version_3_6_5.patches' : ["python_3.6.5-allocation.patch"] # https://github.com/pyenv/pyenv/issues/1889 - } + { + __condition__ : "VARS.dist in ['FD32', 'FD34']" + 'APPLICATION.products.scipy' : '1.5.2' # gcc https://github.com/scipy/scipy/issues/11611 - either patch numpy to include -fallow-argument-mismatch or move to that version + } + { + __condition__: "VARS.dist in ['FD34']" + 'PRODUCTS.Python.version_3_6_5.patches' : ["python_3.6.5-allocation.patch"] # https://github.com/pyenv/pyenv/issues/1889 + } ] diff --git a/applications/MEDCOUPLING-9.8.0-int32.pyconf b/applications/MEDCOUPLING-9.8.0-int32.pyconf index 8b63eba..45c5eef 100644 --- a/applications/MEDCOUPLING-9.8.0-int32.pyconf +++ b/applications/MEDCOUPLING-9.8.0-int32.pyconf @@ -5,7 +5,7 @@ APPLICATION : { name : 'MEDCOUPLING-9.8.0-int32' workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name + '-' + $VARS.dist - tag : 'V9_8_0rc1' + tag : 'V9_8_0' base : 'no' debug : 'no' python3 : 'yes' @@ -77,8 +77,8 @@ APPLICATION : } __overwrite__ : [ - { - __condition__ : "VARS.dist in ['FD32']" - 'APPLICATION.products.scipy' : '1.5.2' # gcc https://github.com/scipy/scipy/issues/11611 - either patch numpy to include -fallow-argument-mismatch or move to that version - } + { + __condition__ : "VARS.dist in ['FD32']" + 'APPLICATION.products.scipy' : '1.5.2' # gcc https://github.com/scipy/scipy/issues/11611 - either patch numpy to include -fallow-argument-mismatch or move to that version + } ] diff --git a/applications/MEDCOUPLING-9.8.0-native.pyconf b/applications/MEDCOUPLING-9.8.0-native.pyconf index 11e3712..a06a76f 100644 --- a/applications/MEDCOUPLING-9.8.0-native.pyconf +++ b/applications/MEDCOUPLING-9.8.0-native.pyconf @@ -5,7 +5,7 @@ APPLICATION : { name : 'MEDCOUPLING-9.8.0-native' workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name + '-' + $VARS.dist - tag : 'V9_8_0rc1' + tag : 'V9_8_0' base : 'no' debug : 'no' python3 : 'yes' @@ -13,12 +13,12 @@ APPLICATION : { build : { - CONFIGURATION_ROOT_DIR : $workdir + $VARS.sep + "SOURCES" + $VARS.sep + "CONFIGURATION" - SALOME_USE_64BIT_IDS : '1' + CONFIGURATION_ROOT_DIR : $workdir + $VARS.sep + "SOURCES" + $VARS.sep + "CONFIGURATION" + SALOME_USE_64BIT_IDS : '1' } launch : { - PYTHONIOENCODING:"UTF_8" + PYTHONIOENCODING:"UTF_8" } } products : @@ -31,7 +31,7 @@ APPLICATION : click : 'native' cmake : 'native' cppunit : 'native' - chardet : 'native' + chardet : 'native'master Cython : 'native' docutils : 'native' doxygen : 'native' @@ -84,11 +84,11 @@ APPLICATION : } __overwrite__ : [ - { - # sphinxintl is missing on this node - __condition__ : "VARS.dist in ['CO8']" - 'APPLICATION.products.sphinxintl' : '0.9.10' - 'PRODUCTS.sphinxintl.default.properties.pip' : "no" - 'APPLICATION.products.cmake' : '3.12.1' - } + { + # sphinxintl is missing on this node + __condition__ : "VARS.dist in ['CO8']" + 'APPLICATION.products.sphinxintl' : '0.9.10' + 'PRODUCTS.sphinxintl.default.properties.pip' : "no" + 'APPLICATION.products.cmake' : '3.12.1' + } ] diff --git a/applications/MEDCOUPLING-9.8.0-windows.pyconf b/applications/MEDCOUPLING-9.8.0-windows.pyconf index 8cf3c4d..5e00f10 100644 --- a/applications/MEDCOUPLING-9.8.0-windows.pyconf +++ b/applications/MEDCOUPLING-9.8.0-windows.pyconf @@ -6,7 +6,7 @@ APPLICATION : name : 'MEDCOUPLING-9.8.0' workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name cmake_generator : 'Visual Studio 15 2017 Win64' - tag : 'V9_8_0rc1' + tag : 'V9_8_0' debug : 'no' base : 'no' python3 : 'yes' @@ -14,14 +14,14 @@ APPLICATION : { build : { - CONFIGURATION_ROOT_DIR : $workdir + $VARS.sep + "SOURCES" + $VARS.sep + "CONFIGURATION" - SALOME_HAS_GLOBAL_ENV: "1" - SALOME_USE_64BIT_IDS : '1' - CMAKE_GENERATOR : '"Visual Studio 15 2017 Win64"' # strangely not exposed in scripts... + CONFIGURATION_ROOT_DIR : $workdir + $VARS.sep + "SOURCES" + $VARS.sep + "CONFIGURATION" + SALOME_HAS_GLOBAL_ENV: "1" + SALOME_USE_64BIT_IDS : '1' + CMAKE_GENERATOR : '"Visual Studio 15 2017 Win64"' # strangely not exposed in scripts... } launch : { - PYTHONIOENCODING:"UTF_8" + PYTHONIOENCODING:"UTF_8" } } products : diff --git a/applications/MEDCOUPLING-9.8.0.pyconf b/applications/MEDCOUPLING-9.8.0.pyconf index dbe5c8a..b9fa520 100644 --- a/applications/MEDCOUPLING-9.8.0.pyconf +++ b/applications/MEDCOUPLING-9.8.0.pyconf @@ -5,7 +5,7 @@ APPLICATION : { name : 'MEDCOUPLING-9.8.0' workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name + '-' + $VARS.dist - tag : 'V9_8_0rc1' + tag : 'V9_8_0' base : 'no' debug : 'no' python3 : 'yes' @@ -13,12 +13,12 @@ APPLICATION : { build : { - CONFIGURATION_ROOT_DIR : $workdir + $VARS.sep + "SOURCES" + $VARS.sep + "CONFIGURATION" - SALOME_USE_64BIT_IDS : '1' + CONFIGURATION_ROOT_DIR : $workdir + $VARS.sep + "SOURCES" + $VARS.sep + "CONFIGURATION" + SALOME_USE_64BIT_IDS : '1' } launch : { - PYTHONIOENCODING:"UTF_8" + PYTHONIOENCODING:"UTF_8" } } products : @@ -84,8 +84,8 @@ APPLICATION : } __overwrite__ : [ - { - __condition__ : "VARS.dist in ['FD32']" - 'APPLICATION.products.scipy' : '1.5.2' # gcc https://github.com/scipy/scipy/issues/11611 - either patch numpy to include -fallow-argument-mismatch or move to that version - } + { + __condition__ : "VARS.dist in ['FD32']" + 'APPLICATION.products.scipy' : '1.5.2' # gcc https://github.com/scipy/scipy/issues/11611 - either patch numpy to include -fallow-argument-mismatch or move to that version + } ] diff --git a/applications/SALOME-9.8.0-MPI.pyconf b/applications/SALOME-9.8.0-MPI.pyconf index f0d8012..2befb86 100644 --- a/applications/SALOME-9.8.0-MPI.pyconf +++ b/applications/SALOME-9.8.0-MPI.pyconf @@ -5,7 +5,7 @@ APPLICATION : { name : 'SALOME-9.8.0-MPI' workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name + '-' + $VARS.dist - tag : 'V9_8_0rc1' + tag : 'V9_8_0' dev : 'no' verbose :'no' debug : 'no' @@ -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 @@ -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'} @@ -148,7 +148,7 @@ APPLICATION : 'JOBMANAGER' : {section : "default_MPI", verbose: 'yes'} 'YACS' 'YACSGEN' - 'SOLVERLAB' : {tag: 'master', section : "default_MPI", hpc: 'yes'} + 'SOLVERLAB' : {tag: 'a9937a9', section : "default_MPI", hpc: 'yes'} 'DOCUMENTATION' 'SAMPLES' 'COMPONENT' @@ -191,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-9.8.0-int32.pyconf b/applications/SALOME-9.8.0-int32.pyconf index c5fdf37..6eed432 100644 --- a/applications/SALOME-9.8.0-int32.pyconf +++ b/applications/SALOME-9.8.0-int32.pyconf @@ -5,7 +5,7 @@ APPLICATION : { name : 'SALOME-9.8.0-int32' workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name + '-' + $VARS.dist - tag : 'V9_8_0rc1' + tag : 'V9_8_0' dev : 'no' verbose :'no' debug : 'no' @@ -144,7 +144,7 @@ APPLICATION : 'JOBMANAGER' 'YACS' 'YACSGEN' - 'SOLVERLAB' : {tag : 'master'} + 'SOLVERLAB' : {tag : 'a9937a9'} 'DOCUMENTATION' 'SAMPLES' 'COMPONENT' @@ -187,18 +187,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-9.8.0-native.pyconf b/applications/SALOME-9.8.0-native.pyconf index 282003a..efb22b3 100644 --- a/applications/SALOME-9.8.0-native.pyconf +++ b/applications/SALOME-9.8.0-native.pyconf @@ -5,7 +5,7 @@ APPLICATION : { name : 'SALOME-9.8.0-native' workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name + '-' + $VARS.dist - tag : 'V9_8_0rc1' + tag : 'V9_8_0' dev : 'no' verbose :'no' debug : 'no' @@ -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 @@ -127,7 +127,7 @@ APPLICATION : 'SHAPER' 'SHAPERSTUDY' 'RESTRICTED' - 'LIBBATCH' : {tag :'V2_4_5'} + 'LIBBATCH' : {tag : 'V2_4_5'} 'KERNEL' 'MEDCOUPLING' 'GUI' @@ -191,82 +191,82 @@ 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']" + '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" + 'PRO DUCTS.statsmodels.version_0_6_1.compil_script' : "statsmodels-0.6.1.sh" + } ] diff --git a/applications/SALOME-9.8.0-windows.pyconf b/applications/SALOME-9.8.0-windows.pyconf index 55b845d..486ca7f 100644 --- a/applications/SALOME-9.8.0-windows.pyconf +++ b/applications/SALOME-9.8.0-windows.pyconf @@ -6,7 +6,7 @@ APPLICATION : name : 'SALOME-9.8.0' workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name cmake_generator : 'Visual Studio 15 2017 Win64' - tag : 'V9_8_BR' + tag : 'V9_8_0' dev : 'no' verbose :'no' debug : 'no' @@ -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 @@ -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' @@ -159,10 +159,10 @@ APPLICATION : 'CALCULATOR' 'HELLO' 'PYHELLO' - 'EFICAS' : {tag : 'V9_8_0b1'} - 'EFICAS_TOOLS' : {tag : 'V9_8_0b1'} - 'ADAO' : {tag: 'V9_8_0b1'} - 'PARAVISADDONS' : {tag: 'V9_8_0b1'} + 'EFICAS' + 'EFICAS_TOOLS' : {tag : 'V9_8_0rc1'} + 'ADAO' + 'PARAVISADDONS' 'TESTBASE': {tag: 'master'} 'CEATESTBASE' : {tag: 'SSL'} } diff --git a/applications/SALOME-9.8.0.pyconf b/applications/SALOME-9.8.0.pyconf index d0f61ba..a91d1f2 100644 --- a/applications/SALOME-9.8.0.pyconf +++ b/applications/SALOME-9.8.0.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 @@ -146,7 +146,7 @@ APPLICATION : 'JOBMANAGER' 'YACS' 'YACSGEN' - 'SOLVERLAB' : {tag : 'a9937a9'} + 'SOLVERLAB' : {tag: 'a9937a9'} 'DOCUMENTATION' 'SAMPLES' 'COMPONENT' @@ -189,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'] + } ] -- 2.39.2