Commit 37595ac2 authored by Zain Selman's avatar Zain Selman 💬

merge staging with master

parents 1d672893 d8efdf2c
Pipeline #15096 failed with stages
in 46 minutes and 46 seconds
......@@ -10,3 +10,7 @@
/build_dbg
/build_rel
/build
# QtCreator specific annoying files
CMakeLists.txt.user*
......@@ -400,6 +400,41 @@ VS2017-Qt-5.14.1:
paths:
- artifacts
VS2019-Qt-5.15.0:
stage: Build
script: "CI\\ci-windows-build.bat"
variables:
GIT_SUBMODULE_STRATEGY: recursive
ARCHITECTURE: "x64"
QT_VERSION: "Qt5.15.0"
COMPILER: "VS2019"
tags:
- VS2019
- Qt5150
artifacts:
expire_in: 1 week
paths:
- artifacts
VS2019-Qt-5.15.0-NOPYTHON:
stage: Build
script: "CI\\ci-windows-build.bat"
variables:
GIT_SUBMODULE_STRATEGY: recursive
ARCHITECTURE: "x64"
QT_VERSION: "Qt5.15.0"
COMPILER: "VS2019"
PYTHON : "no"
tags:
- VS2019
- Qt5150
artifacts:
expire_in: 1 week
paths:
- artifacts
Test:VS2017-Qt-5.14.1:
stage: Test
script: "artifacts\\CI\\ci-windows-bootstrap.bat"
......@@ -419,12 +454,30 @@ Test:VS2017-Qt-5.14.1:
paths:
- rel/Testing/Temporary/LastTest.log
Test:VS2019-Qt-5.15.0:
stage: Test
script: "artifacts\\CI\\ci-windows-bootstrap.bat"
variables:
GIT_STRATEGY: none
ARCHITECTURE: "x64"
QT_VERSION: "Qt5.15.0"
COMPILER: "VS2019"
STAGE2SCRIPT: ci-windows-test.bat
tags:
- VS2019
- Qt5150
dependencies:
- VS2019-Qt-5.15.0
needs: [VS2019-Qt-5.15.0]
artifacts:
paths:
- rel/Testing/Temporary/LastTest.log
Deploy:VS2017-Qt-5.14.1:
stage: Deploy
only:
- master
- unstable
- staging
script: "artifacts\\CI\\ci-windows-bootstrap.bat"
variables:
GIT_STRATEGY: none
......@@ -441,6 +494,28 @@ Deploy:VS2017-Qt-5.14.1:
artifacts:
paths:
- rel/*.exe
Deploy:VS2019-Qt-5.15.0:
stage: Deploy
only:
- master
- unstable
script: "artifacts\\CI\\ci-windows-bootstrap.bat"
variables:
GIT_STRATEGY: none
ARCHITECTURE: "x64"
QT_VERSION: "Qt5.15.9"
COMPILER: "VS2019"
STAGE2SCRIPT: ci-windows-deploy.bat
tags:
- VS2019
- Qt5150
dependencies:
- VS2019-Qt-5.15.0
needs: [VS2019-Qt-5.15.0]
artifacts:
paths:
- rel/*.exe
Mac-Cpp11:
stage: Build
......@@ -475,7 +550,6 @@ Deploy:Mac-Cpp11:
only:
- master
- unstable
- staging
script: "artifacts/CI/ci-mac-deploy.sh"
variables:
GIT_STRATEGY: none
......@@ -510,7 +584,6 @@ Sources:
stage: Deploy
only:
- master
- staging
script: "CI/ci-source.sh"
tags:
- Linux
......@@ -526,3 +599,4 @@ Sources:
......@@ -21,8 +21,11 @@ cd rel
::clear any old binary files
del *.exe
:: Output command line for easier debugging:
echo "C:\Program Files\CMake\bin\cmake.exe" -DGTEST_PREFIX="%LIBPATH_BASE%/%ARCHITECTURE%/%GTESTVERSION%" -G "%GENERATOR%" -DCMAKE_BUILD_TYPE=Release -DOPENFLIPPER_BUILD_UNIT_TESTS=TRUE %CMAKE_CONFIGURATION% ..
::invoke cmake
"C:\Program Files\CMake\bin\cmake.exe" -DGTEST_PREFIX="%LIBPATH_BASE%\%ARCHITECTURE%\%GTESTVERSION%" -G "%GENERATOR%" -DCMAKE_BUILD_TYPE=Release -DOPENFLIPPER_BUILD_UNIT_TESTS=TRUE %CMAKE_CONFIGURATION% ..
"C:\Program Files\CMake\bin\cmake.exe" -DGTEST_PREFIX="%LIBPATH_BASE%/%ARCHITECTURE%/%GTESTVERSION%" -G "%GENERATOR%" -DCMAKE_BUILD_TYPE=Release -DOPENFLIPPER_BUILD_UNIT_TESTS=TRUE %CMAKE_CONFIGURATION% ..
IF %errorlevel% NEQ 0 exit /b %errorlevel%
......
:: use 4 threads for parallel compilation of the project
set CL=/MP4
:: determine architecture and set variables
if "%ARCHITECTURE%" == "x64" (
set ARCHBITS=_64
set ARCH_VS= Win64
set STRING_ARCH=64-Bit
) else (
set ARCHBITS=
set ARCH_VS=
set STRING_ARCH=32-Bit
)
:: determine VS version and set variables
if "%COMPILER%" == "VS2015" (
set QT_COMPILERPREFIX=msvc2015
......@@ -9,6 +21,7 @@ set VS_COMPILERVERSION_SHORT=14
set VS_EDITION_YEAR=2015
set VS_EDITION_PATH= 14.0
)
if "%COMPILER%" == "VS2017" (
set QT_COMPILERPREFIX=msvc2017
set VS_COMPILERVERSION_LONG=15.0
......@@ -18,43 +31,23 @@ set VS_EDITION_YEAR=2017
set VS_EDITION_PATH=\2017\Professional
)
set BUILD_PLATFORM=%COMPILER%
:: determine architecture and set variables
if "%ARCHITECTURE%" == "x64" (
set ARCHBITS=_64
set ARCH_VS= Win64
set STRING_ARCH=64-Bit
) else (
set ARCHBITS=
if "%COMPILER%" == "VS2019" (
set QT_COMPILERPREFIX=msvc2019
set VS_COMPILERVERSION_LONG=16.0
set VS_COMPILERVERSION_SHORT=16
set VS_EDITION_YEAR=2019
set ARCH_VS=
set STRING_ARCH=32-Bit
::VS2017 default install path is different from other versions
set VS_EDITION_PATH=\2019\Professional
)
set BUILD_PLATFORM=%COMPILER%
set GENERATOR=Visual Studio %VS_COMPILERVERSION_SHORT% %VS_EDITION_YEAR%%ARCH_VS%
set VS_PATH="C:\Program Files (x86)\Microsoft Visual Studio%VS_EDITION_PATH%\Common7\IDE\devenv.com"
:: determine Qt Version and set variables
if "%QT_VERSION%" == "Qt5.5.1" (
set QT_REV_LONG=5.5.1
set QT_REV=5.5
)
if "%QT_VERSION%" == "Qt5.6.2" (
set QT_REV_LONG=5.6.2
set QT_REV=5.6
)
if "%QT_VERSION%" == "Qt5.7.0" (
set QT_REV_LONG=5.7.0
set QT_REV=5.7
)
if "%QT_VERSION%" == "Qt5.8.0" (
set QT_REV_LONG=5.8.0
set QT_REV=5.8
)
if "%QT_VERSION%" == "Qt5.9.0" (
set QT_REV_LONG=5.9.0
set QT_REV=5.9
)
if "%QT_VERSION%" == "Qt5.10.1" (
set QT_REV_LONG=5.10.1
set QT_REV=5.10.1
......@@ -67,37 +60,47 @@ if "%QT_VERSION%" == "Qt5.14.1" (
set QT_REV_LONG=5.14.1
set QT_REV=5.14.1
)
if "%QT_VERSION%" == "Qt5.15.0" (
set QT_REV_LONG=5.15.0
set QT_REV=5.15.0
)
set QT_SUFFIX=
set QT_BASE_CONFIG=-DQT5_INSTALL_PATH=E:\Qt\%QT_VERSION%\%QT_REV%\%QT_COMPILERPREFIX%%ARCHBITS%%QT_SUFFIX%
:: set up Libraty Paths
set LIBPATH_BASE=E:\libs\%COMPILER%
set CMAKE_WINDOWS_LIBS_DIR=E:\libs
set LIBPATH_BASE=E:/libs/%COMPILER%
set CMAKE_WINDOWS_LIBS_DIR=E:/libs
:: check for gtest version 1.6 or 1.7 use the highest found version
for /l %%x in (6, 1, 7) do (
if exist %LIBPATH_BASE%\%ARCHITECTURE%\gtest-1.%%x.0 (
:: check for gtest version 1.6 or 1.10 use the highest found version
for /l %%x in (6, 1, 10) do (
if exist %LIBPATH_BASE%/%ARCHITECTURE%/gtest-1.%%x.0 (
set GTESTVERSION=gtest-1.%%x.0
)
)
:: check for qwt version 6.1.1 to 6.1.3 use the highest found version
for /l %%x in (0, 1, 5) do (
echo "Checking for QWT in : %LIBPATH_BASE%\%ARCHITECTURE%\qwt-6.1.%%x-qt%QT_REV_LONG%\include"
if exist %LIBPATH_BASE%\%ARCHITECTURE%\qwt-6.1.%%x-qt%QT_REV_LONG%\include (
set QWT6_INCLUDE_DIR=%LIBPATH_BASE%\%ARCHITECTURE%\qwt-6.1.%%x-qt%QT_REV_LONG%\include
set QWT6_LIBRARY=%LIBPATH_BASE%\%ARCHITECTURE%\qwt-6.1.%%x-qt%QT_REV_LONG%\lib\qwt.lib
set QWT6_LIBRARY_DIR=%LIBPATH_BASE%\%ARCHITECTURE%\qwt-6.1.%%x-qt%QT_REV_LONG%\lib
echo "Checking for QWT in : %LIBPATH_BASE%/%ARCHITECTURE%/qwt-6.1.%%x-qt%QT_REV_LONG%/include"
if exist %LIBPATH_BASE%/%ARCHITECTURE%/qwt-6.1.%%x-qt%QT_REV_LONG%/include (
set QWT6_INCLUDE_DIR=%LIBPATH_BASE%/%ARCHITECTURE%/qwt-6.1.%%x-qt%QT_REV_LONG%/include
set QWT6_LIBRARY=%LIBPATH_BASE%/%ARCHITECTURE%/qwt-6.1.%%x-qt%QT_REV_LONG%/lib/qwt.lib
set QWT6_LIBRARY_DIR=%LIBPATH_BASE%/%ARCHITECTURE%/qwt-6.1.%%x-qt%QT_REV_LONG%/lib
)
:: unfortunately qwt is not named consistently in our repos so we also have to check for a different folder named
echo "Checking for QWT in : %LIBPATH_BASE%\%ARCHITECTURE%\qwt-6.1.%%x-qt-%QT_REV_LONG%\include"
if exist %LIBPATH_BASE%\%ARCHITECTURE%\qwt-6.1.%%x-qt-%QT_REV_LONG%\include (
set QWT6_INCLUDE_DIR=%LIBPATH_BASE%\%ARCHITECTURE%\qwt-6.1.%%x-qt-%QT_REV_LONG%\include
set QWT6_LIBRARY=%LIBPATH_BASE%\%ARCHITECTURE%\qwt-6.1.%%x-qt-%QT_REV_LONG%\lib\qwt.lib
set QWT6_LIBRARY_DIR=%LIBPATH_BASE%\%ARCHITECTURE%\qwt-6.1.%%x-qt-%QT_REV_LONG%\lib
echo "Checking for QWT in : %LIBPATH_BASE%/%ARCHITECTURE%/qwt-6.1.%%x-qt-%QT_REV_LONG%/include"
if exist %LIBPATH_BASE%/%ARCHITECTURE%/qwt-6.1.%%x-qt-%QT_REV_LONG%/include (
set QWT6_INCLUDE_DIR=%LIBPATH_BASE%/%ARCHITECTURE%/qwt-6.1.%%x-qt-%QT_REV_LONG%/include
set QWT6_LIBRARY=%LIBPATH_BASE%/%ARCHITECTURE%/qwt-6.1.%%x-qt-%QT_REV_LONG%/lib/qwt.lib
set QWT6_LIBRARY_DIR=%LIBPATH_BASE%/%ARCHITECTURE%/qwt-6.1.%%x-qt-%QT_REV_LONG%/lib
)
)
set CMAKE_CONFIGURATION=%QT_BASE_CONFIG% -DQWT6_INCLUDE_DIR=%QWT6_INCLUDE_DIR% -DQWT6_LIBRARY=%QWT6_LIBRARY% -DQWT6_LIBRARY_DIR=%QWT6_LIBRARY_DIR% -DCMAKE_WINDOWS_LIBS_DIR=%CMAKE_WINDOWS_LIBS_DIR%
echo "Python settings for this Job:"
if "%PYTHON%" == "no" (
echo "Building without python support"
set CMAKE_CONFIGURATION=%QT_BASE_CONFIG% -DDISABLE_OPENFLIPPER_PYTHON_SYSTEM=TRUE -DQWT6_INCLUDE_DIR=%QWT6_INCLUDE_DIR% -DQWT6_LIBRARY=%QWT6_LIBRARY% -DQWT6_LIBRARY_DIR=%QWT6_LIBRARY_DIR% -DCMAKE_WINDOWS_LIBS_DIR=%CMAKE_WINDOWS_LIBS_DIR%
) else (
echo "Build with python support"
set CMAKE_CONFIGURATION=%QT_BASE_CONFIG% -DQWT6_INCLUDE_DIR=%QWT6_INCLUDE_DIR% -DQWT6_LIBRARY=%QWT6_LIBRARY% -DQWT6_LIBRARY_DIR=%QWT6_LIBRARY_DIR% -DCMAKE_WINDOWS_LIBS_DIR=%CMAKE_WINDOWS_LIBS_DIR%
)
......@@ -133,7 +133,7 @@ if ( WIN32 )
endif()
endif()
set (OF_MAX_QT_VERSION "5.13.0")
set (OF_MAX_QT_VERSION "5.14.1")
if (${Qt5Core_VERSION_STRING} STRGREATER ${OF_MAX_QT_VERSION})
message(WARNING "Detected QT Version higher than ${OF_MAX_QT_VERSION}!\n" "OpenFlipper has not been tested with this QT Version.")
......
Subproject commit f0e55a674bc2230f2c47dc2bea97df215ccb953d
Subproject commit c32fa10285fb88012ea16e0426d0d71ec1e49708
Subproject commit 6c565d8e42734149451b1ba97ffd613b16bef284
Subproject commit c0a5e0aa5257e960c230b7f6244e92ab6e70495d
Subproject commit 50c33d9df40404ace760f4db5a5f1e080d0cad1d
Subproject commit dbb1f115eb6fa9053cf91acb0a027168d8e5dd88
Subproject commit 4ac13888bcb84a8abc0f56c23c8f56e8fb940f04
Subproject commit 0db8e625a2d89c6686a6ba324f5f20a6e115104a
Subproject commit bec0e56f5b45b4de2d4dcbec0dda3f9109413140
Subproject commit d8e003f5733f245e73508f8341fbb471cb6dc5fd
Subproject commit c1c9f8442ced39a95960f4d912dd26e65885d4bb
Subproject commit b5a6cc7332f9c4f50c14c33cde02f4d9163b01fc
Subproject commit be5e98274f5917b3e61fc743c0323e783d42796a
Subproject commit 4139325bdc95d06d2b833c036afa090d8d43e44d
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment