From ea95a7f571d22d33ec942e0731ad7fecf4613fa5 Mon Sep 17 00:00:00 2001 From: Nabil Ghodbane Date: Wed, 24 Apr 2024 14:15:06 +0200 Subject: [PATCH] bos #41564 use PERSALYS v16.0.1 --- applications/SALOME-master-MPI.pyconf | 2 +- applications/SALOME-master-int32.pyconf | 2 +- applications/SALOME-master-native.pyconf | 2 +- applications/SALOME-master-windows.pyconf | 3 ++- applications/SALOME-master.pyconf | 2 +- products/PERSALYS.pyconf | 13 ++++++------- ...PERSALYS-v16.0.bat => PERSALYS-v16.0.1.bat} | 0 .../{PERSALYS-v16.0.sh => PERSALYS-v16.0.1.sh} | 0 products/compil_scripts/PyQt-5.15.bat | 12 ++++++++++-- products/compil_scripts/openssl-1.1.bat | 2 ++ products/compil_scripts/qt-5.12.10.bat | 6 +++++- products/compil_scripts/qt-5.15.2.bat | 5 +++++ products/env_scripts/openssl.py | 4 +++- products/openssl.pyconf | 3 +++ products/openturns.pyconf | 2 +- products/patches/PERSALYS-v16.0-004.patch | 18 ------------------ ....0-001.patch => PERSALYS-v16.0.1-001.patch} | 0 ....0-002.patch => PERSALYS-v16.0.1-002.patch} | 0 ....0-003.patch => PERSALYS-v16.0.1-003.patch} | 0 products/patches/openturns-1.22.0002.patch | 15 +++++++++++++++ 20 files changed, 56 insertions(+), 35 deletions(-) rename products/compil_scripts/{PERSALYS-v16.0.bat => PERSALYS-v16.0.1.bat} (100%) rename products/compil_scripts/{PERSALYS-v16.0.sh => PERSALYS-v16.0.1.sh} (100%) delete mode 100644 products/patches/PERSALYS-v16.0-004.patch rename products/patches/{PERSALYS-v16.0-001.patch => PERSALYS-v16.0.1-001.patch} (100%) rename products/patches/{PERSALYS-v16.0-002.patch => PERSALYS-v16.0.1-002.patch} (100%) rename products/patches/{PERSALYS-v16.0-003.patch => PERSALYS-v16.0.1-003.patch} (100%) create mode 100644 products/patches/openturns-1.22.0002.patch diff --git a/applications/SALOME-master-MPI.pyconf b/applications/SALOME-master-MPI.pyconf index 7d742ee..dd35873 100644 --- a/applications/SALOME-master-MPI.pyconf +++ b/applications/SALOME-master-MPI.pyconf @@ -101,7 +101,7 @@ APPLICATION : pandas : '0.25.2' patsy : '0.5.2' ParaView : {tag:'5.11.0', base: 'no', section: 'version_5_11_0_MPI', hpc: 'yes'} - PERSALYS: 'v16.0' + PERSALYS: 'v16.0.1' petsc : {tag : '3.16.0', base: 'no', section: 'version_3_16_0', hpc: 'yes'} Pillow : '8.4.0' planegcs : '0.18-3cb6890' diff --git a/applications/SALOME-master-int32.pyconf b/applications/SALOME-master-int32.pyconf index 4a4ed66..24b1735 100644 --- a/applications/SALOME-master-int32.pyconf +++ b/applications/SALOME-master-int32.pyconf @@ -100,7 +100,7 @@ APPLICATION : pandas : '0.25.2' patsy : '0.5.2' ParaView : {tag:'5.11.0', base: 'no', section: 'version_5_11_0_MPI', hpc: 'yes'} - PERSALYS: 'v16.0' + PERSALYS: 'v16.0.1' petsc : {tag : '3.16.0', base: 'no', section: 'version_3_16_0', hpc: 'yes'} Pillow : '8.4.0' planegcs : '0.18-3cb6890' diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf index 4be0b4a..001a1b3 100644 --- a/applications/SALOME-master-native.pyconf +++ b/applications/SALOME-master-native.pyconf @@ -98,7 +98,7 @@ APPLICATION : packagespy : '74152cd' pandas : 'native' ParaView : {tag:'5.11.0', base: 'no', section: 'version_5_11_0_MPI', hpc: 'yes'} - PERSALYS : 'v16.0' + PERSALYS : 'v16.0.1' petsc : {tag : '3.16.0', section: 'version_3_16_0'} Pillow : 'native' planegcs : '0.18-3cb6890' diff --git a/applications/SALOME-master-windows.pyconf b/applications/SALOME-master-windows.pyconf index f1e40d6..272db91 100644 --- a/applications/SALOME-master-windows.pyconf +++ b/applications/SALOME-master-windows.pyconf @@ -94,6 +94,7 @@ APPLICATION : omniORBpy : '4.2.3' openblas : '0.3.23' opencv : '3.2.0' + openssl: '1.1.1n' openVKL: '0.11.0' openturns: '1.22' ospray : '2.4.0' @@ -101,7 +102,7 @@ APPLICATION : pandas : '1.5.3' patsy : '0.5.2' ParaView : {tag:'5.11.0', base: 'no', section: 'version_5_11_0'} - PERSALYS: 'v16.0' + PERSALYS: 'v16.0.1' perl : '5.28.1.1' Pillow : '10.2.0' planegcs : '0.18-3cb6890' diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf index e8d330b..57e68d3 100644 --- a/applications/SALOME-master.pyconf +++ b/applications/SALOME-master.pyconf @@ -107,7 +107,7 @@ APPLICATION : pandas : '1.1.5' patsy : '0.5.4' ParaView : {tag:'5.11.0', base: 'no', section: 'version_5_11_0_MPI', hpc: 'yes'} - PERSALYS: 'v16.0' + PERSALYS: 'v16.0.1' petsc : {tag : '3.16.0', base: 'no', section: 'version_3_16_0', hpc: 'yes'} Pillow : '8.4.0' planegcs : '0.18-3cb6890' diff --git a/products/PERSALYS.pyconf b/products/PERSALYS.pyconf index beb0f97..531b475 100644 --- a/products/PERSALYS.pyconf +++ b/products/PERSALYS.pyconf @@ -58,13 +58,13 @@ default_win : incremental : "yes" } } -version_v16_0 : +version_v16_0_1 : { } -version_v16_0_win : +version_v16_0_1_win : { - compil_script : 'PERSALYS-v16.0.bat' + compil_script : 'PERSALYS-v16.0.1.bat' depend : ['Python', 'hdf5', 'cgns', @@ -91,10 +91,9 @@ version_v16_0_win : 'openblas', 'pthreads' ] - patches : ['PERSALYS-v16.0-001.patch', - 'PERSALYS-v16.0-002.patch', - 'PERSALYS-v16.0-003.patch', - 'PERSALYS-v16.0-004.patch' + patches : ['PERSALYS-v16.0.1-001.patch', + 'PERSALYS-v16.0.1-002.patch', + 'PERSALYS-v16.0.1-003.patch' ] } diff --git a/products/compil_scripts/PERSALYS-v16.0.bat b/products/compil_scripts/PERSALYS-v16.0.1.bat similarity index 100% rename from products/compil_scripts/PERSALYS-v16.0.bat rename to products/compil_scripts/PERSALYS-v16.0.1.bat diff --git a/products/compil_scripts/PERSALYS-v16.0.sh b/products/compil_scripts/PERSALYS-v16.0.1.sh similarity index 100% rename from products/compil_scripts/PERSALYS-v16.0.sh rename to products/compil_scripts/PERSALYS-v16.0.1.sh diff --git a/products/compil_scripts/PyQt-5.15.bat b/products/compil_scripts/PyQt-5.15.bat index 02d1263..ace17b8 100644 --- a/products/compil_scripts/PyQt-5.15.bat +++ b/products/compil_scripts/PyQt-5.15.bat @@ -35,9 +35,17 @@ SET BUILD_OPTIONS=%BUILD_OPTIONS% --qml-plugindir=%PRODUCT_INSTALL:\=/%/plugins/ SET BUILD_OPTIONS=%BUILD_OPTIONS% --no-qsci-api SET BUILD_OPTIONS=%BUILD_OPTIONS% --spec=win32-msvc SET BUILD_OPTIONS=%BUILD_OPTIONS% --confirm-license -SET BUILD_OPTIONS=%BUILD_OPTIONS% --disable=QtNfc --disable=QtNetwork --disable=QtWebSockets -SET BUILD_OPTIONS=%BUILD_OPTIONS% --target-py-version=%PYTHON_VERSION% +SET BUILD_OPTIONS=%BUILD_OPTIONS% --disable=QtNfc +IF NOT DEFINED OPENSSL_ROOT_DIR ( + SET BUILD_OPTIONS=%BUILD_OPTIONS% --disable=QtNetwork --disable=QtWebSockets +) +SET BUILD_OPTIONS=%BUILD_OPTIONS% --target-py-version=%PYTHON_VERSION% +echo. +echo -------------------------------------------------------------------------- +echo *** build options: %BUILD_OPTIONS +echo -------------------------------------------------------------------------- + %PYTHONBIN% configure.py %BUILD_OPTIONS:\=/% if NOT %ERRORLEVEL% == 0 ( echo ERROR on python configure.py %BUILD_OPTIONS:\=/% diff --git a/products/compil_scripts/openssl-1.1.bat b/products/compil_scripts/openssl-1.1.bat index eb943ee..622dc80 100644 --- a/products/compil_scripts/openssl-1.1.bat +++ b/products/compil_scripts/openssl-1.1.bat @@ -38,6 +38,8 @@ if NOT %ERRORLEVEL% == 0 ( cd %PRODUCT_INSTALL%\lib copy /Y /B libcrypto-1.1.dll libcrypto.dll copy /Y /B libssl-1.1.dll libssl.dll +copy /Y /B libcrypto-1.1.lib libcrypto.lib +copy /Y /B libssl-1.1.lib libssl.lib echo. echo ########## END diff --git a/products/compil_scripts/qt-5.12.10.bat b/products/compil_scripts/qt-5.12.10.bat index bf4b6d7..c037965 100644 --- a/products/compil_scripts/qt-5.12.10.bat +++ b/products/compil_scripts/qt-5.12.10.bat @@ -67,6 +67,10 @@ echo "*** Adding qt.conf file in order to be able to compile using the moved Qt echo [Paths] > %PRODUCT_INSTALL%\bin\qt.conf echo Prefix=../ >> %PRODUCT_INSTALL%\bin\qt.conf +IF DEFINED OPENSSL_ROOT_DIR ( + copy /Y /B %OPENSSL_ROOT_DIR%\lib\*.dll %PRODUCT_INSTALL%\bin\ + copy /Y /B %OPENSSL_ROOT_DIR%\lib\*.lib %PRODUCT_INSTALL%\lib\ +) + echo. echo ########## END - diff --git a/products/compil_scripts/qt-5.15.2.bat b/products/compil_scripts/qt-5.15.2.bat index bf4b6d7..c569441 100644 --- a/products/compil_scripts/qt-5.15.2.bat +++ b/products/compil_scripts/qt-5.15.2.bat @@ -67,6 +67,11 @@ echo "*** Adding qt.conf file in order to be able to compile using the moved Qt echo [Paths] > %PRODUCT_INSTALL%\bin\qt.conf echo Prefix=../ >> %PRODUCT_INSTALL%\bin\qt.conf +IF DEFINED OPENSSL_ROOT_DIR ( + copy /Y /B %OPENSSL_ROOT_DIR%\lib\*.dll %PRODUCT_INSTALL%\bin\ + copy /Y /B %OPENSSL_ROOT_DIR%\lib\*.lib %PRODUCT_INSTALL%\lib\ +) + echo. echo ########## END diff --git a/products/env_scripts/openssl.py b/products/env_scripts/openssl.py index 450f3c3..ab2c226 100644 --- a/products/env_scripts/openssl.py +++ b/products/env_scripts/openssl.py @@ -8,7 +8,9 @@ def set_env(env, prereq_dir, version): env.set('OPENSSL_ROOT_DIR', prereq_dir) env.set('OPENSSL_DIR', prereq_dir) if platform.system() == "Windows" : - env.prepend('PATH', os.path.join(prereq_dir), 'lib') + # no need to expand PATH since it is embedded in Qt/bin + # env.prepend('PATH', os.path.join(prereq_dir), 'lib') + pass def set_nativ_env(env): pass diff --git a/products/openssl.pyconf b/products/openssl.pyconf index e5c4b02..928e72a 100644 --- a/products/openssl.pyconf +++ b/products/openssl.pyconf @@ -23,8 +23,11 @@ default : default_win : { + name : "openssl" get_source : "archive" build_source : "script" + source_dir : $APPLICATION.workdir + $VARS.sep + 'SOURCES' + $VARS.sep + $name + build_dir : $APPLICATION.workdir + $VARS.sep + 'BUILD' + $VARS.sep + $name } version_1_1_1n : diff --git a/products/openturns.pyconf b/products/openturns.pyconf index 2e27bc8..e8705df 100644 --- a/products/openturns.pyconf +++ b/products/openturns.pyconf @@ -76,7 +76,7 @@ version_1_22_win : build_dir : $APPLICATION.workdir + $VARS.sep + 'BUILD' + $VARS.sep + $name depend : ['Python', 'openblas', 'hdf5', 'tbb', 'nlopt', 'libxml2', 'eigen', 'matplotlib', 'fftw'] opt_depend : ['pandas', 'statsmodels', 'patsy'] - patches : [] + patches : ['openturns-1.22.0002.patch'] properties : { single_install_dir : "no" diff --git a/products/patches/PERSALYS-v16.0-004.patch b/products/patches/PERSALYS-v16.0-004.patch deleted file mode 100644 index 826310a..0000000 --- a/products/patches/PERSALYS-v16.0-004.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- PERSALYS-f386013d_ref/main/launcher.cxx 2024-04-03 13:36:53.000000000 +0200 -+++ PERSALYS-f386013d_new/main/launcher.cxx 2024-04-10 14:58:17.794900118 +0200 -@@ -22,13 +22,12 @@ - #define BOOST_PROCESS_USE_STD_FS - #include - #include -- --#include -+#include - #include - #include - - namespace po = boost::program_options; --namespace fs = std::filesystem; -+namespace fs = std::experimental::filesystem; - namespace bp = boost::process; - - int main(int argc, char *argv[]) diff --git a/products/patches/PERSALYS-v16.0-001.patch b/products/patches/PERSALYS-v16.0.1-001.patch similarity index 100% rename from products/patches/PERSALYS-v16.0-001.patch rename to products/patches/PERSALYS-v16.0.1-001.patch diff --git a/products/patches/PERSALYS-v16.0-002.patch b/products/patches/PERSALYS-v16.0.1-002.patch similarity index 100% rename from products/patches/PERSALYS-v16.0-002.patch rename to products/patches/PERSALYS-v16.0.1-002.patch diff --git a/products/patches/PERSALYS-v16.0-003.patch b/products/patches/PERSALYS-v16.0.1-003.patch similarity index 100% rename from products/patches/PERSALYS-v16.0-003.patch rename to products/patches/PERSALYS-v16.0.1-003.patch diff --git a/products/patches/openturns-1.22.0002.patch b/products/patches/openturns-1.22.0002.patch new file mode 100644 index 0000000..e681615 --- /dev/null +++ b/products/patches/openturns-1.22.0002.patch @@ -0,0 +1,15 @@ +diff -Naur openturns-1.22_ref/openturns-1.22/lib/src/Base/Common/openturns/Log.hxx openturns-1.22_dev/openturns-1.22/lib/src/Base/Common/openturns/Log.hxx +--- openturns-1.22_ref/openturns-1.22/lib/src/Base/Common/openturns/Log.hxx 2024-04-24 12:41:11.929743118 +0200 ++++ openturns-1.22_dev/openturns-1.22/lib/src/Base/Common/openturns/Log.hxx 2024-04-24 12:44:51.657001032 +0200 +@@ -21,6 +21,11 @@ + #ifndef OPENTURNS_LOG_HXX + #define OPENTURNS_LOG_HXX + ++#ifdef WIN32 ++ #ifdef ERROR ++ #undef ERROR ++ #endif ++#endif + #include + #include + #include "openturns/OTprivate.hxx" -- 2.39.2