From 9ee61892d0ae1ad2fb22b87bd37d63eb1e0ddcc3 Mon Sep 17 00:00:00 2001 From: Toni Saario Date: Tue, 4 Jun 2019 14:08:47 +0300 Subject: Add platform_configurations for StaticHostOnly targets Configuring modules in specific files removes their dependency for coin creating their configurations. Task-number: COIN-259 Task-number: QTBUG-78942 Change-Id: I8f2a9a5672ca2261c8949baf49f2d0d093bf1c5b Reviewed-by: Aapo Keskimolo --- coin/platform_configs/flashing-wizard.yaml | 23 ++++++++++++++++++++++ coin/platform_configs/qdb.yaml | 23 ++++++++++++++++++++++ coin/platform_configs/tqtc-qt-config-gui.yaml | 28 +++++++++++++++++++++++++++ 3 files changed, 74 insertions(+) create mode 100644 coin/platform_configs/flashing-wizard.yaml create mode 100644 coin/platform_configs/qdb.yaml create mode 100644 coin/platform_configs/tqtc-qt-config-gui.yaml (limited to 'coin/platform_configs') diff --git a/coin/platform_configs/flashing-wizard.yaml b/coin/platform_configs/flashing-wizard.yaml new file mode 100644 index 00000000..f0f0e51d --- /dev/null +++ b/coin/platform_configs/flashing-wizard.yaml @@ -0,0 +1,23 @@ +Version: 2 +Module only: True +Configurations: + - + Template: 'qtci-windows-10-x86_64-14' + 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% -static -no-icu' + - + Template: 'qtci-windows-10-x86_64-14' + Compiler: 'MSVC2017' + Target arch: 'x86' + Features: ['Packaging'] + 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_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% -static -no-icu' + - + Template: 'qtci-linux-RHEL-7.6-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 -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -qt-xcb -sysconfdir /etc/xdg -qt-pcre -qt-harfbuzz -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib QMAKE_LFLAGS_APP+=-s -static -no-icu' + - + Template: 'qtci-linux-Ubuntu-18.04-x86_64' + Compiler: 'GCC' + Features: ['TestOnly', 'LicenseCheck'] diff --git a/coin/platform_configs/qdb.yaml b/coin/platform_configs/qdb.yaml new file mode 100644 index 00000000..02198976 --- /dev/null +++ b/coin/platform_configs/qdb.yaml @@ -0,0 +1,23 @@ +Version: 2 +Module only: True +Configurations: + - + Template: 'qtci-windows-10-x86_64-14' + Compiler: 'MSVC2015' + Target arch: 'x86' + Features: ['Packaging'] + Configure arguments: '-opensource -confirm-license -nomake tests -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -opengl dynamic -static -no-icu -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%' + - + Template: 'qtci-windows-10-x86_64-14' + Compiler: 'MSVC2015' + Features: ['Packaging'] + Configure arguments: '-opensource -confirm-license -nomake tests -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -opengl dynamic -static -no-icu -nomake examples -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%' + - + Template: 'qtci-linux-RHEL-7.6-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 -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -qt-xcb -sysconfdir /etc/xdg -qt-pcre -qt-harfbuzz -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib QMAKE_LFLAGS_APP+=-s -static -no-icu' + - + Template: 'qtci-linux-Ubuntu-18.04-x86_64' + Compiler: 'GCC' + Features: ['TestOnly', 'LicenseCheck'] diff --git a/coin/platform_configs/tqtc-qt-config-gui.yaml b/coin/platform_configs/tqtc-qt-config-gui.yaml new file mode 100644 index 00000000..da37d0e5 --- /dev/null +++ b/coin/platform_configs/tqtc-qt-config-gui.yaml @@ -0,0 +1,28 @@ +Version: 2 +Module only: True +Configurations: + - + Template: 'qtci-windows-10-x86_64-14' + 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% -static -no-icu' + - + Template: 'qtci-windows-10-x86_64-14' + Compiler: 'MSVC2017' + Target arch: 'x86' + 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% -static -no-icu' + - + Template: 'qtci-linux-RHEL-7.6-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 -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -qt-xcb -sysconfdir /etc/xdg -qt-pcre -qt-harfbuzz -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib QMAKE_LFLAGS_APP+=-s -static -no-icu' + - + 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 -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include -static -no-icu' + - + Template: 'qtci-linux-Ubuntu-18.04-x86_64' + Compiler: 'GCC' + Features: ['TestOnly', 'LicenseCheck'] -- cgit v1.2.3 From 2b58935efd12bd649e28149cb64ea021b88f9e2e Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 10 Oct 2019 16:43:21 +0300 Subject: QNX: Use extprefix for the host path Use extprefix instead of prefix, so that the target deployment path won't contain host paths. Especially needed to avoid Windows host paths on target. Prefix will default to /usr/local/Qt-x.x.x Task-number: COIN-48 Change-Id: Ie888dace694294b72a32913b65a191b4bcb78371 Reviewed-by: James McDonnell --- coin/platform_configs/default.yaml | 2 +- coin/platform_configs/qt5.yaml | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'coin/platform_configs') diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index 55e73038..d19ec84c 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -191,4 +191,4 @@ Configurations: Target arch: 'armv7' Compiler: 'GCC' Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-use-gold-linker -opengl es2 -no-sql-mysql -qpa qnx -xplatform qnx-armle-v7-qcc' + Configure arguments: '-opensource -confirm-license -verbose -extprefix /home/qt/work/install -release -nomake tests -nomake examples -no-use-gold-linker -opengl es2 -no-sql-mysql -qpa qnx -xplatform qnx-armle-v7-qcc' diff --git a/coin/platform_configs/qt5.yaml b/coin/platform_configs/qt5.yaml index 208c47ed..1bd4c9da 100644 --- a/coin/platform_configs/qt5.yaml +++ b/coin/platform_configs/qt5.yaml @@ -112,42 +112,42 @@ Target arch: 'x86' Compiler: 'GCC' Features: ['DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake tests -nomake examples -no-use-gold-linker -opengl es2 -qpa qnx -xplatform qnx-x86-qcc' + 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' Target os: 'QNX_700' Target arch: 'armv7' Compiler: 'Mingw73' Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -opengl es2 -xplatform qnx-armle-v7-qcc' + 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' Target os: 'QNX_700' Target arch: 'armv8' Compiler: 'Mingw73' Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -opengl es2 -nomake tests -nomake examples -no-sql-mysql -xplatform qnx-aarch64le-qcc' + 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' Target os: 'QNX_700' Target arch: 'x86_64' Compiler: 'Mingw73' Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -opengl es2 -xplatform qnx-x86-64-qcc' + Configure arguments: '-opensource -confirm-license -verbose -extprefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -opengl es2 -xplatform qnx-x86-64-qcc' - Template: 'qtci-linux-RHEL-7.6-x86_64' Target os: 'QNX_700' Target arch: 'armv8' 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-aarch64le-qcc' + 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-aarch64le-qcc' - Template: 'qtci-linux-RHEL-7.6-x86_64' Target os: 'QNX_700' Target arch: 'x86_64' 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' + 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' Target os: 'WebAssembly' -- cgit v1.2.3