lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-02-02 03:36:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add installer-framework specific platform configs

Browse Source 
Picking platform config yaml files from 5.12 branch and updating
those to match with 5.15 tier1 and Qt5 configure args.

Task-number: COIN-287
Change-Id: If9de982bc40ae86176fe0a233efea150b0a2811e
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
Reviewed-by: Matti Paaso <matti.paaso@qt.io>
(cherry picked from commit dc70564fa0)

Enable tests for installer-framework

Remove DisableTests feature from build configurations.

Task-number: QTIFW-1638
Change-Id: I6a66547306c732f6c5815e8ca6e8955f55d6cc5b
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
(cherry picked from commit 5f1199953f)
(cherry picked from commit bc3e3ad85f)

Add platform config for tqtc-installer-framework

This is similar to installer-framework.yaml with added configurations
for QtInstaller specific builds.

This enables two sets of builds from the same branch of
tqtc-installer-framework.

First set is for plain tqtc-installer-framework builds
i.e. the commercial deliverable.

The "QtInstaller" set is for the consumption of Qt Installer
creation.

Task-number: QTIFW-1027
Change-Id: Ifff750eef2631ce4e16edb32a7f7df593c698944
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit 307038829f)
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
(cherry picked from commit 351e5f2f5f)

Fix installer configure args to create only release executables

Fixes: QTIFW-1999
Change-Id: I0efe695e8bdab9bc23e8122deb6b4e7f8aafa7bd
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
(cherry picked from commit 2d76b3d64d)
(cherry picked from commit 12b090a24c)

Fix tqtc-installer-framework platform configs

Change-Id: Ib5625c56507d2331e75b97a3757e0930cdee06a2
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
(cherry picked from commit 53680499c8)
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
(cherry picked from commit 5770eaaa52)

IFW Coin: Build only release builds

Without the '-release' option IFW tools are built as debug. In
Windows it means unnecessary large installers and dependencies to msvc
debug libraries.

Change-Id: I3197216c91e82934ea11bdc3d635ce61516bc64e
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit 8da20a0a1b)
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
(cherry picked from commit e206ed1b37)

Add static-runtime configure argument

Change-Id: I93b7b8bbe795a8a194ac34dca962ddd8956ec1a6
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
(cherry picked from commit 3fd82a915c)

Disable D3D12 on Windows IFW

Change-Id: If8264c87078ca5f3d883ecadebc70e435b06ef05
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit 5ba9b7c979)

Hide LLVM_INSTALL_DIR from qdoc in Windows

Currently provisioned libclang is not working with static runtime build
in Windows. To allow integration to pass, we need to skip building of
qdoc by hiding required libs from it.

Change-Id: I2b2bbc20d1bb016552ed1b3d4e70dc9c0544fcce
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
(cherry picked from commit 52bd6da041)
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
This commit is contained in:
Simo Fält
2020-02-18 10:46:11 +02:00
parent 9b43a43ee9
commit a1223cd073
2 changed files with 58 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
coin/platform_configs/installer-framework.yaml Normal file
View File

