From 8a5658acff17229011be5facb94aeae9e57fd2ce Mon Sep 17 00:00:00 2001 From: Nabil Ghodbane Date: Thu, 11 Jul 2024 12:36:03 +0200 Subject: [PATCH] [Windows] Add distro 1.0.9 and update MEDCOUPLING 9.13.0 and master builds --- .../MEDCOUPLING-9.13.0-windows.pyconf | 27 ++++++++++--------- .../MEDCOUPLING-master-windows.pyconf | 26 +++++++++--------- applications/SALOME-9.13.0-windows.pyconf | 1 + applications/SALOME-master-windows.pyconf | 1 + products/distro.pyconf | 27 +++++++++++++++++++ products/env_scripts/distro.py | 17 ++++++++++++ 6 files changed, 74 insertions(+), 25 deletions(-) create mode 100644 products/distro.pyconf create mode 100644 products/env_scripts/distro.py diff --git a/applications/MEDCOUPLING-9.13.0-windows.pyconf b/applications/MEDCOUPLING-9.13.0-windows.pyconf index 8827a98..29210ca 100644 --- a/applications/MEDCOUPLING-9.13.0-windows.pyconf +++ b/applications/MEDCOUPLING-9.13.0-windows.pyconf @@ -6,7 +6,7 @@ APPLICATION : name : 'MEDCOUPLING-9.13.0' workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name cmake_generator : 'Visual Studio 15 2017' - tag : 'V9_13_0b1' + tag : 'V9_13_BR' debug : 'no' base : 'no' python3 : 'yes' @@ -17,7 +17,7 @@ APPLICATION : 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"' # strangely not exposed in scripts... + CMAKE_GENERATOR : '"Visual Studio 15 2017"' } launch : { @@ -27,7 +27,7 @@ APPLICATION : products : { # PREREQUISITES : - alabaster : '0.7.6' + alabaster : '0.7.16' Babel : '2.7.0' boost : '1.67.0' certifi : '2019.6.16' @@ -36,7 +36,8 @@ APPLICATION : colorama: '0.4.1' cppunit : '1.13.2' chardet : '3.0.4' - Cython : '0.29.12' + Cython : '0.29.37' + distro: '1.9.0' docutils : '0.14' doxygen : '1.8.3.1' expat : '2.0.1' @@ -53,20 +54,20 @@ APPLICATION : medfile : '4.1.1' metis : '5.1.0' msvc : '2017' - numpy : '1.16.4' + numpy : '1.21.6' packaging : '19.0' pockets : '0.7.2' - Pygments : '2.4.2' + Pygments : '2.13.0' pyparsing : '2.4.0' - pyreadline : '2.1' - Python : '3.6.5' - pytz : '2019.1' + pyreadline : '3.4.1' + Python : '3.9.14' + pytz : '2020.1' requests : '2.22.0' - scipy : '1.4.1' - setuptools : '41.0.1' + scipy : '1.6.2' + setuptools : '69.0.3' six : '1.12.0' - snowballstemmer : '1.9.0' - Sphinx : '2.1.2' + snowballstemmer : '2.2.0' + Sphinx : '3.5.4' sphinxcontrib_applehelp : '1.0.1' sphinxcontrib_devhelp : '1.0.1' sphinxcontrib_jsmath : '1.0.1' diff --git a/applications/MEDCOUPLING-master-windows.pyconf b/applications/MEDCOUPLING-master-windows.pyconf index 858091e..6498de3 100644 --- a/applications/MEDCOUPLING-master-windows.pyconf +++ b/applications/MEDCOUPLING-master-windows.pyconf @@ -6,6 +6,7 @@ APPLICATION : name : 'MEDCOUPLING-master' workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name cmake_generator : 'Visual Studio 15 2017' + cmake_build_type: 'Release' # Debug, RelWithDebInfo, Release, MinSizeRel tag : 'master' debug : 'no' base : 'no' @@ -17,7 +18,7 @@ APPLICATION : 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"' # strangely not exposed in scripts... + CMAKE_GENERATOR : '"Visual Studio 15 2017"' } launch : { @@ -27,7 +28,7 @@ APPLICATION : products : { # PREREQUISITES : - alabaster : '0.7.6' + alabaster : '0.7.16' Babel : '2.7.0' boost : '1.67.0' certifi : '2019.6.16' @@ -36,7 +37,8 @@ APPLICATION : colorama: '0.4.1' cppunit : '1.13.2' chardet : '3.0.4' - Cython : '0.29.12' + Cython : '0.29.37' + distro: '1.9.0' docutils : '0.14' doxygen : '1.8.3.1' expat : '2.0.1' @@ -53,20 +55,20 @@ APPLICATION : medfile : '4.1.1' metis : '5.1.0' msvc : '2017' - numpy : '1.16.4' + numpy : '1.21.6' packaging : '19.0' pockets : '0.7.2' - Pygments : '2.4.2' + Pygments : '2.13.0' pyparsing : '2.4.0' - pyreadline : '2.1' - Python : '3.6.5' - pytz : '2019.1' + pyreadline : '3.4.1' + Python : '3.9.14' + pytz : '2020.1' requests : '2.22.0' - scipy : '1.4.1' - setuptools : '41.0.1' + scipy : '1.6.2' + setuptools : '69.0.3' six : '1.12.0' - snowballstemmer : '1.9.0' - Sphinx : '2.1.2' + snowballstemmer : '2.2.0' + Sphinx : '3.5.4' sphinxcontrib_applehelp : '1.0.1' sphinxcontrib_devhelp : '1.0.1' sphinxcontrib_jsmath : '1.0.1' diff --git a/applications/SALOME-9.13.0-windows.pyconf b/applications/SALOME-9.13.0-windows.pyconf index 322118c..2c43044 100644 --- a/applications/SALOME-9.13.0-windows.pyconf +++ b/applications/SALOME-9.13.0-windows.pyconf @@ -57,6 +57,7 @@ APPLICATION : Cython : '0.29.37' dateutil : '2.8.2' dill : '0.3.4' + distro: '1.9.0' docutils : '0.14' doxygen : '1.8.3.1' eigen : '3.3.4' diff --git a/applications/SALOME-master-windows.pyconf b/applications/SALOME-master-windows.pyconf index 445f2bf..1e8be28 100644 --- a/applications/SALOME-master-windows.pyconf +++ b/applications/SALOME-master-windows.pyconf @@ -57,6 +57,7 @@ APPLICATION : Cython : '0.29.37' dateutil : '2.8.2' dill : '0.3.4' + distro: '1.9.0' docutils : '0.14' doxygen : '1.8.3.1' eigen : '3.3.4' diff --git a/products/distro.pyconf b/products/distro.pyconf new file mode 100644 index 0000000..7b419ee --- /dev/null +++ b/products/distro.pyconf @@ -0,0 +1,27 @@ +default : +{ + name : "distro" + build_source : "script" + compil_script : 'pip_install' + $VARS.scriptExtension + get_source : "archive" + system_info : + { + rpm : ["python3-distro"] + rpm_dev : [] + apt : ["python3-distro"] + apt_dev : [] + } + environ : + { + env_script : $name + ".py" + } + depend : ['Python','setuptools'] + source_dir : $APPLICATION.workdir + $VARS.sep + 'SOURCES' + $VARS.sep + $name + build_dir : $APPLICATION.workdir + $VARS.sep + 'BUILD' + $VARS.sep + $name + install_dir : 'base' + properties: + { + incremental : "yes" + pip : "yes" + } +} diff --git a/products/env_scripts/distro.py b/products/env_scripts/distro.py new file mode 100644 index 0000000..22765fb --- /dev/null +++ b/products/env_scripts/distro.py @@ -0,0 +1,17 @@ +#!/usr/bin/env python +#-*- coding:utf-8 -*- + +import os +import platform + +def set_env(env, prereq_dir, version): + env.set("DISTRO_ROOT_DIR",prereq_dir) + + versionPython = env.get('PYTHON_VERSION') + if not platform.system() == "Windows" : + env.prepend('PATH', os.path.join(prereq_dir, 'bin')) + env.prepend('PYTHONPATH',os.path.join(prereq_dir, 'lib', 'python' + versionPython, 'site-packages')) + env.prepend('PYTHONPATH',os.path.join(prereq_dir, 'bin')) + +def set_nativ_env(env): + pass -- 2.39.2