spns #29880: Ubuntu 22.04

diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf
index dc6801b0343e95f469d73b460a06a419faedbd41..7deba4a33ada733af57c0f8d1afde0aff77102ef 100644 (file)
--- 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 188ff66557f4b18654d9d6d94916e0bc8f1c02ba..72d3ead0b5434a4dbba2263d7abc33352f5dbd77 100755 (executable)
--- 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 9053e1a91703b89736c2adb1a54042e496fe3d23..5cb45ddf5401360ac1d4b689e38586bfe017b464 100755 (executable)
--- 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 fa02dfab23376ff315db6d7e3d6b211e18280f71..6d9801a260d7d9754a82316f99423335cb90d9b3 100755 (executable)
--- 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 fcc9e022047902c0aaa4958dc4acb215927f9af0..152546c98ca699ce9c6e0326df6d018d6fd7c11e 100755 (executable)
--- 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 b2d11dabf7506bd1fff985fe95320186c35682f8..9249028b70783642f133fb134591fd21efa92cba 100755 (executable)
--- 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 2c672e846513272bc5b7ac0a270331c01bb24314..4afd768a9f90b5ec018d11bbd425747485824a0b 100755 (executable)
--- 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 69cb615f3a381e1382f560ca0e4639cb37c12c54..55da154af5512a648214fbbd9e174c83500fc8e2 100755 (executable)
--- 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 d478e2b5162ea0e11be8ab67c3f0fa96599cd8b7..b9ab105eaff5707a930a4e19a88d2a7314d43f1b 100755 (executable)
--- 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 1ba9f9caf595ed71093babd73a58184caf0184ad..848beff323f1c658676da494dbd379bc0c6dfa3b 100755 (executable)
--- 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 4489eb06da55bc3fee64cef46d21b794d48c76d1..2034045316fcfadabf62dd914581fcda8a2a3e66 100755 (executable)
--- 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 ab54eda3ffcef8d4ae83dad6c487dd94169bb4ed..2d773fc3b370df5c8205f0489b714c5930351343 100755 (executable)
--- 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 2b0950da9e7ec58b0e8c506e9cc0af76381ed234..7cd3ee0d29dae218e8513872c15cd413c5a68875 100755 (executable)
--- 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 aa08accce24c1700b273bea883ffb1e6b7e72696..641de7ba49521d865d67005b321747f0b883495c 100755 (executable)
--- 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 ae94a28bc96f6056bd0cbea8973e031da44bd0e2..961281a38fc269f50cd079582b6073abbcdaa15a 100755 (executable)
--- 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 964589fcb2cd98d3230866574e7ac1a3d8aa075e..466a858e64f2a63ac89a944dcb567c461be4a531 100755 (executable)
--- 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 3b7720c62533f5a25ba6407e935a0e3cb27b6bfe..27caae6cfb418a342d27b8fb9bf0ed773422c371 100755 (executable)
--- 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 (file)
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 (executable)
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 3475c3860067f3f88254cc894dc751f4b82a4311..5d8322c41fc1388706056aadd96643f919c97396 100755 (executable)
--- 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 be12bdc7af172d08494ecdcd0afe88a76defdc8c..6fa96a38898122a7813ceceb78e39e46eb815d21 100755 (executable)
--- 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 6b5a2d00ae14caf5ed2df2dd4b9c6b9151bd10ce..c2ec4b75f4d4eba4cbeca0fb4899153598adc1f2 100755 (executable)
--- 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 719726a3e9b0c36e8389ed6aed6f2d15c80d9cab..ec323e7c104d27d0b4442754af704ad025c15345 100755 (executable)
--- 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 0140262a5b05f93d990aca4cec78423f912a996d..1c83c2391456b07f00a90863dbedeb36a54b4b10 100755 (executable)
--- 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 f0caa458cbd2219f827536ddebbea03d26883667..3e409fa0dc768926697570082cf955dc3aeeb196 100755 (executable)
--- 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 e16de6560bd343eeb06ef2937fd1c8fee74d4d72..c54303c1552901364043e34cb34735959540ff36 100755 (executable)
--- 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 b45c3151c6abc272ae405d6581e4cd5a31fec29a..46cb9a14e13b623a16fcb2d41634e0b5d5c6f55c 100755 (executable)
--- 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 8e359289bc23ebb9bcce54c28cb12edec07ad137..a7ca367be0f7c15136a0d1d2dca44646572e8dae 100755 (executable)
--- 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 2c1c64ddb932a89062ea55217dbf03ad8ba34cad..c262de2fd18645e630e7b385add4818116c74341 100755 (executable)
--- 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 cfeec8b016711b43b66844c15e2ec375288ad94a..05713e53003f567f3e8101a8cc6fbcde7ab447d0 100755 (executable)
--- 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 6a0d87819205c3cb28770cb229909e83b150fa60..60f829ce6da69f525cc29d90bf3c71cc1bec5a0a 100755 (executable)
--- 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 4f185d48e55e32044bba32bbb7d16dffac891a25..74b3d5b203537e9c574c8d264a16dcb87abc65aa 100755 (executable)
--- 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 7cdc2511eeb68334560086f1f550e5c032cbda6d..58925b6d4fcbf2d4ae8c044f40eaf20bd05fa379 100755 (executable)
--- 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 c74b2847a1f4c75de40e2a3508ace5e4534f02b9..f60c3adb6498ab63823edb60b1c1128fb9e36c06 100755 (executable)
--- 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 02ed2d7e1871cf9a6216538b171f662df192c1eb..7f882f8c51574843e26ae15d8aee868142e87bc3 100755 (executable)
--- 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 b0df5d0482aa4be757bcd659bda2883b74e39565..5b05e306a4849071ae3814586f141af8c6ddcd9a 100755 (executable)
--- 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 bf29f3943721f460545943b8117d14e8be2a6e69..ca8bc0361ff30af3fdd264344117ba3d2d0ff6a1 100755 (executable)
--- 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 bf29f3943721f460545943b8117d14e8be2a6e69..ca8bc0361ff30af3fdd264344117ba3d2d0ff6a1 100755 (executable)
--- 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 f12907c759c567c4fe8c057e7ead72cdd98532fa..8b42ab4ed4b0b7e8926a515ab82512b0804cbff4 100755 (executable)
--- 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 ae5a27b89d21330ea4f63cca38da4ceb249a343e..4409bea2c26217f80b64ca8ae020bc39554666bf 100755 (executable)
--- 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 f02d87f6977810297caf0ab66a1bec3c52bae5b0..fc2f5fe2ca3382dc1b074d43b2f04f6f121d15ff 100644 (file)
--- 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 288de0794c531908c3b02e06a6ad00bbd5f847fc..f74c41f3c46844fb85f475ce7001e84b70e75ef9 100644 (file)
--- 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 ed7a18e540811211920e6eaa1b616e11e71e5202..81cf3d11bbd2967781a1c5eb2e158c305b716b71 100644 (file)
--- 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 f242c7637e3ac962f0732f69392fee1d76c20fa6..70fe00db6179b3b6c7ca4bde454f0a227a0a694a 100644 (file)
--- 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 1be97860ad1a395538f6c893a412289108f592ec..363becbf85c293b5c7a7b71794c5d90e1f963be8 100644 (file)
--- 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 48a2d7fa4ea94ad45264e372e91156df0d5f6ceb..78d1a761dbc7ad6ed8f1dec6c28820efc131d014 100644 (file)
--- 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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 <ostream>
+ #include <iomanip>
+ #include <stdexcept>
++#include <limits>
+ 
+ //#include <__debug>
+ 

diff --git a/products/root.pyconf b/products/root.pyconf
index 6b4aa8cafdb87b700b71d07240598f907c4ed2cb..5ed66eb97f61f44559d0025b1f066056cffdf132 100644 (file)
--- 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"