lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-04-21 04:16:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Provisioning: Add MSVC 2019 and upgrade MSVC 2017 to the latest version

Browse Source 
Under coin/pre-provisioning can be found information what have been
provisioned to tier1 image

Visual studios are updated to versions:

MSVC 2019: version 16.3.1
MSVC 2017: version 15.9.16

Task-number: QTQAINFRA-2875
Change-Id: I3a9748296dcf088bb312dec8f78bdc59dfb281d1
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
This commit is contained in:
Heikki Halmet
2019-10-16 14:53:42 +03:00
parent 68189ab965
commit f1276acf5c
24 changed files with 324 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
coin/platform_configs/default.yaml
View File

@@ -2,7 +2,7 @@ Version: 2
Module only: True
Configurations:
-
Template: 'qtci-windows-10-x86_64-14'
Template: 'qtci-windows-10-x86_64-15'
Compiler: 'MSVC2015'
Features: ['DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -developer-build -release -angle -qtnamespace TestNamespace -qtlibinfix TestInfix -nomake tests -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64%'
@@ -11,35 +11,46 @@ Configurations:
Compiler: 'Mingw73'
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -developer-build -release -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -platform win32-g++'
-
Template: 'qtci-windows-10-x86_64-14'
Template: 'qtci-windows-10-x86_64-15'
Target arch: 'x86'
Compiler: 'MSVC2017'
Features: ['Packaging']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86%'
-
Template: 'qtci-windows-10-x86_64-14'
Template: 'qtci-windows-10-x86_64-15'
Target arch: 'x86'
Compiler: 'MSVC2019'
Features: ['DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86%'
-
Template: 'qtci-windows-10-x86_64-15'
Compiler: 'MSVC2015'
Features: ['Packaging', 'DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64%'
-
Template: 'qtci-windows-10-x86_64-14'
Template: 'qtci-windows-10-x86_64-15'
Target os: 'WinRT_10'
Target arch: 'x86'
Compiler: 'MSVC2015'
Features: ['DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -no-sql-mysql -platform win32-msvc2015 -xplatform winrt-x86-msvc2015'
-
Template: 'qtci-windows-10-x86_64-14'
Template: 'qtci-windows-10-x86_64-15'
Target os: 'WinRT_10'
Target arch: 'armv7'
Compiler: 'MSVC2015'
Features: ['Packaging', 'DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -no-sql-mysql -platform win32-msvc2015 -xplatform winrt-arm-msvc2015'
-
Template: 'qtci-windows-10-x86_64-14'
Template: 'qtci-windows-10-x86_64-15'
Compiler: 'MSVC2017'
Features: ['Packaging']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64%'
-
Template: 'qtci-windows-10-x86_64-15'
Compiler: 'MSVC2019'
Features: ['DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64%'
-
Template: 'qtci-linux-Ubuntu-18.04-x86_64'
Compiler: 'GCC'

20
coin/platform_configs/qt5.yaml
View File

@@ -1,11 +1,11 @@
-
Template: 'qtci-windows-10-x86_64-14'
Template: 'qtci-windows-10-x86_64-15'
Target os: 'WinRT_10'
Compiler: 'MSVC2015'
Features: ['Packaging', 'DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -no-sql-mysql -platform win32-msvc2015 -xplatform winrt-x64-msvc2015'
-
Template: 'qtci-windows-10-x86_64-14'
Template: 'qtci-windows-10-x86_64-15'
Target os: 'WinRT_10'
Target arch: 'x86'
Compiler: 'MSVC2017'
@@ -17,25 +17,25 @@
Features: ['Packaging', 'DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -separate-debug-info -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -platform win32-g++'
-
Template: 'qtci-windows-10-x86_64-14'
Template: 'qtci-windows-10-x86_64-15'
Compiler: 'Mingw73'
Features: ['Packaging', 'DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -separate-debug-info -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -platform win32-g++'
-
Template: 'qtci-windows-10-x86_64-14'
Template: 'qtci-windows-10-x86_64-15'
Target os: 'WinRT_10'
Target arch: 'armv7'
Compiler: 'MSVC2017'
Features: ['Packaging', 'DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -no-sql-mysql -platform win32-msvc2017 -xplatform winrt-arm-msvc2017'
-
Template: 'qtci-windows-10-x86_64-14'
Template: 'qtci-windows-10-x86_64-15'
Target os: 'WinRT_10'
Compiler: 'MSVC2017'
Features: ['Packaging', 'DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -no-sql-mysql -platform win32-msvc2017 -xplatform winrt-x64-msvc2017'
-
Template: 'qtci-windows-10-x86_64-14'
Template: 'qtci-windows-10-x86_64-15'
Target os: 'Android_ANY'
Target arch: 'multi'
Compiler: 'Mingw73'
@@ -58,21 +58,21 @@
Features: ['DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -extprefix /Users/qt/work/install -release -nomake tests -nomake examples -no-use-gold-linker -opengl es2 -qpa qnx -xplatform qnx-x86-qcc'
-
Template: 'qtci-windows-10-x86_64-14'
Template: 'qtci-windows-10-x86_64-15'
Target os: 'QNX_700'
Target arch: 'armv7'
Compiler: 'Mingw73'
Features: ['Packaging', 'DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -extprefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -opengl es2 -xplatform qnx-armle-v7-qcc'
-
Template: 'qtci-windows-10-x86_64-14'
Template: 'qtci-windows-10-x86_64-15'
Target os: 'QNX_700'
Target arch: 'armv8'
Compiler: 'Mingw73'
Features: ['Packaging', 'DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -extprefix c:\Users\qt\work\install -release -opengl es2 -nomake tests -nomake examples -no-sql-mysql -xplatform qnx-aarch64le-qcc'
-
Template: 'qtci-windows-10-x86_64-14'
Template: 'qtci-windows-10-x86_64-15'
Target os: 'QNX_700'
Target arch: 'x86_64'
Compiler: 'Mingw73'
@@ -93,7 +93,7 @@
Features: ['Packaging', 'DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -extprefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-use-gold-linker -opengl es2 -qpa qnx -xplatform qnx-x86-64-qcc'
-
Template: 'qtci-windows-10-x86_64-14'
Template: 'qtci-windows-10-x86_64-15'
Target os: 'WebAssembly'
Compiler: 'Mingw73'
Features: ['Packaging', 'DisableTests']

2
coin/platform_configs/qtbase.yaml
View File

@@ -13,7 +13,7 @@
Features: ['DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-generic-g++ -device-option CROSS_COMPILE=/opt/yocto-arm64/sysroots/x86_64-pokysdk-linux/usr/bin/aarch64-poky-linux/aarch64-poky-linux- -device-option DISTRO_OPTS=boot2qt -sysroot /opt/yocto-arm64/sysroots/aarch64-poky-linux -extprefix /home/qt/work/install -mysql_config /opt/yocto-arm64/sysroots/aarch64-poky-linux/usr/bin/mysql_config -psql_config /dev/null -tslib'
-
Template: 'qtci-windows-10-x86_64-14'
Template: 'qtci-windows-10-x86_64-15'
Target os: 'WinRT_10'
Target arch: 'x86_64'
Compiler: 'MSVC2015'

2
coin/platform_configs/qtconnectivity.yaml
View File

@@ -1,5 +1,5 @@
-
Template: 'qtci-windows-10-x86_64-14'
Template: 'qtci-windows-10-x86_64-15'
Target os: 'WinRT_10'
Target arch: 'x86_64'
Compiler: 'MSVC2015'

4
coin/platform_configs/qtsaferenderer.yaml
View File

@@ -1,9 +1,9 @@
-
Template: 'qtci-windows-10-x86_64-14'
Template: 'qtci-windows-10-x86_64-15'
Compiler: 'Mingw73'
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -developer-build -nomake tests -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -platform win32-g++'
-
Template: 'qtci-windows-10-x86_64-14'
Template: 'qtci-windows-10-x86_64-15'
Compiler: 'Mingw73'
Features: ['Packaging', 'DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -static -nomake tests -nomake examples -no-icu -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -platform win32-g++'