diff options
author | Simo Fält <simo.falt@qt.io> | 2020-02-18 10:46:11 +0200 |
---|---|---|
committer | Simo Fält <simo.falt@qt.io> | 2021-12-08 07:35:03 +0200 |
commit | a1223cd0739d821dcbbba58ecd90b5b56ca135ed (patch) | |
tree | 7e635ac4c08696d010259f993959148b74e9d9ab | |
parent | 9b43a43ee96198674060c6b9591e515e2d27c28f (diff) |
Add installer-framework specific platform configs
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 dc70564fa02fd8cd7133119804275bb156fb84ac)
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 5f1199953ff863047e0eee43bdc412b2759a0472)
(cherry picked from commit bc3e3ad85f05491420433d1c04ccca920d0eadd1)
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 307038829fc53bfc99d0148cce0547fca902ac67)
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
(cherry picked from commit 351e5f2f5f8903f2abd1d03302d20f8d05eab1ac)
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 2d76b3d64d466713d8b6e9831bc0b25a9ddc54bf)
(cherry picked from commit 12b090a24c31a434455de4e80809501e4e7bd33f)
Fix tqtc-installer-framework platform configs
Change-Id: Ib5625c56507d2331e75b97a3757e0930cdee06a2
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
(cherry picked from commit 53680499c8d29a4a4fde5823a936f882b27333c0)
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
(cherry picked from commit 5770eaaa52cb47484a2fcbb45c107e55c876f68b)
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 8da20a0a1b028a958ad7767b7abe44622a4ed19c)
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
(cherry picked from commit e206ed1b3762b63d773b4ab6ac495f4ec08b165b)
Add static-runtime configure argument
Change-Id: I93b7b8bbe795a8a194ac34dca962ddd8956ec1a6
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
(cherry picked from commit 3fd82a915c141381bec6c937c988a6ad6aa81ae6)
Disable D3D12 on Windows IFW
Change-Id: If8264c87078ca5f3d883ecadebc70e435b06ef05
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit 5ba9b7c9799c3c20dd62ce8bf4316a79ee52a7cf)
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 52bd6da0410a9fff28be04b386d323d72be83f02)
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
-rw-r--r-- | coin/platform_configs/installer-framework.yaml | 33 | ||||
-rw-r--r-- | coin/platform_configs/tqtc-installer-framework.yaml | 25 |
2 files changed, 58 insertions, 0 deletions
diff --git a/coin/platform_configs/installer-framework.yaml b/coin/platform_configs/installer-framework.yaml new file mode 100644 index 00000000..6c5065c6 --- /dev/null +++ b/coin/platform_configs/installer-framework.yaml @@ -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'] diff --git a/coin/platform_configs/tqtc-installer-framework.yaml b/coin/platform_configs/tqtc-installer-framework.yaml new file mode 100644 index 00000000..8d5e3106 --- /dev/null +++ b/coin/platform_configs/tqtc-installer-framework.yaml @@ -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' |