@@ -0,0 +1,33 @@
Version: 2
Module only: True
Configurations:
-
Template: 'qtci-windows-10-x86_64-51'
Compiler: 'MSVC2015'
Target arch: 'x86'
Features: ['Packaging']
Configure arguments: '-opensource -confirm-license -verbose -nomake examples -nomake tests -accessibility -static -release -no-sql-sqlite -no-icu -mp -openssl-linked OPENSSL_LIBS="-llibssl -llibcrypto -lUser32 -lWs2_32 -lAdvapi32 -lCrypt32" -I %STATIC_OPENSSL_INCLUDE_x86% -L %STATIC_OPENSSL_LIB_x86% -prefix c:\Users\qt\work\install -static-runtime'
Environment variables: ['TARGET_ARCHITECTURE=amd64_x86', 'PATH=%PATH%;%CI_JOM_PATH%;C:\Utils\gnuwin32\bin;', 'LLVM_INSTALL_DIR=', 'LLVM_INSTALL_DIR_msvc=', 'QDOC_USE_STATIC_LIBCLANG=']
Environment script: ['%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat', 'amd64_x86']
QmakeArguments: [
'qtdeclarative': '-no-feature-d3d12'
]
-
Template: 'qtci-macos-10.13-x86_64-2'
Compiler: 'Clang'
Features: ['Packaging']
Configure arguments: '-opensource -confirm-license -nomake examples -nomake tests -accessibility -static -release -no-sql-sqlite -qt-zlib -qt-libpng -qt-libjpeg -no-cups -no-freetype -prefix /Users/qt/work/install'
-
Template: 'qtci-linux-RHEL-7.6-x86_64'
Compiler: 'GCC'
Features: ['Packaging']
Configure arguments: '-opensource -confirm-license -verbose -nomake examples -nomake tests -accessibility -static -release -no-sql-sqlite -qt-zlib -qt-libpng -qt-libjpeg -no-cups -openssl-linked -xcb -bundled-xcb-xinput -no-icu -no-libudev -qt-pcre -no-glib -no-egl -no-sm -qt-harfbuzz -prefix /home/qt/work/install OPENSSL_LIBS="{{.Env.OPENSSL_HOME}}/lib/libssl.a {{.Env.OPENSSL_HOME}}/lib/libcrypto.a -ldl -lpthread" -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/libs'
-
Template: 'qtci-linux-RHEL-7.6-x86_64'
Compiler: 'GCC'
Features: ['Documentation', 'DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -nomake tests -qt-zlib -qt-libpng -qt-libjpeg -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib'
-
Template: 'qtci-linux-Ubuntu-18.04-x86_64'
Compiler: 'GCC'
Features: ['TestOnly', 'LicenseCheck']

25
coin/platform_configs/tqtc-installer-framework.yaml Normal file
View File

@@ -0,0 +1,25 @@
Version: 2
Module only: True
Include: [ installer-framework.yaml ]
Configurations:
-
Template: 'qtci-windows-10-x86_64-51'
Compiler: 'MSVC2015'
Target arch: 'x86'
Features: ['Packaging', 'QtInstaller']
Configure arguments: '-opensource -confirm-license -verbose -nomake examples -nomake tests -accessibility -static -release -no-sql-sqlite -no-icu -mp -openssl-linked OPENSSL_LIBS="-llibssl -llibcrypto -lUser32 -lWs2_32 -lAdvapi32 -lCrypt32" -I %STATIC_OPENSSL_INCLUDE_x86% -L %STATIC_OPENSSL_LIB_x86% -prefix c:\Users\qt\work\install -static-runtime'
Environment variables: ['TARGET_ARCHITECTURE=amd64_x86', 'PATH=%PATH%;%CI_JOM_PATH%;C:\Utils\gnuwin32\bin;', 'LLVM_INSTALL_DIR=', 'LLVM_INSTALL_DIR_msvc=', 'QDOC_USE_STATIC_LIBCLANG=']
Environment script: ['%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat', 'amd64_x86']
QmakeArguments: [
'qtdeclarative': '-no-feature-d3d12'
]
-
Template: 'qtci-macos-10.13-x86_64-2'
Compiler: 'Clang'
Features: ['Packaging', 'QtInstaller']
Configure arguments: '-opensource -confirm-license -nomake examples -nomake tests -accessibility -static -release -no-sql-sqlite -qt-zlib -qt-libpng -qt-libjpeg -no-cups -no-freetype -prefix /Users/qt/work/install'
-
Template: 'qtci-linux-RHEL-7.6-x86_64'
Compiler: 'GCC'
Features: ['Packaging', 'QtInstaller']
Configure arguments: '-opensource -confirm-license -verbose -nomake examples -nomake tests -accessibility -static -release -no-sql-sqlite -qt-zlib -qt-libpng -qt-libjpeg -no-cups -openssl-linked -xcb -bundled-xcb-xinput -no-icu -no-libudev -qt-pcre -no-glib -no-egl -no-sm -qt-harfbuzz -prefix /home/qt/work/install OPENSSL_LIBS="{{.Env.OPENSSL_HOME}}/lib/libssl.a {{.Env.OPENSSL_HOME}}/lib/libcrypto.a -ldl -lpthread" -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/libs'