From 47242033322fde7894f6901b4bcb14cd18a8e2b7 Mon Sep 17 00:00:00 2001 From: Nabil Ghodbane Date: Wed, 20 Apr 2022 16:20:13 +0200 Subject: [PATCH] PERSALYS should target right cgns --- products/PERSALYS.pyconf | 41 ++++++++++--------- products/compil_scripts/PERSALYS-v12.0.sh | 13 ++++-- products/compil_scripts/openturns-1.18.sh | 4 +- .../patches/omniORB-4.2.3-windows-debug.patch | 25 +++++++++-- 4 files changed, 55 insertions(+), 28 deletions(-) diff --git a/products/PERSALYS.pyconf b/products/PERSALYS.pyconf index 7913c2a..ac12d8d 100644 --- a/products/PERSALYS.pyconf +++ b/products/PERSALYS.pyconf @@ -14,28 +14,29 @@ default : } depend : ['Python', 'lapack', - 'hdf5', - 'tbb', - 'nlopt', - 'libxml2', - 'eigen', - 'netcdf', - 'gdal', - 'boost', - 'ADAO', - 'KERNEL', - 'GUI', - 'Sphinx', - 'qwt', + 'hdf5', + 'cgns', + 'tbb', + 'nlopt', + 'libxml2', + 'eigen', + 'netcdf', + 'gdal', + 'boost', + 'ADAO', + 'KERNEL', + 'GUI', + 'Sphinx', + 'qwt', 'qt', 'ParaView', - 'openturns', - 'numpydoc', - 'YACS', - 'YDEFX', - 'CAS', - 'CONFIGURATION' - ] + 'openturns', + 'numpydoc', + 'YACS', + 'YDEFX', + 'CAS', + 'CONFIGURATION' + ] build_depend : ["cmake", "swig"] opt_depend : ['openmpi'] patches : [] diff --git a/products/compil_scripts/PERSALYS-v12.0.sh b/products/compil_scripts/PERSALYS-v12.0.sh index db77026..c155a75 100755 --- a/products/compil_scripts/PERSALYS-v12.0.sh +++ b/products/compil_scripts/PERSALYS-v12.0.sh @@ -24,10 +24,10 @@ CMAKE_OPTIONS+=" -DOpenTURNS_DIR=$OT_ROOT_DIR/lib/cmake/openturns" CMAKE_OPTIONS+=" -DPy2cpp_DIR=$PY2CPP_ROOT_DIR//lib/cmake/py2cpp" # strangely Centos 8 fails to guess qwt installation -if [[ $DIST_NAME == "CO" && $DIST_VERSION == "8" && $APPLICATION_NAME =~ native ]]; then +if [[ $DIST_NAME == "CO" && $DIST_VERSION == "8" && "$SAT_qwt_IS_NATIVE" == "1" ]]; then CMAKE_OPTIONS+=" -DQWT_LIBRARY=/usr/lib64/libqwt-qt5.so" CMAKE_OPTIONS+=" -DQWT_INCLUDE_DIR=/usr/include/qt5/qwt" -elif [ "$QWT_ROOT_DIR" != "/usr" ]; then +elif [ "$SAT_qwt_IS_NATIVE" != "1" ]; then CMAKE_OPTIONS+=" -DQWT_LIBRARY=$QWT_ROOT_DIR/lib/libqwt.so" CMAKE_OPTIONS+=" -DQWT_INCLUDE_DIR=$QWT_ROOT_DIR/include" fi @@ -46,17 +46,22 @@ fi CMAKE_OPTIONS+=" -DPYTHON_EXECUTABLE=$PYTHONBIN" CMAKE_OPTIONS+=" -DPYTHON_INCLUDE_DIR=$PYTHON_INCLUDE" -if [ "$PYTHON_ROOT_DIR" != "/usr" ]; then +if [ "$SAT_Python_IS_NATIVE" != "1" ]; then CMAKE_OPTIONS+=" -DPYTHON_LIBRARY=$PYTHON_ROOT_DIR/lib/libpython$PYTHON_VERSION.so" fi -if [ "$SPHINX_ROOT_DIR" != "/usr" ]; then +if [ "$SAT_Sphinx_IS_NATIVE" != "1" ]; then CMAKE_OPTIONS+=" -DSPHINX_ROOT_DIR:FILEPATH=$SPHINX_ROOT_DIR" CMAKE_OPTIONS+=" -DSPHINX_EXECUTABLE:FILEPATH=$SPHINX_ROOT_DIR/bin/sphinx-build" fi CMAKE_OPTIONS+=" -DCMAKE_FIND_ROOT_PATH=ON" CMAKE_OPTIONS+=" -DSWIG_EXECUTABLE:PATH=$(which swig)" +if [ "${SAT_cgns_IS_NATIVE}" != "1" ] +then + CMAKE_OPTIONS+=" -DCGNS_INCLUDE_DIR:PATH=${CGNS_ROOT_DIR}/include" + CMAKE_OPTIONS+=" -DCGNS_LIBRARY:PATH=${CGNS_ROOT_DIR}/lib/libcgns.so" +fi if [ -n "$SAT_DEBUG" ]; then CMAKE_OPTIONS+=" -DCMAKE_BUILD_TYPE:STRING=Debug" else diff --git a/products/compil_scripts/openturns-1.18.sh b/products/compil_scripts/openturns-1.18.sh index 78da8e1..9afbfd2 100755 --- a/products/compil_scripts/openturns-1.18.sh +++ b/products/compil_scripts/openturns-1.18.sh @@ -18,6 +18,7 @@ if [ -n "$SAT_HPC" ] && [ -n "$MPI_ROOT_DIR" ]; then fi CMAKE_OPTIONS+=" -DCMAKE_INSTALL_PREFIX:STRING=${PRODUCT_INSTALL}" +CMAKE_OPTIONS+=" -DCMAKE_INSTALL_LIBDIR:STRING=lib" CMAKE_OPTIONS+=" -DCMAKE_BUILD_TYPE:STRING=Release" CMAKE_OPTIONS+=" -DPYTHON_EXECUTABLE=${PYTHONBIN}" @@ -338,7 +339,8 @@ if [[ -d "$SOURCE_DIR/otfftw-0.11" ]]; then SITE_PATCH=/usr/lib/pypy/dist-packages/setuptools/site-patch.py ;; FD34) - SITE_PATCH= + ###SITE_PATCH= + SITE_PATCH=$SOURCE_DIR/addons/site-patch.py ;; CO8*) SITE_PATCH=/usr/lib/pypy/dist-packages/setuptools/site-patch.py diff --git a/products/patches/omniORB-4.2.3-windows-debug.patch b/products/patches/omniORB-4.2.3-windows-debug.patch index 5a6bc02..bac2c54 100644 --- a/products/patches/omniORB-4.2.3-windows-debug.patch +++ b/products/patches/omniORB-4.2.3-windows-debug.patch @@ -1,6 +1,14 @@ -diff -Naur omniORB-4.2.3_ref/config/config.mk omniORB-4.2.3_new/config/config.mk ---- omniORB-4.2.3_ref/config/config.mk 2017-05-11 15:01:56.000000000 +0200 -+++ omniORB-4.2.3_new/config/config.mk 2021-12-10 15:49:15.278207366 +0100 +--- omniORB-4.2.3_ref/config/config.mk 2022-04-20 12:57:28.336536788 +0200 ++++ omniORB-4.2.3_new/config/config.mk 2022-04-20 12:57:36.864615145 +0200 +@@ -25,7 +25,7 @@ + # You should also look at /mk/platforms/$(platform).mk and if necessary + # edit the make variables, such as CC and CXX, in the file. + +-#platform = x86_win32_vs_15 ++platform = x86_win32_vs_15 + #platform = x86_win32_vs_14 + #platform = x86_win32_vs_12 + #platform = x86_win32_vs_11 @@ -116,7 +116,7 @@ # libraries. Setting this variable causes the build to break in subtle # ways. DO NOT SET THIS UNLESS YOU KNOW WHAT YOU ARE DOING. @@ -10,3 +18,14 @@ diff -Naur omniORB-4.2.3_ref/config/config.mk omniORB-4.2.3_new/config/config.mk # EXPORT_TREE = $(TOP) +--- omniORB-4.2.3_ref/src/tool/omniidl/cxx/dir.mk 2018-05-08 18:57:00.000000000 +0200 ++++ omniORB-4.2.3_new/src/tool/omniidl/cxx/dir.mk 2022-04-20 12:41:47.273874626 +0200 +@@ -196,7 +196,7 @@ + PYLIB := -lpython$(subst .,,$(PYVERSION)) + CXXLINKOPTIONS += $(patsubst %,-L%,$(PYLIBDIR)) + else +-PYLIB := python$(subst .,,$(PYVERSION)).lib ++PYLIB := python$(subst .,,$(PYVERSION))_d.lib + CXXLINKOPTIONS += $(patsubst %,-libpath:%,$(PYLIBDIR)) + endif + -- 2.39.2