Commit 46f3a73a authored by Jan Möbius's avatar Jan Möbius

Merge branch 'supportVS2017' into 'master'

Support vs2017

See merge request !324
parents aabb6c37 57451ec4
Pipeline #6993 failed with stages
in 75 minutes and 24 seconds
......@@ -294,7 +294,23 @@ VS2015-Qt-5.9.0-x32:
expire_in: 1 week
paths:
- artifacts
VS2017-Qt-5.10.1:
stage:
Build
script: "CI\\ci-windows-build.bat"
variables:
GIT_SUBMODULE_STRATEGY: recursive
ARCHITECTURE: "x64"
QT_VERSION: "Qt5.10.1"
COMPILER: "VS2017"
tags:
- VS2017
artifacts:
expire_in: 1 week
paths:
- artifacts
VS2013-Qt-5.5.1-x64:
stage:
Build
......@@ -385,7 +401,25 @@ Test:VS2015-Qt-5.9.0-x32:
artifacts:
paths:
- rel/Testing/Temporary/LastTest.log
Test:VS2017-Qt-5.10.1:
stage:
Test
script: "artifacts\\CI\\ci-windows-bootstrap.bat"
variables:
GIT_STRATEGY: none
ARCHITECTURE: "x64"
QT_VERSION: "Qt5.10.1"
COMPILER: "VS2017"
STAGE2SCRIPT: ci-windows-test.bat
tags:
- VS2017
dependencies:
- VS2017-Qt-5.10.1
artifacts:
paths:
- rel/Testing/Temporary/LastTest.log
Test:VS2013-Qt-5.5.1-x64:
stage:
Test
......@@ -490,6 +524,27 @@ Deploy:VS2015-Qt-5.9.0-x32:
artifacts:
paths:
- rel/*.exe
Deploy:VS2017-Qt-5.10.1:
stage:
Deploy
only:
- master
- unstable
script: "artifacts\\CI\\ci-windows-bootstrap.bat"
variables:
GIT_STRATEGY: none
ARCHITECTURE: "x64"
QT_VERSION: "Qt5.10.1"
COMPILER: "VS2017"
STAGE2SCRIPT: ci-windows-deploy.bat
tags:
- VS2017
dependencies:
- VS2017-Qt-5.10.1
artifacts:
paths:
- rel/*.exe
Deploy:VS2013-Qt-5.5.1-x64:
stage:
......
......@@ -22,7 +22,7 @@ del *.exe
IF %errorlevel% NEQ 0 exit /b %errorlevel%
:: build Open-Flipper
echo calling: %VS_PATH%
%VS_PATH% /Build "Release" OpenFlipper.sln /Project "ALL_BUILD"
IF %errorlevel% NEQ 0 exit /b %errorlevel%
......
......@@ -7,18 +7,29 @@ set QT_COMPILERPREFIX=msvc2012
set VS_COMPILERVERSION_LONG=11.0
set VS_COMPILERVERSION_SHORT=11
set VS_EDITION_YEAR=2012
set VS_EDITION_PATH= 11.0
)
if "%COMPILER%" == "VS2013" (
set QT_COMPILERPREFIX=msvc2013
set VS_COMPILERVERSION_LONG=12.0
set VS_COMPILERVERSION_SHORT=12
set VS_EDITION_YEAR=2013
set VS_EDITION_PATH= 12.0
)
if "%COMPILER%" == "VS2015" (
set QT_COMPILERPREFIX=msvc2015
set VS_COMPILERVERSION_LONG=14.0
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
set VS_COMPILERVERSION_SHORT=15
set VS_EDITION_YEAR=2017
::VS2017 default install path is different from other versions
set VS_EDITION_PATH=\2017\Professional
)
set BUILD_PLATFORM=%COMPILER%
......@@ -35,7 +46,7 @@ set STRING_ARCH=32-Bit
)
set GENERATOR=Visual Studio %VS_COMPILERVERSION_SHORT% %VS_EDITION_YEAR%%ARCH_VS%
set VS_PATH="C:\Program Files (x86)\Microsoft Visual Studio %VS_COMPILERVERSION_LONG%\Common7\IDE\devenv.com"
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" (
......@@ -58,6 +69,10 @@ 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
)
set QT_SUFFIX=
set QT_BASE_CONFIG=-DQT5_INSTALL_PATH=E:\Qt\%QT_VERSION%\%QT_REV%\%QT_COMPILERPREFIX%%ARCHBITS%%QT_SUFFIX%
......@@ -87,13 +102,19 @@ for /l %%x in (6, 1, 7) do (
)
)
:: check for glew version 6.1.1 to 6.1.3 use the highest found version
:: check for glew version 1.1 to 1.3 use the highest found version
for /l %%x in (0, 1, 3) do (
if exist %LIBPATH_BASE%\%ARCHITECTURE%\glew-1.1%%x.0\include (
set GLEW_INCLUDE_DIR=%LIBPATH_BASE%\%ARCHITECTURE%\glew-1.1%%x.0\include
set GLEW_LIBRARY_DIR=%LIBPATH_BASE%\%ARCHITECTURE%\glew-1.1%%x.0\lib\glew32.lib
)
)
:: check for glew version 2.0
if exist %LIBPATH_BASE%\%ARCHITECTURE%\glew-2.0.0\include (
set GLEW_INCLUDE_DIR=%LIBPATH_BASE%\%ARCHITECTURE%\glew-2.0.0\include
set GLEW_LIBRARY_DIR=%LIBPATH_BASE%\%ARCHITECTURE%\glew-2.0.0\lib\glew32.lib
)
:: check for qwt version 6.1.1 to 6.1.3 use the highest found version
for /l %%x in (0, 1, 3) do (
......
Subproject commit f6c8e0fdce3049611c68672dde6e82978b590b0b
Subproject commit aa9019a32e51b483dbce873f2aac35effdb6bb56
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