add qt 5.15.15 product description - not switched on yet

diff --git a/products/compil_scripts/qt-5.15.15.bat b/products/compil_scripts/qt-5.15.15.bat
new file mode 100644 (file)
index 0000000..c569441
--- /dev/null
+++ b/products/compil_scripts/qt-5.15.15.bat
@@ -0,0 +1,77 @@
+@echo off
+
+echo ##########################################################################
+echo Qt %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-and-release
+)
+
+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 %SOURCE_DIR%
+
+REM Configure
+echo.
+echo --------------------------------------------------------------------------
+echo *** configure  
+echo --------------------------------------------------------------------------
+set QT_OPTIONS=-platform win32-msvc2017
+set QT_OPTIONS=%QT_OPTIONS% -opensource -confirm-license %PRODUCT_BUILD_TYPE%
+set QT_OPTIONS=%QT_OPTIONS% -no-angle -opengl desktop -nomake examples -nomake tests 
+set QT_OPTIONS=%QT_OPTIONS% -skip qtwebengine  -skip wayland -skip qtgamepad
+
+IF DEFINED OPENSSL_ROOT_DIR (
+  set QT_OPTIONS=%QT_OPTIONS% -ssl  -openssl -openssl-linked OPENSSL_PREFIX=%OPENSSL_ROOT_DIR%
+) else (
+  set QT_OPTIONS=%QT_OPTIONS% -no-openssl
+)
+
+set QT_OPTIONS=%QT_OPTIONS% -mp
+set QT_OPTIONS=%QT_OPTIONS% -prefix %PRODUCT_INSTALL%
+
+echo **** call %SOURCE_DIR%\configure  %QT_OPTIONS%
+call %SOURCE_DIR%\configure.bat  %QT_OPTIONS%
+if NOT %ERRORLEVEL% == 0 (
+    echo "ERROR on configure"
+    exit 1
+)
+
+nmake
+if NOT %ERRORLEVEL% == 0 (
+  exit 2
+)
+
+REM Installation
+echo.
+echo --------------------------------------------------------------------------
+echo *** nmake install
+echo --------------------------------------------------------------------------
+
+nmake install
+if NOT %ERRORLEVEL% == 0 (
+    echo "ERROR on nmake install"
+    exit 3
+)
+
+echo "*** Adding qt.conf file in order to be able to compile using the moved Qt installation"
+echo [Paths] >  %PRODUCT_INSTALL%\bin\qt.conf
+echo Prefix=../ >> %PRODUCT_INSTALL%\bin\qt.conf
+
+IF DEFINED OPENSSL_ROOT_DIR (
+  copy /Y /B %OPENSSL_ROOT_DIR%\lib\*.dll %PRODUCT_INSTALL%\bin\
+  copy /Y /B %OPENSSL_ROOT_DIR%\lib\*.lib %PRODUCT_INSTALL%\lib\
+)
+
+echo.
+echo ########## END
+

diff --git a/products/compil_scripts/qt-5.15.15.sh b/products/compil_scripts/qt-5.15.15.sh
new file mode 100755 (executable)
index 0000000..f0db65c
--- /dev/null
+++ b/products/compil_scripts/qt-5.15.15.sh
@@ -0,0 +1,78 @@
+#!/bin/bash
+
+echo "##########################################################################"
+echo "Qt" $VERSION
+echo "##########################################################################"
+
+LINUX_DISTRIBUTION="$DIST_NAME$DIST_VERSION"
+case $LINUX_DISTRIBUTION in
+    FD32|DB11)
+       export  QMAKE_CXXFLAGS="-std=c++11"
+       ;;
+    *)
+       ;;
+esac
+
+if [ -n "$SINGULARITY_NAME" ]; then
+    echo "WARNING: singularity env detected. applying ABI-tag patch"
+    PATCH_DIR=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)/../patches
+    cd $SOURCE_DIR
+    patch -Nbp1 -i $PATCH_DIR/qt_5_15_2_remove_ABI_tag.patch
+fi
+
+if [ -n "$SAT_DEBUG" ]
+then
+    BUILD_TYPE="-debug"
+else
+    BUILD_TYPE="-release"
+fi
+
+# clean build directory
+rm -rf $BUILD_DIR && mkdir -p $BUILD_DIR && cd $BUILD_DIR
+
+# For -qt-harfbuzz option, see spns #9694
+echo
+echo "*** configure -prefix $PRODUCT_INSTALL $BUILD_TYPE -opensource -nomake tests -nomake examples -no-rpath -verbose -no-separate-debug-info -confirm-license -qt-libpng -xcb -no-eglfs -dbus-runtime -skip qtwebengine -skip wayland -skip qtgamepad -system-freetype -qt-harfbuzz -no-openssl -no-glib -no-jasper"
+
+$SOURCE_DIR/configure -prefix $PRODUCT_INSTALL $BUILD_TYPE -opensource -nomake tests -nomake examples -no-rpath \
+    -verbose -no-separate-debug-info -confirm-license -qt-libpng -xcb -no-eglfs -dbus-runtime -skip qtwebengine \
+    -skip wayland -skip qtgamepad -system-freetype -qt-harfbuzz \
+    -no-openssl -no-glib -no-jasper
+
+if [ $? -ne 0 ]
+then
+    echo "ERROR on configure"
+    exit 2
+fi
+
+echo
+echo "*** make" $MAKE_OPTIONS
+make $MAKE_OPTIONS
+if [ $? -ne 0 ]
+then
+    echo "ERROR on make"
+    exit 3
+fi
+
+echo
+echo "*** make install"
+make install
+if [ $? -ne 0 ]
+then
+    echo "ERROR on make install"
+    exit 4
+fi
+
+# make clean pour nettoyer les sources
+echo
+echo "*** make clean"
+make clean
+if [ $? -ne 0 ]
+then
+    echo "ERROR on make clean"
+    exit 5
+fi
+
+echo
+echo "########## END"
+

diff --git a/products/qt.pyconf b/products/qt.pyconf
index 69cd272346426be4eccd9b60ecf3aa209dc870bc..fccede36d1a9e515ce81374ca4a5ccc17208cc83 100644 (file)
--- a/products/qt.pyconf
+++ b/products/qt.pyconf
@@ -25,6 +25,19 @@ default_win:
    check_install : []
 }
 
+version_5_15_15 :
+{
+  compil_script : "qt-5.15.15" + $VARS.scriptExtension
+  depend : ["freetype", 'llvm']
+}
+
+version_5_15_15_win :
+{
+  depend : ["freetype"]
+  build_depend : ["llvm"]
+  opt_depend : ['openssl']
+}
+
 version_5_15_2 :
 {
   compil_script : "qt-5.15.2" + $VARS.scriptExtension