From 5a3660901df7fe1361f86372ec2f29bec0a0dba6 Mon Sep 17 00:00:00 2001 From: Nabil Ghodbane Date: Thu, 25 Aug 2022 17:04:20 +0200 Subject: [PATCH] spns #29880: Ubuntu 22.04 --- applications/SALOME-master-native.pyconf | 5 +- products/compil_scripts/ADAO.sh | 2 +- products/compil_scripts/Babel.sh | 4 +- products/compil_scripts/C3PO.sh | 4 +- products/compil_scripts/PyFMI-2.5.sh | 4 +- products/compil_scripts/Sphinx.sh | 4 +- products/compil_scripts/YACSGEN.sh | 4 +- products/compil_scripts/alabaster.sh | 4 +- products/compil_scripts/certifi.sh | 4 +- products/compil_scripts/chardet.sh | 4 +- products/compil_scripts/click.sh | 4 +- products/compil_scripts/cython.sh | 4 +- products/compil_scripts/idna.sh | 4 +- products/compil_scripts/imagesize.sh | 4 +- products/compil_scripts/kiwisolver.sh | 4 +- products/compil_scripts/markupsafe.sh | 4 +- products/compil_scripts/matplotlib.sh | 4 +- products/compil_scripts/nlopt-2.5.0.bat | 80 ++++++++++++++++++ products/compil_scripts/nlopt-2.5.0.sh | 61 ++++++++++++++ products/compil_scripts/omniORB.sh | 3 +- products/compil_scripts/omniORBpy.sh | 2 +- products/compil_scripts/openturns-1.17.sh | 4 +- products/compil_scripts/openturns-1.18.sh | 17 +++- products/compil_scripts/packaging.sh | 4 +- products/compil_scripts/pip_install.sh | 4 +- products/compil_scripts/pockets.sh | 4 +- products/compil_scripts/psutil.sh | 4 +- products/compil_scripts/pyparsing.sh | 4 +- products/compil_scripts/pytz.sh | 4 +- products/compil_scripts/requests.sh | 4 +- products/compil_scripts/sip-5.5.0.sh | 4 +- products/compil_scripts/six.sh | 4 +- products/compil_scripts/snowballstemmer.sh | 4 +- .../compil_scripts/sphinxcontrib_napoleon.sh | 4 +- .../sphinxcontrib_websupport.sh | 4 +- products/compil_scripts/sphinxintl.sh | 4 +- products/compil_scripts/statsmodels-0.6.1.sh | 4 +- products/compil_scripts/statsmodels-0.8.0.sh | 4 +- products/compil_scripts/typing.sh | 6 +- products/compil_scripts/urllib3.sh | 4 +- products/env_scripts/Python.py | 3 +- products/env_scripts/qt.py | 1 + products/medfile.pyconf | 9 ++ products/nlopt.pyconf | 8 +- products/omniORB.pyconf | 5 ++ products/omniORBpy.pyconf | 8 +- products/patches/SPNS-29880-medfile.patch | 22 +++++ products/patches/omniORB-4.2.5.p1.patch | 84 +++++++++++++++++++ products/patches/omniORBpy-4.2.5.p1.patch | 74 ++++++++++++++++ .../patches/root-6.22-afterImage.UB22.patch | 11 +++ .../patches/root-6.22-string_view.UB22.patch | 18 ++++ products/root.pyconf | 6 ++ 52 files changed, 470 insertions(+), 83 deletions(-) create mode 100644 products/compil_scripts/nlopt-2.5.0.bat create mode 100755 products/compil_scripts/nlopt-2.5.0.sh create mode 100644 products/patches/SPNS-29880-medfile.patch create mode 100644 products/patches/omniORB-4.2.5.p1.patch create mode 100644 products/patches/omniORBpy-4.2.5.p1.patch create mode 100644 products/patches/root-6.22-afterImage.UB22.patch create mode 100644 products/patches/root-6.22-string_view.UB22.patch diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf index dc6801b..7deba4a 100644 --- a/applications/SALOME-master-native.pyconf +++ b/applications/SALOME-master-native.pyconf @@ -217,13 +217,16 @@ __overwrite__ : # __condition__ : "VARS.dist in ['UB22.04']" 'APPLICATION.products.opencv' : '3.2.0' + 'APPLICATION.products.nlopt' : '2.5.0' 'APPLICATION.products.cminpack': 'native' 'APPLICATION.products.PyFMI' : {tag: '2.5', base: 'no', section: 'version_2_5_no_pip' } 'APPLICATION.products.netcdf' : '4.6.2' 'APPLICATION.rm_products' : ['mesa'] 'APPLICATION.products.omniORB' : '4.2.5' 'APPLICATION.products.omniORBpy' : '4.2.5' - 'APPLICATION.products.ParaView' : {tag: '5.9.0', base: 'no', section: 'version_5_9_0_UB22_04', hpc: 'yes'} + 'APPLICATION.products.ParaView' : {tag: '5.9.0', base: 'no', section: 'version_5_9_0_UB22_04', hpc: 'yes'} + 'APPLICATION.products.root' : {tag: '6.22.02', base: 'no', section: 'version_6_22_02_UB22_04'} + 'APPLICATION.products.medfile' : {tag: '4.1.1', base: 'no', section: 'version_4_1_1_UB22_04'} } { # DB10: diff --git a/products/compil_scripts/ADAO.sh b/products/compil_scripts/ADAO.sh index 188ff66..72d3ead 100755 --- a/products/compil_scripts/ADAO.sh +++ b/products/compil_scripts/ADAO.sh @@ -48,7 +48,7 @@ echo "Compile ADAO MODULE" echo "##########################################################################" export ADAO_PYTHON_ROOT_DIR=${CURRENT_SOFTWARE_INSTALL_DIR} export ADAO_ENGINE_ROOT_DIR==${CURRENT_SOFTWARE_INSTALL_DIR} -export PYTHONPATH=${PRODUCT_INSTALL}/lib/python${PYTHON_VERSION:0:3}/site-packages:$PYTHONPATH +export PYTHONPATH=${PRODUCT_INSTALL}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH CMAKE_OPTIONS="" diff --git a/products/compil_scripts/Babel.sh b/products/compil_scripts/Babel.sh index 9053e1a..5cb45dd 100755 --- a/products/compil_scripts/Babel.sh +++ b/products/compil_scripts/Babel.sh @@ -10,10 +10,10 @@ echo "*** build in SOURCE directory" cd $SOURCE_DIR # we don't install in python directory -> modify environment as described in INSTALL file -mkdir -p $PRODUCT_INSTALL/lib/python${PYTHON_VERSION:0:3}/site-packages +mkdir -p $PRODUCT_INSTALL/lib/python${PYTHON_VERSION}/site-packages export PATH=$(pwd)/bin:$PATH export PYTHONPATH=$(pwd):$PYTHONPATH -export PYTHONPATH=${PRODUCT_INSTALL}/lib/python${PYTHON_VERSION:0:3}/site-packages:$PYTHONPATH +export PYTHONPATH=${PRODUCT_INSTALL}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH echo echo "*** build and install with $PYTHONBIN" diff --git a/products/compil_scripts/C3PO.sh b/products/compil_scripts/C3PO.sh index fa02dfa..6d9801a 100755 --- a/products/compil_scripts/C3PO.sh +++ b/products/compil_scripts/C3PO.sh @@ -15,10 +15,10 @@ for X in env.sh runAllTests.sh; do find . -name $X |xargs rm -f done -mkdir -p $PRODUCT_INSTALL/lib/python${PYTHON_VERSION:0:3}/site-packages +mkdir -p $PRODUCT_INSTALL/lib/python${PYTHON_VERSION}/site-packages export PATH=${PRODUCT_INSTALL}/bin:$PATH export PYTHONPATH=$PWD:$PYTHONPATH -export PYTHONPATH=${PRODUCT_INSTALL}/lib/python${PYTHON_VERSION:0:3}/site-packages:$PYTHONPATH +export PYTHONPATH=${PRODUCT_INSTALL}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH echo echo "*** build and install with $PYTHONBIN sources/setup.py install --prefix=$PRODUCT_INSTALL" diff --git a/products/compil_scripts/PyFMI-2.5.sh b/products/compil_scripts/PyFMI-2.5.sh index fcc9e02..152546c 100755 --- a/products/compil_scripts/PyFMI-2.5.sh +++ b/products/compil_scripts/PyFMI-2.5.sh @@ -13,10 +13,10 @@ cd $BUILD_DIR cp -R $SOURCE_DIR/* . rm -f $BUILD_DIR/src/pyfmi/*.c -#mkdir -p $PRODUCT_INSTALL/lib/python${PYTHON_VERSION:0:3}/site-packages +#mkdir -p $PRODUCT_INSTALL/lib/python${PYTHON_VERSION}/site-packages export PATH=$(pwd)/bin:$PATH export PYTHONPATH=$(pwd):$PYTHONPATH -#export PYTHONPATH=${PRODUCT_INSTALL}/lib/python${PYTHON_VERSION:0:3}/site-packages:$PYTHONPATH +#export PYTHONPATH=${PRODUCT_INSTALL}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH echo echo "*** build with $PYTHONBIN" diff --git a/products/compil_scripts/Sphinx.sh b/products/compil_scripts/Sphinx.sh index b2d11da..9249028 100755 --- a/products/compil_scripts/Sphinx.sh +++ b/products/compil_scripts/Sphinx.sh @@ -10,10 +10,10 @@ echo "*** build in SOURCE directory" cd $SOURCE_DIR # we don't install in python directory -> modify environment as described in INSTALL file -mkdir -p $PRODUCT_INSTALL/lib/python${PYTHON_VERSION:0:3}/site-packages +mkdir -p $PRODUCT_INSTALL/lib/python${PYTHON_VERSION}/site-packages export PATH=$(pwd)/bin:$PATH export PYTHONPATH=$(pwd):$PYTHONPATH -export PYTHONPATH=${PRODUCT_INSTALL}/lib/python${PYTHON_VERSION:0:3}/site-packages:$PYTHONPATH +export PYTHONPATH=${PRODUCT_INSTALL}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH echo echo "*** build and install with $PYTHONBIN" diff --git a/products/compil_scripts/YACSGEN.sh b/products/compil_scripts/YACSGEN.sh index 2c672e8..4afd768 100755 --- a/products/compil_scripts/YACSGEN.sh +++ b/products/compil_scripts/YACSGEN.sh @@ -10,10 +10,10 @@ echo "*** build in SOURCE directory" cd $SOURCE_DIR # we don't install in python directory -> modify environment as described in INSTALL file -mkdir -p $PRODUCT_INSTALL/lib/python${PYTHON_VERSION:0:3}/site-packages +mkdir -p $PRODUCT_INSTALL/lib/python${PYTHON_VERSION}/site-packages export PATH=$(pwd)/bin:$PATH export PYTHONPATH=$(pwd):$PYTHONPATH -export PYTHONPATH=${PRODUCT_INSTALL}/lib/python${PYTHON_VERSION:0:3}/site-packages:$PYTHONPATH +export PYTHONPATH=${PRODUCT_INSTALL}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH echo echo "*** build and install with $PYTHONBIN" diff --git a/products/compil_scripts/alabaster.sh b/products/compil_scripts/alabaster.sh index 69cb615..55da154 100755 --- a/products/compil_scripts/alabaster.sh +++ b/products/compil_scripts/alabaster.sh @@ -10,10 +10,10 @@ echo "*** build in SOURCE directory" cd $SOURCE_DIR # we don't install in python directory -> modify environment as described in INSTALL file -mkdir -p $PRODUCT_INSTALL/lib/python${PYTHON_VERSION:0:3}/site-packages +mkdir -p $PRODUCT_INSTALL/lib/python${PYTHON_VERSION}/site-packages export PATH=$(pwd)/bin:$PATH export PYTHONPATH=$(pwd):$PYTHONPATH -export PYTHONPATH=${PRODUCT_INSTALL}/lib/python${PYTHON_VERSION:0:3}/site-packages:$PYTHONPATH +export PYTHONPATH=${PRODUCT_INSTALL}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH echo echo "*** build and install with $PYTHONBIN" diff --git a/products/compil_scripts/certifi.sh b/products/compil_scripts/certifi.sh index d478e2b..b9ab105 100755 --- a/products/compil_scripts/certifi.sh +++ b/products/compil_scripts/certifi.sh @@ -10,10 +10,10 @@ echo "*** build in SOURCE directory" cd $SOURCE_DIR # we don't install in python directory -> modify environment as described in INSTALL file -mkdir -p $PRODUCT_INSTALL/lib/python${PYTHON_VERSION:0:3}/site-packages +mkdir -p $PRODUCT_INSTALL/lib/python${PYTHON_VERSION}/site-packages export PATH=$(pwd)/bin:$PATH export PYTHONPATH=$(pwd):$PYTHONPATH -export PYTHONPATH=${PRODUCT_INSTALL}/lib/python${PYTHON_VERSION:0:3}/site-packages:$PYTHONPATH +export PYTHONPATH=${PRODUCT_INSTALL}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH echo echo "*** build and install with $PYTHONBIN" diff --git a/products/compil_scripts/chardet.sh b/products/compil_scripts/chardet.sh index 1ba9f9c..848beff 100755 --- a/products/compil_scripts/chardet.sh +++ b/products/compil_scripts/chardet.sh @@ -10,10 +10,10 @@ echo "*** build in SOURCE directory" cd $SOURCE_DIR # we don't install in python directory -> modify environment as described in INSTALL file -mkdir -p $PRODUCT_INSTALL/lib/python${PYTHON_VERSION:0:3}/site-packages +mkdir -p $PRODUCT_INSTALL/lib/python${PYTHON_VERSION}/site-packages export PATH=$(pwd)/bin:$PATH export PYTHONPATH=$(pwd):$PYTHONPATH -export PYTHONPATH=${PRODUCT_INSTALL}/lib/python${PYTHON_VERSION:0:3}/site-packages:$PYTHONPATH +export PYTHONPATH=${PRODUCT_INSTALL}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH echo echo "*** build and install with $PYTHONBIN" diff --git a/products/compil_scripts/click.sh b/products/compil_scripts/click.sh index 4489eb0..2034045 100755 --- a/products/compil_scripts/click.sh +++ b/products/compil_scripts/click.sh @@ -10,10 +10,10 @@ echo "*** build in SOURCE directory" cd $SOURCE_DIR # we don't install in python directory -> modify environment as described in INSTALL file -mkdir -p $PRODUCT_INSTALL/lib/python${PYTHON_VERSION:0:3}/site-packages +mkdir -p $PRODUCT_INSTALL/lib/python${PYTHON_VERSION}/site-packages export PATH=$(pwd)/bin:$PATH export PYTHONPATH=$(pwd):$PYTHONPATH -export PYTHONPATH=${PRODUCT_INSTALL}/lib/python${PYTHON_VERSION:0:3}/site-packages:$PYTHONPATH +export PYTHONPATH=${PRODUCT_INSTALL}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH echo echo "*** build and install with $PYTHONBIN" diff --git a/products/compil_scripts/cython.sh b/products/compil_scripts/cython.sh index ab54eda..2d773fc 100755 --- a/products/compil_scripts/cython.sh +++ b/products/compil_scripts/cython.sh @@ -10,10 +10,10 @@ echo "*** build in SOURCE directory" cd $SOURCE_DIR # we don't install in python directory -> modify environment as described in INSTALL file -mkdir -p $PRODUCT_INSTALL/lib/python${PYTHON_VERSION:0:3}/site-packages +mkdir -p $PRODUCT_INSTALL/lib/python${PYTHON_VERSION}/site-packages export PATH=$(pwd)/bin:$PATH export PYTHONPATH=$(pwd):$PYTHONPATH -export PYTHONPATH=${PRODUCT_INSTALL}/lib/python${PYTHON_VERSION:0:3}/site-packages:$PYTHONPATH +export PYTHONPATH=${PRODUCT_INSTALL}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH echo echo "*** build and install with $PYTHONBIN" diff --git a/products/compil_scripts/idna.sh b/products/compil_scripts/idna.sh index 2b0950d..7cd3ee0 100755 --- a/products/compil_scripts/idna.sh +++ b/products/compil_scripts/idna.sh @@ -10,10 +10,10 @@ echo "*** build in SOURCE directory" cd $SOURCE_DIR # we don't install in python directory -> modify environment as described in INSTALL file -mkdir -p $PRODUCT_INSTALL/lib/python${PYTHON_VERSION:0:3}/site-packages +mkdir -p $PRODUCT_INSTALL/lib/python${PYTHON_VERSION}/site-packages export PATH=$(pwd)/bin:$PATH export PYTHONPATH=$(pwd):$PYTHONPATH -export PYTHONPATH=${PRODUCT_INSTALL}/lib/python${PYTHON_VERSION:0:3}/site-packages:$PYTHONPATH +export PYTHONPATH=${PRODUCT_INSTALL}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH echo echo "*** build and install with $PYTHONBIN" diff --git a/products/compil_scripts/imagesize.sh b/products/compil_scripts/imagesize.sh index aa08acc..641de7b 100755 --- a/products/compil_scripts/imagesize.sh +++ b/products/compil_scripts/imagesize.sh @@ -10,10 +10,10 @@ echo "*** build in SOURCE directory" cd $SOURCE_DIR # we don't install in python directory -> modify environment as described in INSTALL file -mkdir -p $PRODUCT_INSTALL/lib/python${PYTHON_VERSION:0:3}/site-packages +mkdir -p $PRODUCT_INSTALL/lib/python${PYTHON_VERSION}/site-packages export PATH=$(pwd)/bin:$PATH export PYTHONPATH=$(pwd):$PYTHONPATH -export PYTHONPATH=${PRODUCT_INSTALL}/lib/python${PYTHON_VERSION:0:3}/site-packages:$PYTHONPATH +export PYTHONPATH=${PRODUCT_INSTALL}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH echo echo "*** build and install with $PYTHONBIN" diff --git a/products/compil_scripts/kiwisolver.sh b/products/compil_scripts/kiwisolver.sh index ae94a28..961281a 100755 --- a/products/compil_scripts/kiwisolver.sh +++ b/products/compil_scripts/kiwisolver.sh @@ -10,10 +10,10 @@ echo "*** build in SOURCE directory" cd $SOURCE_DIR # we don't install in python directory -> modify environment as described in INSTALL file -mkdir -p $PRODUCT_INSTALL/lib/python${PYTHON_VERSION:0:3}/site-packages +mkdir -p $PRODUCT_INSTALL/lib/python${PYTHON_VERSION}/site-packages export PATH=$(pwd)/bin:$PATH export PYTHONPATH=$(pwd):$PYTHONPATH -export PYTHONPATH=${PRODUCT_INSTALL}/lib/python${PYTHON_VERSION:0:3}/site-packages:$PYTHONPATH +export PYTHONPATH=${PRODUCT_INSTALL}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH echo echo "*** build and install with $PYTHONBIN" diff --git a/products/compil_scripts/markupsafe.sh b/products/compil_scripts/markupsafe.sh index 964589f..466a858 100755 --- a/products/compil_scripts/markupsafe.sh +++ b/products/compil_scripts/markupsafe.sh @@ -10,10 +10,10 @@ echo "*** build in SOURCE directory" cd $SOURCE_DIR # we don't install in python directory -> modify environment as described in INSTALL file -mkdir -p $PRODUCT_INSTALL/lib/python${PYTHON_VERSION:0:3}/site-packages +mkdir -p $PRODUCT_INSTALL/lib/python${PYTHON_VERSION}/site-packages export PATH=$(pwd)/bin:$PATH export PYTHONPATH=$(pwd):$PYTHONPATH -export PYTHONPATH=${PRODUCT_INSTALL}/lib/python${PYTHON_VERSION:0:3}/site-packages:$PYTHONPATH +export PYTHONPATH=${PRODUCT_INSTALL}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH echo echo "*** build and install with $PYTHONBIN" diff --git a/products/compil_scripts/matplotlib.sh b/products/compil_scripts/matplotlib.sh index 3b7720c..27caae6 100755 --- a/products/compil_scripts/matplotlib.sh +++ b/products/compil_scripts/matplotlib.sh @@ -10,10 +10,10 @@ echo "*** build in SOURCE directory" cd $SOURCE_DIR # we don't install in python directory -> modify environment as described in INSTALL file -mkdir -p $PRODUCT_INSTALL/lib/python${PYTHON_VERSION:0:3}/site-packages +mkdir -p $PRODUCT_INSTALL/lib/python${PYTHON_VERSION}/site-packages export PATH=$(pwd)/bin:$PATH export PYTHONPATH=$(pwd):$PYTHONPATH -export PYTHONPATH=${PRODUCT_INSTALL}/lib/python${PYTHON_VERSION:0:3}/site-packages:$PYTHONPATH +export PYTHONPATH=${PRODUCT_INSTALL}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH echo echo "*** build and install with $PYTHONBIN" diff --git a/products/compil_scripts/nlopt-2.5.0.bat b/products/compil_scripts/nlopt-2.5.0.bat new file mode 100644 index 0000000..bbfa6cc --- /dev/null +++ b/products/compil_scripts/nlopt-2.5.0.bat @@ -0,0 +1,80 @@ +@echo off + +echo ########################################################################## +echo nlopt %VERSION% +echo ########################################################################## + +IF NOT DEFINED SAT_DEBUG ( + SET SAT_DEBUG=0 +) + +SET PRODUCT_BUILD_TYPE=Release +if %SAT_DEBUG% == 1 ( + set PRODUCT_BUILD_TYPE=Debug +) + +set PLATFORM_TARGET=x64 +if "%SALOME_APPLICATION_NAME%" == "URANIE" ( + set PLATFORM_TARGET=Win32 +) + +if NOT exist "%PRODUCT_INSTALL%" mkdir %PRODUCT_INSTALL% +REM clean BUILD directory +if exist "%BUILD_DIR%" rmdir /Q /S %BUILD_DIR% +mkdir %BUILD_DIR% + +cd %BUILD_DIR% +set CMAKE_OPTIONS= +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_INSTALL_PREFIX:STRING=%PRODUCT_INSTALL:\=/% +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_BUILD_TYPE=%PRODUCT_BUILD_TYPE% +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DBUILD_SHARED_LIBS:BOOL=ON +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DNLOPT_MATLAB:BOOL=OFF +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DNLOPT_OCTAVE:BOOL=OFF +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DNLOPT_GUILE:BOOL=OFF +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DSWIG_EXECUTABLE=%SWIG_ROOT_DIR:\=/%/bin/swig.exe +if %PLATFORM_TARGET% == Win32 ( + set CMAKE_OPTIONS=%CMAKE_OPTIONS% -A Win32 -Thost=x64 -DCMAKE_SYSTEM_VERSION=10.0.19041.0 +) +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR:STRING=%CMAKE_GENERATOR% + +set MSBUILDDISABLENODEREUSE=1 + +echo. +echo ********************************************************************* +echo *** %CMAKE_ROOT%\bin\cmake %CMAKE_OPTIONS% %SOURCE_DIR% +echo ********************************************************************* +echo. + +%CMAKE_ROOT%\bin\cmake %CMAKE_OPTIONS% %SOURCE_DIR% +if NOT %ERRORLEVEL% == 0 ( + echo "ERROR on cmake" + exit 1 +) + +echo. +echo ********************************************************************* +echo *** msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% /p:Platform=%PLATFORM_TARGET% ALL_BUILD.vcxproj + +echo ********************************************************************* +echo. + +msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% /p:Platform=%PLATFORM_TARGET% ALL_BUILD.vcxproj +if NOT %ERRORLEVEL% == 0 ( + echo ERROR on msbuild gmsh.vcxproj + exit 2 +) + +echo. +echo ********************************************************************* +echo *** installation... +echo ********************************************************************* +echo. + +msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% /p:Platform=%PLATFORM_TARGET% INSTALL.vcxproj +if NOT %ERRORLEVEL% == 0 ( + echo ERROR on msbuild INSTALL.vcxproj + exit 3 +) + +echo. +echo ########## END diff --git a/products/compil_scripts/nlopt-2.5.0.sh b/products/compil_scripts/nlopt-2.5.0.sh new file mode 100755 index 0000000..856bbd1 --- /dev/null +++ b/products/compil_scripts/nlopt-2.5.0.sh @@ -0,0 +1,61 @@ +#!/bin/bash + +echo "##########################################################################" +echo "nlopt" $VERSION +echo "##########################################################################" + +CMAKE_OPTIONS="" + +### common compiler and install settings +CMAKE_OPTIONS+=" -DCMAKE_INSTALL_PREFIX:STRING=${PRODUCT_INSTALL}" +CMAKE_OPTIONS+=" -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON" +if [ -n "$SAT_DEBUG" ]; then + CMAKE_OPTIONS+=" -DCMAKE_BUILD_TYPE:STRING=Debug" +else + CMAKE_OPTIONS+=" -DCMAKE_BUILD_TYPE:STRING=Release" +fi + +if [ -n "$SWIG_ROOT_DIR" ] && [ "$SAT_swig_IS_NATIVE" != "1" ]; then + CMAKE_OPTIONS+=" -DSWIG_EXECUTABLE=${SWIG_ROOT_DIR}/bin/swig" +fi +CMAKE_OPTIONS+=" -DBUILD_SHARED_LIBS:BOOL=ON" +CMAKE_OPTIONS+=" -DNLOPT_MATLAB:BOOL=OFF" +CMAKE_OPTIONS+=" -DNLOPT_OCTAVE:BOOL=OFF" +CMAKE_OPTIONS+=" -DNLOPT_GUILE:BOOL=OFF" +CMAKE_OPTIONS+=" -DCMAKE_INSTALL_LIBDIR:STRING=lib" + +echo +echo "*** cmake" $CMAKE_OPTIONS + +rm -rf $BUILD_DIR +mkdir -p $BUILD_DIR +cd $BUILD_DIR + +cmake $CMAKE_OPTIONS $SOURCE_DIR +if [ $? -ne 0 ] +then + echo "ERROR on cmake" + exit 1 +fi + +echo +echo "*** make" $MAKE_OPTIONS +make $MAKE_OPTIONS +if [ $? -ne 0 ] +then + echo "ERROR on make" + exit 2 +fi + +echo +echo "*** make install" +make install +if [ $? -ne 0 ] +then + echo "ERROR on make install" + exit 3 +fi + +echo +echo "########## END" + diff --git a/products/compil_scripts/omniORB.sh b/products/compil_scripts/omniORB.sh index 3475c38..5d8322c 100755 --- a/products/compil_scripts/omniORB.sh +++ b/products/compil_scripts/omniORB.sh @@ -10,7 +10,7 @@ PYTHON_HOME=$PYTHONHOME echo echo "*** configure --prefix=$PRODUCT_INSTALL --disable-ipv6" -$SOURCE_DIR/configure --prefix=$PRODUCT_INSTALL --disable-ipv6 +$SOURCE_DIR/configure --prefix=$PRODUCT_INSTALL --disable-ipv6 if [ $? -ne 0 ] then echo "ERROR on configure" @@ -34,6 +34,7 @@ then echo "ERROR on make install" exit 3 fi + function version_ge() { test "$(echo "$@" | tr " " "\n" | sort -rV | head -n 1)" == "$1"; } if version_ge $VERSION "4.1" ; then diff --git a/products/compil_scripts/omniORBpy.sh b/products/compil_scripts/omniORBpy.sh index be12bdc..6fa96a3 100755 --- a/products/compil_scripts/omniORBpy.sh +++ b/products/compil_scripts/omniORBpy.sh @@ -5,7 +5,7 @@ echo "omniORBpy" $VERSION echo "##########################################################################" echo -echo "*** configure" +echo "*** configure --prefix=${OMNIORB_ROOT_DIR}" $SOURCE_DIR/configure --prefix=${OMNIORB_ROOT_DIR} if [ $? -ne 0 ] then diff --git a/products/compil_scripts/openturns-1.17.sh b/products/compil_scripts/openturns-1.17.sh index 6b5a2d0..c2ec4b7 100755 --- a/products/compil_scripts/openturns-1.17.sh +++ b/products/compil_scripts/openturns-1.17.sh @@ -5,10 +5,10 @@ echo "openturns" $VERSION echo "##########################################################################" # we don't install in python directory -> modify environment as described in INSTALL file -mkdir -p $PRODUCT_INSTALL/lib/python${PYTHON_VERSION:0:3}/site-packages +mkdir -p $PRODUCT_INSTALL/lib/python${PYTHON_VERSION}/site-packages export PATH=$(pwd)/bin:$PATH export PYTHONPATH=$(pwd):$PYTHONPATH -export PYTHONPATH=${PRODUCT_INSTALL}/lib/python${PYTHON_VERSION:0:3}/site-packages:$PYTHONPATH +export PYTHONPATH=${PRODUCT_INSTALL}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH CMAKE_OPTIONS="" if [ -n "$SAT_HPC" ] && [ -n "$MPI_ROOT_DIR" ]; then diff --git a/products/compil_scripts/openturns-1.18.sh b/products/compil_scripts/openturns-1.18.sh index 719726a..ec323e7 100755 --- a/products/compil_scripts/openturns-1.18.sh +++ b/products/compil_scripts/openturns-1.18.sh @@ -5,10 +5,11 @@ echo "openturns" $VERSION echo "##########################################################################" # we don't install in python directory -> modify environment as described in INSTALL file -mkdir -p $PRODUCT_INSTALL/lib/python${PYTHON_VERSION:0:3}/site-packages + +mkdir -p $PRODUCT_INSTALL/lib/python${PYTHON_VERSION}/site-packages export PATH=$(pwd)/bin:$PATH export PYTHONPATH=$(pwd):$PYTHONPATH -export PYTHONPATH=${PRODUCT_INSTALL}/lib/python${PYTHON_VERSION:0:3}/site-packages:$PYTHONPATH +export PYTHONPATH=${PRODUCT_INSTALL}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH CMAKE_OPTIONS="" if [ -n "$SAT_HPC" ] && [ -n "$MPI_ROOT_DIR" ]; then @@ -30,6 +31,17 @@ if [ -n "$TBB_ROOT_DIR" ] && [ "$SAT_tbb_IS_NATIVE" != "1" ]; then CMAKE_OPTIONS+=" -DTBB_ROOT_DIR=${TBB_ROOT_DIR}" fi +# https://github.com/persalys/persalys/issues/745 +LINUX_DISTRIBUTION="$DIST_NAME$DIST_VERSION" +case $LINUX_DISTRIBUTION in + UB22*|CO8*|CO9*) + echo "WARNING: switching OFF TBB support" + CMAKE_OPTIONS+=" -DUSE_TBB=OFF" + ;; + *) + ;; +esac + # Blas/Lapack if [ -n "$LAPACK_ROOT_DIR" ] && [ "$SAT_lapack_IS_NATIVE" != "1" ]; then CMAKE_OPTIONS+=" -DLAPACK_DIR=${LAPACK_ROOT_DIR}/lib/cmake/lapack-3.8.0" @@ -94,6 +106,7 @@ if [ -n "$NLOPT_ROOT_DIR" ] && [ "$SAT_nlopt_IS_NATIVE" != "1" ]; then fi + echo echo "*** cmake" $CMAKE_OPTIONS diff --git a/products/compil_scripts/packaging.sh b/products/compil_scripts/packaging.sh index 0140262..1c83c23 100755 --- a/products/compil_scripts/packaging.sh +++ b/products/compil_scripts/packaging.sh @@ -10,10 +10,10 @@ echo "*** build in SOURCE directory" cd $SOURCE_DIR # we don't install in python directory -> modify environment as described in INSTALL file -mkdir -p $PRODUCT_INSTALL/lib/python${PYTHON_VERSION:0:3}/site-packages +mkdir -p $PRODUCT_INSTALL/lib/python${PYTHON_VERSION}/site-packages export PATH=$(pwd)/bin:$PATH export PYTHONPATH=$(pwd):$PYTHONPATH -export PYTHONPATH=${PRODUCT_INSTALL}/lib/python${PYTHON_VERSION:0:3}/site-packages:$PYTHONPATH +export PYTHONPATH=${PRODUCT_INSTALL}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH echo echo "*** build and install with $PYTHONBIN" diff --git a/products/compil_scripts/pip_install.sh b/products/compil_scripts/pip_install.sh index f0caa45..3e409fa 100755 --- a/products/compil_scripts/pip_install.sh +++ b/products/compil_scripts/pip_install.sh @@ -12,10 +12,10 @@ echo "*** build in SOURCE directory" cd $SOURCE_DIR # we don't install in python directory -> modify environment as described in INSTALL file -mkdir -p $PRODUCT_INSTALL/lib/python${PYTHON_VERSION:0:3}/site-packages +mkdir -p $PRODUCT_INSTALL/lib/python${PYTHON_VERSION}/site-packages export PATH=$(pwd)/bin:$PATH export PYTHONPATH=$(pwd):$PYTHONPATH -export PYTHONPATH=${PRODUCT_INSTALL}/lib/python${PYTHON_VERSION:0:3}/site-packages:$PYTHONPATH +export PYTHONPATH=${PRODUCT_INSTALL}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH echo echo "*** build with $PYTHONBIN" diff --git a/products/compil_scripts/pockets.sh b/products/compil_scripts/pockets.sh index e16de65..c54303c 100755 --- a/products/compil_scripts/pockets.sh +++ b/products/compil_scripts/pockets.sh @@ -10,10 +10,10 @@ echo "*** build in SOURCE directory" cd $SOURCE_DIR # we don't install in python directory -> modify environment as described in INSTALL file -mkdir -p $PRODUCT_INSTALL/lib/python${PYTHON_VERSION:0:3}/site-packages +mkdir -p $PRODUCT_INSTALL/lib/python${PYTHON_VERSION}/site-packages export PATH=$(pwd)/bin:$PATH export PYTHONPATH=$(pwd):$PYTHONPATH -export PYTHONPATH=${PRODUCT_INSTALL}/lib/python${PYTHON_VERSION:0:3}/site-packages:$PYTHONPATH +export PYTHONPATH=${PRODUCT_INSTALL}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH echo echo "*** build and install with $PYTHONBIN" diff --git a/products/compil_scripts/psutil.sh b/products/compil_scripts/psutil.sh index b45c315..46cb9a1 100755 --- a/products/compil_scripts/psutil.sh +++ b/products/compil_scripts/psutil.sh @@ -10,10 +10,10 @@ echo "*** build in SOURCE directory" cd $SOURCE_DIR # we don't install in python directory -> modify environment as described in INSTALL file -mkdir -p $PRODUCT_INSTALL/lib/python${PYTHON_VERSION:0:3}/site-packages +mkdir -p $PRODUCT_INSTALL/lib/python${PYTHON_VERSION}/site-packages export PATH=$(pwd)/bin:$PATH export PYTHONPATH=$(pwd):$PYTHONPATH -export PYTHONPATH=${PRODUCT_INSTALL}/lib/python${PYTHON_VERSION:0:3}/site-packages:$PYTHONPATH +export PYTHONPATH=${PRODUCT_INSTALL}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH echo echo "*** build and install with $PYTHONBIN" diff --git a/products/compil_scripts/pyparsing.sh b/products/compil_scripts/pyparsing.sh index 8e35928..a7ca367 100755 --- a/products/compil_scripts/pyparsing.sh +++ b/products/compil_scripts/pyparsing.sh @@ -10,10 +10,10 @@ echo "*** build in SOURCE directory" cd $SOURCE_DIR # we don't install in python directory -> modify environment as described in INSTALL file -mkdir -p $PRODUCT_INSTALL/lib/python${PYTHON_VERSION:0:3}/site-packages +mkdir -p $PRODUCT_INSTALL/lib/python${PYTHON_VERSION}/site-packages export PATH=$(pwd)/bin:$PATH export PYTHONPATH=$(pwd):$PYTHONPATH -export PYTHONPATH=${PRODUCT_INSTALL}/lib/python${PYTHON_VERSION:0:3}/site-packages:$PYTHONPATH +export PYTHONPATH=${PRODUCT_INSTALL}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH echo echo "*** build and install with $PYTHONBIN" diff --git a/products/compil_scripts/pytz.sh b/products/compil_scripts/pytz.sh index 2c1c64d..c262de2 100755 --- a/products/compil_scripts/pytz.sh +++ b/products/compil_scripts/pytz.sh @@ -10,10 +10,10 @@ echo "*** build in SOURCE directory" cd $SOURCE_DIR # we don't install in python directory -> modify environment as described in INSTALL file -mkdir -p $PRODUCT_INSTALL/lib/python${PYTHON_VERSION:0:3}/site-packages +mkdir -p $PRODUCT_INSTALL/lib/python${PYTHON_VERSION}/site-packages export PATH=$(pwd)/bin:$PATH export PYTHONPATH=$(pwd):$PYTHONPATH -export PYTHONPATH=${PRODUCT_INSTALL}/lib/python${PYTHON_VERSION:0:3}/site-packages:$PYTHONPATH +export PYTHONPATH=${PRODUCT_INSTALL}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH echo echo "*** build and install with $PYTHONBIN" diff --git a/products/compil_scripts/requests.sh b/products/compil_scripts/requests.sh index cfeec8b..05713e5 100755 --- a/products/compil_scripts/requests.sh +++ b/products/compil_scripts/requests.sh @@ -10,10 +10,10 @@ echo "*** build in SOURCE directory" cd $SOURCE_DIR # we don't install in python directory -> modify environment as described in INSTALL file -mkdir -p $PRODUCT_INSTALL/lib/python${PYTHON_VERSION:0:3}/site-packages +mkdir -p $PRODUCT_INSTALL/lib/python${PYTHON_VERSION}/site-packages export PATH=$(pwd)/bin:$PATH export PYTHONPATH=$(pwd):$PYTHONPATH -export PYTHONPATH=${PRODUCT_INSTALL}/lib/python${PYTHON_VERSION:0:3}/site-packages:$PYTHONPATH +export PYTHONPATH=${PRODUCT_INSTALL}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH echo echo "*** build and install with $PYTHONBIN" diff --git a/products/compil_scripts/sip-5.5.0.sh b/products/compil_scripts/sip-5.5.0.sh index 6a0d878..60f829c 100755 --- a/products/compil_scripts/sip-5.5.0.sh +++ b/products/compil_scripts/sip-5.5.0.sh @@ -9,10 +9,10 @@ echo "*** build in SOURCE directory" cd $SOURCE_DIR/sip-5.5.0 # we don't install in python directory -> modify environment as described in INSTALL file -mkdir -p $PRODUCT_INSTALL/lib/python${PYTHON_VERSION:0:3}/site-packages +mkdir -p $PRODUCT_INSTALL/lib/python${PYTHON_VERSION}/site-packages export PATH=$(pwd)/bin:$PATH export PYTHONPATH=$(pwd):$PYTHONPATH -export PYTHONPATH=${PRODUCT_INSTALL}/lib/python${PYTHON_VERSION:0:3}/site-packages:$PYTHONPATH +export PYTHONPATH=${PRODUCT_INSTALL}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH echo echo "*** build with $PYTHONBIN" diff --git a/products/compil_scripts/six.sh b/products/compil_scripts/six.sh index 4f185d4..74b3d5b 100755 --- a/products/compil_scripts/six.sh +++ b/products/compil_scripts/six.sh @@ -10,10 +10,10 @@ echo "*** build in SOURCE directory" cd $SOURCE_DIR # we don't install in python directory -> modify environment as described in INSTALL file -mkdir -p $PRODUCT_INSTALL/lib/python${PYTHON_VERSION:0:3}/site-packages +mkdir -p $PRODUCT_INSTALL/lib/python${PYTHON_VERSION}/site-packages export PATH=$(pwd)/bin:$PATH export PYTHONPATH=$(pwd):$PYTHONPATH -export PYTHONPATH=${PRODUCT_INSTALL}/lib/python${PYTHON_VERSION:0:3}/site-packages:$PYTHONPATH +export PYTHONPATH=${PRODUCT_INSTALL}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH echo echo "*** build and install with $PYTHONBIN" diff --git a/products/compil_scripts/snowballstemmer.sh b/products/compil_scripts/snowballstemmer.sh index 7cdc251..58925b6 100755 --- a/products/compil_scripts/snowballstemmer.sh +++ b/products/compil_scripts/snowballstemmer.sh @@ -10,10 +10,10 @@ echo "*** build in SOURCE directory" cd $SOURCE_DIR # we don't install in python directory -> modify environment as described in INSTALL file -mkdir -p $PRODUCT_INSTALL/lib/python${PYTHON_VERSION:0:3}/site-packages +mkdir -p $PRODUCT_INSTALL/lib/python${PYTHON_VERSION}/site-packages export PATH=$(pwd)/bin:$PATH export PYTHONPATH=$(pwd):$PYTHONPATH -export PYTHONPATH=${PRODUCT_INSTALL}/lib/python${PYTHON_VERSION:0:3}/site-packages:$PYTHONPATH +export PYTHONPATH=${PRODUCT_INSTALL}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH echo echo "*** build and install with $PYTHONBIN" diff --git a/products/compil_scripts/sphinxcontrib_napoleon.sh b/products/compil_scripts/sphinxcontrib_napoleon.sh index c74b284..f60c3ad 100755 --- a/products/compil_scripts/sphinxcontrib_napoleon.sh +++ b/products/compil_scripts/sphinxcontrib_napoleon.sh @@ -10,10 +10,10 @@ echo "*** build in SOURCE directory" cd $SOURCE_DIR # we don't install in python directory -> modify environment as described in INSTALL file -mkdir -p $PRODUCT_INSTALL/lib/python${PYTHON_VERSION:0:3}/site-packages +mkdir -p $PRODUCT_INSTALL/lib/python${PYTHON_VERSION}/site-packages export PATH=$(pwd)/bin:$PATH export PYTHONPATH=$(pwd):$PYTHONPATH -export PYTHONPATH=${PRODUCT_INSTALL}/lib/python${PYTHON_VERSION:0:3}/site-packages:$PYTHONPATH +export PYTHONPATH=${PRODUCT_INSTALL}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH echo echo "*** build and install with $PYTHONBIN" diff --git a/products/compil_scripts/sphinxcontrib_websupport.sh b/products/compil_scripts/sphinxcontrib_websupport.sh index 02ed2d7..7f882f8 100755 --- a/products/compil_scripts/sphinxcontrib_websupport.sh +++ b/products/compil_scripts/sphinxcontrib_websupport.sh @@ -10,10 +10,10 @@ echo "*** build in SOURCE directory" cd $SOURCE_DIR # we don't install in python directory -> modify environment as described in INSTALL file -mkdir -p $PRODUCT_INSTALL/lib/python${PYTHON_VERSION:0:3}/site-packages +mkdir -p $PRODUCT_INSTALL/lib/python${PYTHON_VERSION}/site-packages export PATH=$(pwd)/bin:$PATH export PYTHONPATH=$(pwd):$PYTHONPATH -export PYTHONPATH=${PRODUCT_INSTALL}/lib/python${PYTHON_VERSION:0:3}/site-packages:$PYTHONPATH +export PYTHONPATH=${PRODUCT_INSTALL}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH echo echo "*** build and install with $PYTHONBIN" diff --git a/products/compil_scripts/sphinxintl.sh b/products/compil_scripts/sphinxintl.sh index b0df5d0..5b05e30 100755 --- a/products/compil_scripts/sphinxintl.sh +++ b/products/compil_scripts/sphinxintl.sh @@ -10,10 +10,10 @@ echo "*** build in SOURCE directory" cd $SOURCE_DIR # we don't install in python directory -> modify environment as described in INSTALL file -mkdir -p $PRODUCT_INSTALL/lib/python${PYTHON_VERSION:0:3}/site-packages +mkdir -p $PRODUCT_INSTALL/lib/python${PYTHON_VERSION}/site-packages export PATH=$(pwd)/bin:$PATH export PYTHONPATH=$(pwd):$PYTHONPATH -export PYTHONPATH=${PRODUCT_INSTALL}/lib/python${PYTHON_VERSION:0:3}/site-packages:$PYTHONPATH +export PYTHONPATH=${PRODUCT_INSTALL}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH echo echo "*** build and install with $PYTHONBIN" diff --git a/products/compil_scripts/statsmodels-0.6.1.sh b/products/compil_scripts/statsmodels-0.6.1.sh index bf29f39..ca8bc03 100755 --- a/products/compil_scripts/statsmodels-0.6.1.sh +++ b/products/compil_scripts/statsmodels-0.6.1.sh @@ -17,10 +17,10 @@ if [[ $DIST_NAME == "CO" && $DIST_VERSION == "8" && $APPLICATION_NAME =~ native else PRODUCT_LIB=lib fi -mkdir -p $PRODUCT_INSTALL/${PRODUCT_LIB}/python${PYTHON_VERSION:0:3}/site-packages +mkdir -p $PRODUCT_INSTALL/${PRODUCT_LIB}/python${PYTHON_VERSION}/site-packages export PATH=$(pwd)/bin:$PATH export PYTHONPATH=$(pwd):$PYTHONPATH -export PYTHONPATH=${PRODUCT_INSTALL}/${PRODUCT_LIB}/python${PYTHON_VERSION:0:3}/site-packages:$PYTHONPATH +export PYTHONPATH=${PRODUCT_INSTALL}/${PRODUCT_LIB}/python${PYTHON_VERSION}/site-packages:$PYTHONPATH echo echo "*** build with $PYTHONBIN" diff --git a/products/compil_scripts/statsmodels-0.8.0.sh b/products/compil_scripts/statsmodels-0.8.0.sh index bf29f39..ca8bc03 100755 --- a/products/compil_scripts/statsmodels-0.8.0.sh +++ b/products/compil_scripts/statsmodels-0.8.0.sh @@ -17,10 +17,10 @@ if [[ $DIST_NAME == "CO" && $DIST_VERSION == "8" && $APPLICATION_NAME =~ native else PRODUCT_LIB=lib fi -mkdir -p $PRODUCT_INSTALL/${PRODUCT_LIB}/python${PYTHON_VERSION:0:3}/site-packages +mkdir -p $PRODUCT_INSTALL/${PRODUCT_LIB}/python${PYTHON_VERSION}/site-packages export PATH=$(pwd)/bin:$PATH export PYTHONPATH=$(pwd):$PYTHONPATH -export PYTHONPATH=${PRODUCT_INSTALL}/${PRODUCT_LIB}/python${PYTHON_VERSION:0:3}/site-packages:$PYTHONPATH +export PYTHONPATH=${PRODUCT_INSTALL}/${PRODUCT_LIB}/python${PYTHON_VERSION}/site-packages:$PYTHONPATH echo echo "*** build with $PYTHONBIN" diff --git a/products/compil_scripts/typing.sh b/products/compil_scripts/typing.sh index f12907c..8b42ab4 100755 --- a/products/compil_scripts/typing.sh +++ b/products/compil_scripts/typing.sh @@ -9,10 +9,10 @@ echo "########################################################################## echo "*** build in SOURCE directory" cd $SOURCE_DIR -mkdir -p $PRODUCT_INSTALL/lib/python${PYTHON_VERSION:0:3}/site-packages +mkdir -p $PRODUCT_INSTALL/lib/python${PYTHON_VERSION}/site-packages export PATH=$(pwd)/bin:$PATH export PYTHONPATH=$(pwd):$PYTHONPATH -export PYTHONPATH=${PRODUCT_INSTALL}/lib/python${PYTHON_VERSION:0:3}/site-packages:$PYTHONPATH +export PYTHONPATH=${PRODUCT_INSTALL}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH echo echo "*** install with $PYTHONBIN $PYTHON_VERSION" @@ -22,7 +22,7 @@ if version_ge $PYTHON_VERSION "3."; then echo "*** $VERSION >= 2.X is not supported and was not tested! Please, report this issue to SALOME support!" exit 3 else - $PYTHONBIN pip-10.0.1-py2.py3-none-any.whl/pip install --no-index --target $PRODUCT_INSTALL/lib/python${PYTHON_VERSION:0:3}/site-packages typing-${VERSION}-py2-none-any.whl + $PYTHONBIN pip-10.0.1-py2.py3-none-any.whl/pip install --no-index --target $PRODUCT_INSTALL/lib/python${PYTHON_VERSION}/site-packages typing-${VERSION}-py2-none-any.whl if [ $? -ne 0 ] then echo "ERROR on install" $? diff --git a/products/compil_scripts/urllib3.sh b/products/compil_scripts/urllib3.sh index ae5a27b..4409bea 100755 --- a/products/compil_scripts/urllib3.sh +++ b/products/compil_scripts/urllib3.sh @@ -10,10 +10,10 @@ echo "*** build in SOURCE directory" cd $SOURCE_DIR # we don't install in python directory -> modify environment as described in INSTALL file -mkdir -p $PRODUCT_INSTALL/lib/python${PYTHON_VERSION:0:3}/site-packages +mkdir -p $PRODUCT_INSTALL/lib/python${PYTHON_VERSION}/site-packages export PATH=$(pwd)/bin:$PATH export PYTHONPATH=$(pwd):$PYTHONPATH -export PYTHONPATH=${PRODUCT_INSTALL}/lib/python${PYTHON_VERSION:0:3}/site-packages:$PYTHONPATH +export PYTHONPATH=${PRODUCT_INSTALL}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH echo echo "*** build and install with $PYTHONBIN" diff --git a/products/env_scripts/Python.py b/products/env_scripts/Python.py index f02d87f..fc2f5fe 100644 --- a/products/env_scripts/Python.py +++ b/products/env_scripts/Python.py @@ -39,10 +39,9 @@ def set_env(env,prereq_dir,version,forBuild=None): def set_nativ_env(env): import sys, sysconfig - #env.set('PYTHONHOME',"%s.%s" % sys.version_info[0:2]) env.set('PYTHON_ROOT_DIR', "/usr") env.set('PYTHON_INCLUDE', "%s" % sysconfig.get_paths()['include']) - env.set('PYTHON_VERSION', "%s.%s" % sys.version_info[0:2]) + env.set('PYTHON_VERSION', sysconfig.get_python_version()) if sys.version_info[0] == 3 : env.set('PYTHONBIN','/usr/bin/python3') else: diff --git a/products/env_scripts/qt.py b/products/env_scripts/qt.py index 288de07..f74c41f 100644 --- a/products/env_scripts/qt.py +++ b/products/env_scripts/qt.py @@ -42,3 +42,4 @@ def set_nativ_env(env): env.set('Qt5Test_DIR', os.path.join(qt_lib_dir, 'cmake/Qt5Test')) env.set('Qt5X11Extras_DIR', os.path.join(qt_lib_dir, 'cmake/Qt5X11Extras')) env.set('QT_QPA_PLATFORM_PLUGIN_PATH', os.path.join(qt_lib_dir, 'qt5/plugins')) + env.prepend('LD_LIBRARY_PATH',qt_lib_dir) diff --git a/products/medfile.pyconf b/products/medfile.pyconf index ed7a18e..81cf3d1 100644 --- a/products/medfile.pyconf +++ b/products/medfile.pyconf @@ -45,6 +45,15 @@ version_4_1_1_win : patches : ['med-4.1.0_win_3x_files_support.patch'] } +# needed in order to screen with windows version - see below +version_4_1_1_UB22_04 : +{ + compil_script : 'med-4.1.1.sh' + test_build : "make check" + build_depend : ['swig'] + patches: ['SPNS-29880-medfile.patch'] +} + # needed in order to screen with windows version - see below version_4_1_0 : { diff --git a/products/nlopt.pyconf b/products/nlopt.pyconf index f242c76..70fe00d 100644 --- a/products/nlopt.pyconf +++ b/products/nlopt.pyconf @@ -32,11 +32,5 @@ default_win: version_2_5_0: { - build_source : "cmake" - cmake_options : "-DBUILD_SHARED_LIBS:BOOL=ON -DNLOPT_MATLAB:BOOL=OFF -DNLOPT_OCTAVE:BOOL=OFF -DNLOPT_GUILE:BOOL=OFF -DSWIG_EXECUTABLE=${SWIG_ROOT_DIR}/bin/swig -DCMAKE_INSTALL_LIBDIR:STRING=lib" -} - -version_2_5_0_win: -{ - build_source : "script" + compil_script : "nlopt-2.5.0" + $VARS.scriptExtension } diff --git a/products/omniORB.pyconf b/products/omniORB.pyconf index 1be9786..363becb 100644 --- a/products/omniORB.pyconf +++ b/products/omniORB.pyconf @@ -23,3 +23,8 @@ version_4_2_3_win_dbg: { patches: ['omniORB-4.2.3-windows-debug.patch'] } + +version_4_2_5: +{ + patches: ['omniORB-4.2.5.p1.patch'] +} diff --git a/products/omniORBpy.pyconf b/products/omniORBpy.pyconf index 48a2d7f..78d1a76 100644 --- a/products/omniORBpy.pyconf +++ b/products/omniORBpy.pyconf @@ -16,4 +16,10 @@ default : { incremental : "yes" } -} \ No newline at end of file +} + + +version_4_2_5: +{ + patches: ['omniORBpy-4.2.5.p1.patch'] +} diff --git a/products/patches/SPNS-29880-medfile.patch b/products/patches/SPNS-29880-medfile.patch new file mode 100644 index 0000000..f1a194b --- /dev/null +++ b/products/patches/SPNS-29880-medfile.patch @@ -0,0 +1,22 @@ +--- med-4.1.1_ref/configure 2021-10-08 11:05:43.000000000 +0200 ++++ med-4.1.1_new/configure 2022-08-25 14:42:21.285947589 +0200 +@@ -33062,7 +33062,8 @@ + case $am_cv_python_pythondir in + $am_py_prefix*) + am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'` +- am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,\\${PYTHON_PREFIX},"` ++# am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,\\${PYTHON_PREFIX},"` ++ am_cv_python_pythondir="\${PYTHON_PREFIX}/lib/python$PYTHON_VERSION/site-packages" + ;; + *) + case $am_py_prefix in +@@ -33107,7 +33108,8 @@ + case $am_cv_python_pyexecdir in + $am_py_exec_prefix*) + am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'` +- am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,\\${PYTHON_EXEC_PREFIX},"` ++ #am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,\\${PYTHON_EXEC_PREFIX},"` ++ am_cv_python_pyexecdir="\${PYTHON_EXEC_PREFIX}/lib/python$PYTHON_VERSION/site-packages" + ;; + *) + case $am_py_exec_prefix in diff --git a/products/patches/omniORB-4.2.5.p1.patch b/products/patches/omniORB-4.2.5.p1.patch new file mode 100644 index 0000000..4d55197 --- /dev/null +++ b/products/patches/omniORB-4.2.5.p1.patch @@ -0,0 +1,84 @@ +diff -Naur omniORB-4.2.5_ref/configure omniORB-4.2.5_new/configure +--- omniORB-4.2.5_ref/configure 2021-11-21 12:54:32.000000000 +0100 ++++ omniORB-4.2.5_new/configure 2022-08-24 15:31:58.859494037 +0200 +@@ -4309,7 +4309,7 @@ + if ${am_cv_python_version+:} false; then : + $as_echo_n "(cached) " >&6 + else +- am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"` ++ am_cv_python_version=`$PYTHON -c "import sys,sysconfig; sys.stdout.write(sysconfig.get_python_version())"` + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5 + $as_echo "$am_cv_python_version" >&6; } +@@ -4362,34 +4362,12 @@ + $as_echo_n "(cached) " >&6 + else + if test "x$prefix" = xNONE +- then +- am_py_prefix=$ac_default_prefix +- else +- am_py_prefix=$prefix +- fi +- am_cv_python_pythondir=`$PYTHON -c " +-$am_python_setup_sysconfig +-if can_use_sysconfig: +- sitedir = sysconfig.get_path('purelib', vars={'base':'$am_py_prefix'}) +-else: +- from distutils import sysconfig +- sitedir = sysconfig.get_python_lib(0, 0, prefix='$am_py_prefix') +-sys.stdout.write(sitedir)"` +- case $am_cv_python_pythondir in +- $am_py_prefix*) +- am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'` +- am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"` +- ;; +- *) +- case $am_py_prefix in +- /usr|/System*) ;; +- *) +- am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages +- ;; +- esac +- ;; +- esac +- ++ then ++ am_py_prefix=$ac_default_prefix ++ else ++ am_py_prefix=$prefix ++ fi ++ am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pythondir" >&5 + $as_echo "$am_cv_python_pythondir" >&6; } +@@ -4411,29 +4389,7 @@ + else + am_py_exec_prefix=$exec_prefix + fi +- am_cv_python_pyexecdir=`$PYTHON -c " +-$am_python_setup_sysconfig +-if can_use_sysconfig: +- sitedir = sysconfig.get_path('platlib', vars={'platbase':'$am_py_prefix'}) +-else: +- from distutils import sysconfig +- sitedir = sysconfig.get_python_lib(1, 0, prefix='$am_py_prefix') +-sys.stdout.write(sitedir)"` +- case $am_cv_python_pyexecdir in +- $am_py_exec_prefix*) +- am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'` +- am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"` +- ;; +- *) +- case $am_py_exec_prefix in +- /usr|/System*) ;; +- *) +- am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages +- ;; +- esac +- ;; +- esac +- ++ am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pyexecdir" >&5 + $as_echo "$am_cv_python_pyexecdir" >&6; } diff --git a/products/patches/omniORBpy-4.2.5.p1.patch b/products/patches/omniORBpy-4.2.5.p1.patch new file mode 100644 index 0000000..f626d6b --- /dev/null +++ b/products/patches/omniORBpy-4.2.5.p1.patch @@ -0,0 +1,74 @@ +diff -Naur omniORBpy-4.2.5_ref/configure omniORBpy-4.2.5_new/configure +--- omniORBpy-4.2.5_ref/configure 2021-11-21 12:54:32.000000000 +0100 ++++ omniORBpy-4.2.5_new/configure 2022-08-24 15:32:41.165692192 +0200 +@@ -3515,7 +3515,7 @@ + if ${am_cv_python_version+:} false; then : + $as_echo_n "(cached) " >&6 + else +- am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"` ++ am_cv_python_version=`$PYTHON -c "import sys,sysconfig; sys.stdout.write(sysconfig.get_python_version())"` + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5 + $as_echo "$am_cv_python_version" >&6; } +@@ -3573,29 +3573,7 @@ + else + am_py_prefix=$prefix + fi +- am_cv_python_pythondir=`$PYTHON -c " +-$am_python_setup_sysconfig +-if can_use_sysconfig: +- sitedir = sysconfig.get_path('purelib', vars={'base':'$am_py_prefix'}) +-else: +- from distutils import sysconfig +- sitedir = sysconfig.get_python_lib(0, 0, prefix='$am_py_prefix') +-sys.stdout.write(sitedir)"` +- case $am_cv_python_pythondir in +- $am_py_prefix*) +- am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'` +- am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"` +- ;; +- *) +- case $am_py_prefix in +- /usr|/System*) ;; +- *) +- am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages +- ;; +- esac +- ;; +- esac +- ++ am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pythondir" >&5 + $as_echo "$am_cv_python_pythondir" >&6; } +@@ -3617,29 +3595,7 @@ + else + am_py_exec_prefix=$exec_prefix + fi +- am_cv_python_pyexecdir=`$PYTHON -c " +-$am_python_setup_sysconfig +-if can_use_sysconfig: +- sitedir = sysconfig.get_path('platlib', vars={'platbase':'$am_py_prefix'}) +-else: +- from distutils import sysconfig +- sitedir = sysconfig.get_python_lib(1, 0, prefix='$am_py_prefix') +-sys.stdout.write(sitedir)"` +- case $am_cv_python_pyexecdir in +- $am_py_exec_prefix*) +- am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'` +- am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"` +- ;; +- *) +- case $am_py_exec_prefix in +- /usr|/System*) ;; +- *) +- am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages +- ;; +- esac +- ;; +- esac +- ++ am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pyexecdir" >&5 + $as_echo "$am_cv_python_pyexecdir" >&6; } diff --git a/products/patches/root-6.22-afterImage.UB22.patch b/products/patches/root-6.22-afterImage.UB22.patch new file mode 100644 index 0000000..5ffb64c --- /dev/null +++ b/products/patches/root-6.22-afterImage.UB22.patch @@ -0,0 +1,11 @@ +--- root-6.22.02_ref/graf2d/asimage/src/libAfterImage/Makefile.in 2020-08-17 14:41:56.000000000 +0200 ++++ root-6.22.02_new/graf2d/asimage/src/libAfterImage/Makefile.in 2022-08-25 13:18:49.848451106 +0200 +@@ -78,7 +78,7 @@ + EXTRA_DEFINES = @DEFINE_XLOCALE@ + + RANLIB = @RANLIB@ +-AR = ar clq ++AR = ar cq + CP = @CP@ + MV = @MV@ + RM = @RM@ diff --git a/products/patches/root-6.22-string_view.UB22.patch b/products/patches/root-6.22-string_view.UB22.patch new file mode 100644 index 0000000..ad76e1a --- /dev/null +++ b/products/patches/root-6.22-string_view.UB22.patch @@ -0,0 +1,18 @@ +--- root-6.22.02_ref/core/foundation/inc/ROOT/libcpp_string_view.h 2020-08-17 14:41:56.000000000 +0200 ++++ root-6.22.02_new/core/foundation/inc/ROOT/libcpp_string_view.h 2022-08-25 13:55:38.224944519 +0200 +@@ -10,7 +10,6 @@ + + #ifndef _LIBCPP_LFTS_STRING_VIEW + #define _LIBCPP_LFTS_STRING_VIEW +- + #ifndef RWrap_libcpp_string_view_h + #error "Do not use libcpp_string_view.h directly. #include \"RWrap_libcpp_string_view.h\" instead." + #endif // RWrap_libcpp_string_view_h +@@ -186,6 +185,7 @@ + #include + #include + #include ++#include + + //#include <__debug> + diff --git a/products/root.pyconf b/products/root.pyconf index 6b4aa8c..5ed66eb 100644 --- a/products/root.pyconf +++ b/products/root.pyconf @@ -66,6 +66,12 @@ version_6_22_02: patches : ['root-6.22.02.patch'] } +version_6_22_02_UB22_04: +{ + get_source : "archive" + patches : ['root-6.22.02.patch', 'root-6.22-afterImage.UB22.patch'] +} + version_6_22_02_win: { build_source : "script" -- 2.39.2