From 9929aff99ec02ed57ad9693b22eb4a84ac1388c5 Mon Sep 17 00:00:00 2001 From: Jani Heikkinen Date: Tue, 28 May 2019 11:41:31 +0300 Subject: Add QMAKE_LFLAGS_APP+=-s as configure argument in linux desktop build After adding "-force-debug-info" and "-separate-debug-info" debug information is going in the binaries accidentally & so on exploding binary size. Debug symbols are wanted for libraries and adding QMAKE_LFLAGS_APP+=-s as configure argument will prevent debug information not to go inside binaries. Task-number: QTBUG-69767 Change-Id: Ieec205402b34870901aeb26d9ca98fa9edb159c6 Reviewed-by: Simon Hausmann --- coin/platform_configs/default.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'coin/platform_configs') diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index 640196ad..e03cc56d 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -79,7 +79,7 @@ Template: 'qtci-linux-RHEL-7.4-x86_64' Compiler: 'GCC' Features: ['Packaging'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -force-debug-info -separate-debug-info -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -qt-xcb -sysconfdir /etc/xdg -qt-pcre -qt-harfbuzz -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib' + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -force-debug-info -separate-debug-info -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -qt-xcb -sysconfdir /etc/xdg -qt-pcre -qt-harfbuzz -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib QMAKE_LFLAGS_APP+=-s' - Template: 'qtci-macos-10.13-x86_64-2' Compiler: 'Clang' -- cgit v1.2.3 From 24f0367a60fdd3379014e507fa7f4553d433c601 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Wed, 27 Feb 2019 13:22:06 +0200 Subject: Add Suse Linux Enteprise Server 12 to the CI Task-number: QTQAINFRA-2851 Change-Id: Ia421a5e35f8a0515d7f761ca0c52a54a93dcee5c Reviewed-by: Heikki Halmet --- coin/platform_configs/default.yaml | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'coin/platform_configs') diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index e03cc56d..5ed26734 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -75,6 +75,11 @@ Compiler: 'GCC' Features: ['Packaging', 'DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -release -static -nomake tests -nomake examples -no-sql-mysql -no-pch -no-dbus -no-headersclean -no-ssl -no-warnings-are-errors -no-feature-thread -xplatform wasm-emscripten' +- + Template: 'qtci-linux-SLES-12-x86_64' + Compiler: 'GCC' + Features: ['DisableTests'] + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -no-sql-mysql -no-pch -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib' - Template: 'qtci-linux-RHEL-7.4-x86_64' Compiler: 'GCC' -- cgit v1.2.3 From 4175af18f8a56c8e9a372c28a8d800488f9f8a18 Mon Sep 17 00:00:00 2001 From: Jani Heikkinen Date: Mon, 12 Aug 2019 12:43:57 +0300 Subject: Add Android x86_64 architecture It seems those build targets were accidentally deleted when yaml change was merged in. Targets were there in Qt 5.13.0 release (before yaml change) This amends a94696ccd5be936099809eda58db02999cb7c77a. See also ebcfcbe69a5d34949d938211c364e1ff6f185b39. Task-number: QTBUG-47672 Change-Id: If2c22a8b995fdaa967f81062d0fae6dc725829dd Reviewed-by: Liang Qi Reviewed-by: BogDan Vatra --- coin/platform_configs/qt5.yaml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'coin/platform_configs') diff --git a/coin/platform_configs/qt5.yaml b/coin/platform_configs/qt5.yaml index 69f1c7e3..87b2c4c1 100644 --- a/coin/platform_configs/qt5.yaml +++ b/coin/platform_configs/qt5.yaml @@ -42,6 +42,14 @@ Target compiler: 'Clang' Features: ['Packaging', 'DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-use-gold-linker -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host linux-x86_64 -android-arch x86' +- + Template: 'qtci-linux-RHEL-7.6-x86_64' + Target os: 'Android_ANY' + Target arch: 'x86_64' + Compiler: 'GCC' + Target compiler: 'Clang' + Features: ['Packaging', 'DisableTests'] + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-use-gold-linker -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host linux-x86_64 -android-arch x86_64' - Template: 'qtci-windows-10-x86_64-14' Target os: 'Android_ANY' @@ -66,6 +74,14 @@ Target compiler: 'Clang' Features: ['Packaging', 'DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -opengl es2 -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r19c -android-arch x86' +- + Template: 'qtci-windows-10-x86_64-14' + Target os: 'Android_ANY' + Target arch: 'x86_64' + Compiler: 'Mingw73' + Target compiler: 'Clang' + Features: ['Packaging', 'DisableTests'] + Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -opengl es2 -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r19c -android-arch x86_64' - Template: 'qtci-macos-10.13-x86_64-2' Target os: 'Android_ANY' @@ -90,6 +106,14 @@ Target compiler: 'Clang' Features: ['Packaging', 'DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host darwin-x86_64 -android-arch x86' +- + Template: 'qtci-macos-10.13-x86_64-2' + Target os: 'Android_ANY' + Target arch: 'x86_64' + Compiler: 'Clang' + Target compiler: 'Clang' + Features: ['Packaging', 'DisableTests'] + Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host darwin-x86_64 -android-arch x86_64' - Template: 'qtci-macos-10.13-x86_64-2' Target os: 'QNX_700' -- cgit v1.2.3 From 8e32f46764ec8b06ac1ce4cc4e3a70580328ce23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Tue, 19 Mar 2019 12:02:57 +0200 Subject: Add Suse Linux Enteprise Server 15 to the CI Task-number: QTQAINFRA-3123 Change-Id: I725c58c7d319945f7470118dec99b5360385da7b Reviewed-by: Heikki Halmet --- coin/platform_configs/default.yaml | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'coin/platform_configs') diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index 5ed26734..cc1f7083 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -80,6 +80,11 @@ Compiler: 'GCC' Features: ['DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -no-sql-mysql -no-pch -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib' +- + Template: 'qtci-linux-SLES-15-x86_64' + Compiler: 'GCC' + Features: ['DisableTests'] + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -no-sql-mysql -no-pch -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib' - Template: 'qtci-linux-RHEL-7.4-x86_64' Compiler: 'GCC' -- cgit v1.2.3 From 63181db03e9419ed0dca894edcdc8a6911868667 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Fri, 2 Aug 2019 18:31:02 +0200 Subject: Enable a no-gui build on Ubuntu 18.04 for 5.13 Task-number: QTQAINFRA-2576 Change-Id: I4bc96802b5fe940408158734b01f7b9b01361235 Reviewed-by: Liang Qi --- coin/platform_configs/default.yaml | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'coin/platform_configs') diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index c24ef38e..6af8429f 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -50,6 +50,11 @@ Compiler: 'GCC' Features: ['OutOfSourceBuild', 'Documentation'] Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -R . -qtlibinfix TestInfix -qtnamespace TestNamespace -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib' +- + Template: 'qtci-linux-Ubuntu-18.04-x86_64' + Compiler: 'GCC' + Features: ['DisableTests'] + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -no-gui -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib' - Template: 'qtci-linux-Ubuntu-18.04-x86_64' Compiler: 'GCC' -- cgit v1.2.3 From 9d69ef09e34c554633d6e4a6d97761bebd5f61a9 Mon Sep 17 00:00:00 2001 From: Tuomas Heimonen Date: Wed, 5 Jun 2019 14:44:09 +0300 Subject: Add Packaging to Saferenderer static builds Task-number: QSR-432 Change-Id: I6e1c52a52dd5a6b92eceb13aa8f650bcce0e1fa3 Reviewed-by: Iikka Eklund --- coin/platform_configs/qtsaferenderer.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'coin/platform_configs') diff --git a/coin/platform_configs/qtsaferenderer.yaml b/coin/platform_configs/qtsaferenderer.yaml index c2bc05e0..031d31ff 100644 --- a/coin/platform_configs/qtsaferenderer.yaml +++ b/coin/platform_configs/qtsaferenderer.yaml @@ -5,9 +5,10 @@ - Template: 'qtci-windows-10-x86_64-10' Compiler: 'Mingw73' + Features: ['Packaging'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -developer-build -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++' - Template: 'qtci-linux-RHEL-7.4-x86_64' Compiler: 'GCC' - Features: ['DisableTests'] + Features: ['Packaging', 'DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -developer-build -static -nomake tests -nomake examples -no-use-gold-linker' -- cgit v1.2.3 From 0414df3e2e87b5eb783dbaf5ba7e0eb8501e4647 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Wed, 21 Aug 2019 07:45:17 +0000 Subject: Build MIPS64 with b2qt toolchain - again This configuration verifies big endian builds. The build was accidentally removed in merge a94696ccd5be936099809eda58db02999cb7c77a. See also 9b84c7135b9903d6f975ea082d7ae5958248a8fd. Task-number: QTQAINFRA-2492 Change-Id: I2616f918591758b4cfee244a0a5414a61322f7d3 Reviewed-by: Liang Qi Reviewed-by: Samuli Piippo --- coin/platform_configs/default.yaml | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'coin/platform_configs') diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index 6af8429f..b566f66a 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -144,6 +144,13 @@ Target arch: 'arm64' Compiler: 'GCC' Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -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-linux-Ubuntu-18.04-x86_64' + Target os: 'QEMU' + Target arch: 'mips64' + Compiler: 'GCC' + Features: ['DisableTests'] + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-generic-g++ -device-option CROSS_COMPILE=/opt/yocto-mips64/sysroots/x86_64-pokysdk-linux/usr/bin/mips64-poky-linux/mips64-poky-linux- -device-option DISTRO_OPTS=boot2qt -sysroot /opt/yocto-mips64/sysroots/mips64-poky-linux -extprefix /home/qt/work/install -mysql_config /opt/yocto-mips64/sysroots/mips64-poky-linux/usr/bin/mysql_config -psql_config /dev/null -tslib' - Template: 'qtci-linux-Ubuntu-18.04-x86_64' Compiler: 'GCC' -- cgit v1.2.3 From 11d6401d9855e765c8d37ca323bacccdc1c97c24 Mon Sep 17 00:00:00 2001 From: Tuomas Heimonen Date: Thu, 22 Aug 2019 12:09:58 +0300 Subject: Update Saferenderer static builds DisableTests on qtci-windows-10-x86_64-10 Add flag '-qt-libpng' to qtci-linux-RHEL-7.4-x86_64 Task-number: QSR-432 Change-Id: I3efc7f84f6c2eed49602e491f20f5a4f47512524 Reviewed-by: Jukka Jokiniva --- coin/platform_configs/qtsaferenderer.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'coin/platform_configs') diff --git a/coin/platform_configs/qtsaferenderer.yaml b/coin/platform_configs/qtsaferenderer.yaml index 031d31ff..42325b6d 100644 --- a/coin/platform_configs/qtsaferenderer.yaml +++ b/coin/platform_configs/qtsaferenderer.yaml @@ -5,10 +5,10 @@ - Template: 'qtci-windows-10-x86_64-10' Compiler: 'Mingw73' - Features: ['Packaging'] + Features: ['Packaging', 'DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -developer-build -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++' - Template: 'qtci-linux-RHEL-7.4-x86_64' Compiler: 'GCC' Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -developer-build -static -nomake tests -nomake examples -no-use-gold-linker' + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -developer-build -static -nomake tests -nomake examples -no-use-gold-linker -qt-libpng' -- cgit v1.2.3 From 163bd8006e32184ad77654dd36d3cba417c65028 Mon Sep 17 00:00:00 2001 From: Tuomas Heimonen Date: Tue, 27 Aug 2019 11:20:22 +0300 Subject: Update Saferenderer static builds qtci-windows-10-x86_64-10 static build: remove flag '-developer-build' qtci-linux-RHEL-7.4-x86_64 static build: add flags '-no-fontconfig' and '-qt-freetype', remove flag '-developer-build' Task-number: QSR-491 Change-Id: I886ffbe9900ee63cd35e845b591086397c572abc Reviewed-by: Samuli Piippo --- coin/platform_configs/qtsaferenderer.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'coin/platform_configs') diff --git a/coin/platform_configs/qtsaferenderer.yaml b/coin/platform_configs/qtsaferenderer.yaml index 42325b6d..f0d33f8a 100644 --- a/coin/platform_configs/qtsaferenderer.yaml +++ b/coin/platform_configs/qtsaferenderer.yaml @@ -6,9 +6,9 @@ Template: 'qtci-windows-10-x86_64-10' Compiler: 'Mingw73' Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -developer-build -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++' + 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++' - Template: 'qtci-linux-RHEL-7.4-x86_64' Compiler: 'GCC' Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -developer-build -static -nomake tests -nomake examples -no-use-gold-linker -qt-libpng' + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -static -nomake tests -nomake examples -no-use-gold-linker -no-fontconfig -qt-freetype -qt-libpng' -- cgit v1.2.3 From 5752c0d4bc5927107d6aaadaf703f17f0a05406a Mon Sep 17 00:00:00 2001 From: Tuomas Heimonen Date: Thu, 29 Aug 2019 16:20:44 +0300 Subject: Saferenderer: Update qtci-linux-RHEL-7.4-x86_64 static build Add build flag '-no-icu' to remove dependency to icu libraries Task-number: QSR-499 Change-Id: I788de8dfdeb9845e9135e83a424468d2f5ca20d2 Reviewed-by: Jukka Jokiniva --- coin/platform_configs/qtsaferenderer.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'coin/platform_configs') diff --git a/coin/platform_configs/qtsaferenderer.yaml b/coin/platform_configs/qtsaferenderer.yaml index f0d33f8a..6c71e719 100644 --- a/coin/platform_configs/qtsaferenderer.yaml +++ b/coin/platform_configs/qtsaferenderer.yaml @@ -11,4 +11,4 @@ Template: 'qtci-linux-RHEL-7.4-x86_64' Compiler: 'GCC' Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -static -nomake tests -nomake examples -no-use-gold-linker -no-fontconfig -qt-freetype -qt-libpng' + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -static -nomake tests -nomake examples -no-use-gold-linker -no-icu -no-fontconfig -qt-freetype -qt-libpng' -- cgit v1.2.3 From 5035d3852542ea5a1cd6bb2afc48d095582389eb Mon Sep 17 00:00:00 2001 From: Tuomas Heimonen Date: Tue, 3 Sep 2019 08:57:58 +0300 Subject: Saferenderer: Update qtci-linux-RHEL-7.4-x86_64 static build Add build flag '-qpa offscreen' to remove dependency to xcb libraries Task-number: QSR-510 Change-Id: Icc87face742abe775147d9bf931dbbdaee81fab1 Reviewed-by: Jukka Jokiniva --- coin/platform_configs/qtsaferenderer.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'coin/platform_configs') diff --git a/coin/platform_configs/qtsaferenderer.yaml b/coin/platform_configs/qtsaferenderer.yaml index 6c71e719..ac4d8c4a 100644 --- a/coin/platform_configs/qtsaferenderer.yaml +++ b/coin/platform_configs/qtsaferenderer.yaml @@ -11,4 +11,4 @@ Template: 'qtci-linux-RHEL-7.4-x86_64' Compiler: 'GCC' Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -static -nomake tests -nomake examples -no-use-gold-linker -no-icu -no-fontconfig -qt-freetype -qt-libpng' + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -static -nomake tests -nomake examples -no-use-gold-linker -no-icu -no-fontconfig -qt-freetype -qpa offscreen -qt-libpng' -- cgit v1.2.3 From 14c31bf8db92b6c09e669b7c3b0d62261e5bbd46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Tue, 3 Sep 2019 16:01:35 +0200 Subject: Remove un-needed configure arguments for Apple OSes Change-Id: I18bab0c70bbb9486eef815f9310dd807ae5cde83 Reviewed-by: Timur Pocheptsov --- coin/platform_configs/default.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'coin/platform_configs') diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index cc1f7083..eeeffda8 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -94,16 +94,16 @@ Template: 'qtci-macos-10.13-x86_64-2' Compiler: 'Clang' Features: ['Packaging'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -release -nomake tests -nomake examples -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -xplatform macx-clang -separate-debug-info -sdk macosx -device-option QMAKE_APPLE_DEVICE_ARCHS=x86_64 -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include' + Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -release -separate-debug-info -nomake tests -nomake examples -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include' - Template: 'qtci-macos-10.14-x86_64' Compiler: 'Clang' Features: ['DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -release -nomake tests -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -xplatform macx-clang -separate-debug-info -sdk macosx -device-option QMAKE_APPLE_DEVICE_ARCHS=x86_64 -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include' + Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -release -separate-debug-info -nomake tests -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include' - Template: 'qtci-macos-10.12-x86_64-9' Compiler: 'Clang' - Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -developer-build -release -qtnamespace TestNamespace -nomake tests -nomake examples -no-pch -no-framework -xplatform macx-clang -sdk macosx -device-option QMAKE_APPLE_DEVICE_ARCHS=x86_64 -I/usr/local/opt/openssl/include' + Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -developer-build -release -no-pch -no-framework -qtnamespace TestNamespace -nomake tests -nomake examples -I/usr/local/opt/openssl/include' - Template: 'qtci-macos-10.13-x86_64-2' Target os: 'IOS_ANY' -- cgit v1.2.3 From be97b9ad72c04f622aa0843970b94761360d419f Mon Sep 17 00:00:00 2001 From: Tuomas Heimonen Date: Thu, 5 Sep 2019 12:04:35 +0300 Subject: Saferenderer: Update qtci-linux-RHEL-7.4-x86_64 static build Add build flag '-no-xcb' to remove xcb from static build Task-number: QSR-517 Change-Id: I9b77cd0ada41490233ec2aedb877a37bf2648a1b Reviewed-by: Jukka Jokiniva --- coin/platform_configs/qtsaferenderer.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'coin/platform_configs') diff --git a/coin/platform_configs/qtsaferenderer.yaml b/coin/platform_configs/qtsaferenderer.yaml index ac4d8c4a..ce537865 100644 --- a/coin/platform_configs/qtsaferenderer.yaml +++ b/coin/platform_configs/qtsaferenderer.yaml @@ -11,4 +11,4 @@ Template: 'qtci-linux-RHEL-7.4-x86_64' Compiler: 'GCC' Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -static -nomake tests -nomake examples -no-use-gold-linker -no-icu -no-fontconfig -qt-freetype -qpa offscreen -qt-libpng' + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -static -nomake tests -nomake examples -no-use-gold-linker -no-icu -no-fontconfig -qt-freetype -qpa offscreen -no-xcb -qt-libpng' -- cgit v1.2.3 From d581d86fc50bff5e64821b20babaa801102d1a24 Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Wed, 14 Aug 2019 15:59:39 +0300 Subject: Provisioning: update QEMU toolchains MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Update QEMU toolchains to Yocto thud(2.6) release(DC Qt 5.13.0) with GCC 8.2.0. * Suppress QEMU "Unsupported syscall" and "Unsupported ioctl" logs, set environment variable QEMU_SYSCALL_DEBUG to show them. Task-number: QTQAINFRA-2808 Change-Id: I987353b0f3aff87a02ea3bf96ace8de32d6f557b Reviewed-by: Liang Qi Reviewed-by: Tony Sarajärvi --- coin/platform_configs/default.yaml | 7 ++++++- coin/platform_configs/qtbase.yaml | 2 +- coin/platform_configs/qtdeclarative.yaml | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) (limited to 'coin/platform_configs') diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index b5a53ed9..f0be377e 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -1,3 +1,6 @@ +Version: 2 +Module only: True +Configurations: - Template: 'qtci-windows-10-x86_64-14' Compiler: 'MSVC2015' @@ -147,12 +150,14 @@ Target os: 'QEMU' Target arch: 'armv7' Compiler: 'GCC' - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-imx7-g++ -device-option CROSS_COMPILE=/opt/yocto-armv7/sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi- -device-option DISTRO_OPTS="hard-float boot2qt" -sysroot /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi -extprefix /home/qt/work/install -mysql_config /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi/usr/bin/mysql_config -psql_config /dev/null -tslib' + Environment variables: ['GST_PLUGIN_SCANNER=/opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi/usr/libexec/gstreamer-1.0/gst-plugin-scanner'] + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-imx7-g++ -device-option CROSS_COMPILE=/opt/yocto-armv7/sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi- -device-option DISTRO_OPTS="hard-float boot2qt" -sysroot /opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi -extprefix /home/qt/work/install -mysql_config /opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi/usr/bin/mysql_config -psql_config /dev/null -tslib' - Template: 'qtci-linux-Ubuntu-18.04-x86_64' Target os: 'QEMU' Target arch: 'arm64' Compiler: 'GCC' + Environment variables: ['GST_PLUGIN_SCANNER=/opt/yocto-arm64/sysroots/aarch64-poky-linux/usr/libexec/gstreamer-1.0/gst-plugin-scanner'] Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -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-linux-Ubuntu-18.04-x86_64' diff --git a/coin/platform_configs/qtbase.yaml b/coin/platform_configs/qtbase.yaml index 374d9cb0..fae959fc 100644 --- a/coin/platform_configs/qtbase.yaml +++ b/coin/platform_configs/qtbase.yaml @@ -4,7 +4,7 @@ Target arch: 'armv7' Compiler: 'GCC' 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-imx7-g++ -device-option CROSS_COMPILE=/opt/yocto-armv7/sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi- -device-option DISTRO_OPTS="hard-float boot2qt" -sysroot /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi -extprefix /home/qt/work/install -mysql_config /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi/usr/bin/mysql_config -psql_config /dev/null -tslib' + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-imx7-g++ -device-option CROSS_COMPILE=/opt/yocto-armv7/sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi- -device-option DISTRO_OPTS="hard-float boot2qt" -sysroot /opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi -extprefix /home/qt/work/install -mysql_config /opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi/usr/bin/mysql_config -psql_config /dev/null -tslib' - Template: 'qtci-linux-Ubuntu-18.04-x86_64' Target os: 'QEMU' diff --git a/coin/platform_configs/qtdeclarative.yaml b/coin/platform_configs/qtdeclarative.yaml index 9327b92e..2bf9118a 100644 --- a/coin/platform_configs/qtdeclarative.yaml +++ b/coin/platform_configs/qtdeclarative.yaml @@ -3,7 +3,7 @@ Target os: 'QEMU' Target arch: 'armv7' Compiler: 'GCC' - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-imx7-g++ -device-option CROSS_COMPILE=/opt/yocto-armv7/sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi- -device-option DISTRO_OPTS="hard-float boot2qt" -sysroot /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi -extprefix /home/qt/work/install -mysql_config /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi/usr/bin/mysql_config -psql_config /dev/null -tslib' + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-imx7-g++ -device-option CROSS_COMPILE=/opt/yocto-armv7/sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi- -device-option DISTRO_OPTS="hard-float boot2qt" -sysroot /opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi -extprefix /home/qt/work/install -mysql_config /opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi/usr/bin/mysql_config -psql_config /dev/null -tslib' - Template: 'qtci-linux-Ubuntu-18.04-x86_64' Target os: 'QEMU' -- cgit v1.2.3 From d4e3d3cac32fca1c53576a3841174d6c38165143 Mon Sep 17 00:00:00 2001 From: Tuomas Heimonen Date: Fri, 6 Sep 2019 15:40:15 +0300 Subject: Saferenderer: Update qtci-linux-RHEL-7.4-x86_64 static build Add build flag '-no-opengl' to remove xcb from static build Add build flag '-no-vulkan' to disable vulkan Task-number: QSR-517 Change-Id: I7d6f5c507bd96aed024d3cf74029feb12ad77bca Reviewed-by: Jukka Jokiniva --- coin/platform_configs/qtsaferenderer.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'coin/platform_configs') diff --git a/coin/platform_configs/qtsaferenderer.yaml b/coin/platform_configs/qtsaferenderer.yaml index ce537865..14e0e953 100644 --- a/coin/platform_configs/qtsaferenderer.yaml +++ b/coin/platform_configs/qtsaferenderer.yaml @@ -11,4 +11,4 @@ Template: 'qtci-linux-RHEL-7.4-x86_64' Compiler: 'GCC' Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -static -nomake tests -nomake examples -no-use-gold-linker -no-icu -no-fontconfig -qt-freetype -qpa offscreen -no-xcb -qt-libpng' + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -static -nomake tests -nomake examples -no-use-gold-linker -no-icu -no-fontconfig -qt-freetype -no-opengl -qpa offscreen -no-xcb -qt-libpng -no-vulkan' -- cgit v1.2.3 From 8c00a4f01117a8ca26275450e23364ec3e6270f8 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Wed, 14 Aug 2019 13:12:01 +0200 Subject: Add webAssembly build for windows again This reverts commit 9a8fb868ec2c526325408a4cbf3e628aa3377e30 partially. See also 38e416be664dc216b332e6b4ff8d38905dfdc1e9. Task-number: QTBUG-63917 Task-number: QTQAINFRA-2835 Change-Id: I6a63c2c437bd1568d88ffae0b565b99c15188770 Reviewed-by: Liang Qi --- coin/platform_configs/qt5.yaml | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'coin/platform_configs') diff --git a/coin/platform_configs/qt5.yaml b/coin/platform_configs/qt5.yaml index 95ce332c..f502de7c 100644 --- a/coin/platform_configs/qt5.yaml +++ b/coin/platform_configs/qt5.yaml @@ -156,6 +156,12 @@ Compiler: 'GCC' Features: ['Packaging', 'DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix /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' + Target os: 'WebAssembly' + Compiler: 'Mingw73' + Features: ['Packaging', 'DisableTests'] + Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake examples -nomake tests -no-feature-thread -static -no-dbus -no-headersclean -no-ssl -no-warnings-are-errors -no-pch -platform win32-g++ -xplatform wasm-emscripten' - Template: 'qtci-macos-10.13-x86_64-2' Target os: 'WebAssembly' -- cgit v1.2.3 From d8a384f03f928f83cf1799326c46d546cd9bbc7d Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Mon, 9 Sep 2019 12:35:05 +0300 Subject: Provisioning: Use correct sysroot path for QEMU armv7 in qtdeclarative MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTQAINFRA-2808 Change-Id: Ia0caf7003a5bd67dc220f0a3a1da06646ca6b657 Reviewed-by: Tony Sarajärvi --- coin/platform_configs/qtdeclarative.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'coin/platform_configs') diff --git a/coin/platform_configs/qtdeclarative.yaml b/coin/platform_configs/qtdeclarative.yaml index 2bf9118a..161875d8 100644 --- a/coin/platform_configs/qtdeclarative.yaml +++ b/coin/platform_configs/qtdeclarative.yaml @@ -15,7 +15,7 @@ Target os: 'QEMU' Target arch: 'armv7' Compiler: 'GCC' - Configure arguments: '-opensource -confirm-license -R . -developer-build -device linux-imx7-g++ -device-option CROSS_COMPILE=/opt/yocto-armv7/sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi- -device-option DISTRO_OPTS="hard-float boot2qt" -extprefix /home/qt/work/install -mysql_config /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi/usr/bin/mysql_config -no-xcb -nomake examples -nomake tests -openssl -prefix /home/qt/work/install -psql_config /dev/null -sysroot /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi -tslib -verbose' + Configure arguments: '-opensource -confirm-license -R . -developer-build -device linux-imx7-g++ -device-option CROSS_COMPILE=/opt/yocto-armv7/sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi- -device-option DISTRO_OPTS="hard-float boot2qt" -extprefix /home/qt/work/install -mysql_config /opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi/usr/bin/mysql_config -no-xcb -nomake examples -nomake tests -openssl -prefix /home/qt/work/install -psql_config /dev/null -sysroot /opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi -tslib -verbose' - Template: 'qtci-linux-Ubuntu-18.04-x86_64' Target os: 'QEMU' -- cgit v1.2.3 From fa03dbce1f1eff1967d6607e1c41c8fc41cc0a09 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Mon, 19 Aug 2019 14:48:31 +0300 Subject: Platform configurations: Move Android_ANY (clang-x86) to default MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Arm targets from default change places with clang-x86 from qt5 Task-number: QTQAINFRA-3153 Change-Id: I642f5c07fd5c36bf675676d82f5f200bce4beccf Reviewed-by: Tony Sarajärvi --- coin/platform_configs/default.yaml | 20 ++++++++++++++------ coin/platform_configs/qt5.yaml | 30 +++++++++++------------------- 2 files changed, 25 insertions(+), 25 deletions(-) (limited to 'coin/platform_configs') diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index 4ac899de..55e73038 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -40,6 +40,14 @@ Configurations: 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-14' + Target os: 'Android_ANY' + Target arch: 'x86' + Compiler: 'Mingw73' + Target compiler: 'Clang' + Features: ['Packaging', 'DisableTests'] + Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -opengl es2 -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r19c -android-arch x86' - Template: 'qtci-linux-Ubuntu-18.04-x86_64' Compiler: 'GCC' @@ -130,21 +138,21 @@ Configurations: Features: ['DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -nomake tests -nomake examples -no-sql-mysql -no-sql-psql -plugin-sql-sqlite -xplatform macx-watchos-clang' - - Template: 'qtci-linux-RHEL-7.6-x86_64' + Template: 'qtci-macos-10.13-x86_64-2' Target os: 'Android_ANY' - Target arch: 'armv7' + Target arch: 'x86' Compiler: 'Clang' Target compiler: 'Clang' Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -no-use-gold-linker -sysconfdir /etc/xdg -opengl es2 -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host linux-x86_64 -android-arch armeabi-v7a -xplatform android-clang' + Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host darwin-x86_64 -android-arch x86' - Template: 'qtci-linux-RHEL-7.6-x86_64' Target os: 'Android_ANY' - Target arch: 'arm64' - Compiler: 'Clang' + Target arch: 'x86' + Compiler: 'GCC' Target compiler: 'Clang' Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -no-use-gold-linker -sysconfdir /etc/xdg -opengl es2 -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host linux-x86_64 -android-arch arm64-v8a -xplatform android-clang' + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-use-gold-linker -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host linux-x86_64 -android-arch x86' - Template: 'qtci-linux-Ubuntu-18.04-x86_64' Target os: 'QEMU' diff --git a/coin/platform_configs/qt5.yaml b/coin/platform_configs/qt5.yaml index 69f1c7e3..49116bd3 100644 --- a/coin/platform_configs/qt5.yaml +++ b/coin/platform_configs/qt5.yaml @@ -37,35 +37,35 @@ - Template: 'qtci-linux-RHEL-7.6-x86_64' Target os: 'Android_ANY' - Target arch: 'x86' - Compiler: 'GCC' + Target arch: 'armv7' + Compiler: 'Clang' Target compiler: 'Clang' Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-use-gold-linker -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host linux-x86_64 -android-arch x86' + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -no-use-gold-linker -sysconfdir /etc/xdg -opengl es2 -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host linux-x86_64 -android-arch armeabi-v7a -xplatform android-clang' - - Template: 'qtci-windows-10-x86_64-14' + Template: 'qtci-linux-RHEL-7.6-x86_64' Target os: 'Android_ANY' - Target arch: 'armv7' - Compiler: 'Mingw73' + Target arch: 'arm64' + Compiler: 'Clang' Target compiler: 'Clang' Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -opengl es2 -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r19c -android-arch armeabi-v7a' + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -no-use-gold-linker -sysconfdir /etc/xdg -opengl es2 -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host linux-x86_64 -android-arch arm64-v8a -xplatform android-clang' - Template: 'qtci-windows-10-x86_64-14' Target os: 'Android_ANY' - Target arch: 'arm64' + Target arch: 'armv7' Compiler: 'Mingw73' Target compiler: 'Clang' Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -opengl es2 -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r19c -android-arch arm64-v8a' + Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -opengl es2 -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r19c -android-arch armeabi-v7a' - Template: 'qtci-windows-10-x86_64-14' Target os: 'Android_ANY' - Target arch: 'x86' + Target arch: 'arm64' Compiler: 'Mingw73' Target compiler: 'Clang' Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -opengl es2 -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r19c -android-arch x86' + Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -opengl es2 -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r19c -android-arch arm64-v8a' - Template: 'qtci-macos-10.13-x86_64-2' Target os: 'Android_ANY' @@ -82,14 +82,6 @@ Target compiler: 'Clang' Features: ['Packaging', 'DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host darwin-x86_64 -android-arch arm64-v8a' -- - Template: 'qtci-macos-10.13-x86_64-2' - Target os: 'Android_ANY' - Target arch: 'x86' - Compiler: 'Clang' - Target compiler: 'Clang' - Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host darwin-x86_64 -android-arch x86' - Template: 'qtci-macos-10.13-x86_64-2' Target os: 'QNX_700' -- cgit v1.2.3 From 2cec2c5f8c4521b7aef519849723b51d5de74ab8 Mon Sep 17 00:00:00 2001 From: Jani Heikkinen Date: Mon, 16 Sep 2019 14:52:49 +0300 Subject: Add build for combined android targets From 5.14 -> android builds are done by default at one go. Add new builds for doing that. Removing old, separate builds will be removed in a follow-up patch to give time for packaging to adapt that new system Change-Id: I42f094c7940f3914d7e00feda71cc74f7a26655f Reviewed-by: BogDan Vatra Reviewed-by: Eskil Abrahamsen Blomfeldt --- coin/platform_configs/default.yaml | 8 ++++++++ coin/platform_configs/qt5.yaml | 16 ++++++++++++++++ 2 files changed, 24 insertions(+) (limited to 'coin/platform_configs') diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index b98c451e..f15a2bc5 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -114,6 +114,14 @@ Configurations: Compiler: 'Clang' Features: ['DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -nomake tests -nomake examples -no-sql-mysql -no-sql-psql -plugin-sql-sqlite -xplatform macx-watchos-clang' +- + Template: 'qtci-linux-RHEL-7.6-x86_64' + Target os: 'Android_ANY' + Target arch: 'multi' + Compiler: 'Clang' + Target compiler: 'Clang' + Features: ['Packaging', 'DisableTests'] + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -no-use-gold-linker -sysconfdir /etc/xdg -opengl es2 -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r20 -android-ndk-host linux-x86_64 -xplatform android-clang' - Template: 'qtci-linux-RHEL-7.6-x86_64' Target os: 'Android_ANY' diff --git a/coin/platform_configs/qt5.yaml b/coin/platform_configs/qt5.yaml index f502de7c..d813c9cd 100644 --- a/coin/platform_configs/qt5.yaml +++ b/coin/platform_configs/qt5.yaml @@ -50,6 +50,14 @@ Target compiler: 'Clang' Features: ['Packaging', 'DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-use-gold-linker -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r20 -android-ndk-host linux-x86_64 -android-arch x86_64' +- + Template: 'qtci-windows-10-x86_64-14' + Target os: 'Android_ANY' + Target arch: 'multi' + Compiler: 'Mingw73' + Target compiler: 'Clang' + Features: ['Packaging', 'DisableTests'] + Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -opengl es2 -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r20' - Template: 'qtci-windows-10-x86_64-14' Target os: 'Android_ANY' @@ -90,6 +98,14 @@ Target compiler: 'Clang' Features: ['Packaging', 'DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r20 -android-ndk-host darwin-x86_64 -android-arch armeabi-v7a' +- + Template: 'qtci-macos-10.13-x86_64-2' + Target os: 'Android_ANY' + Target arch: 'multi' + Compiler: 'Clang' + Target compiler: 'Clang' + Features: ['Packaging', 'DisableTests'] + Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r20 -android-ndk-host darwin-x86_64' - Template: 'qtci-macos-10.13-x86_64-2' Target os: 'Android_ANY' -- cgit v1.2.3