From ddbebe9daca6358e00ea61445c4fd90ae5f6b67a Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Mon, 22 Jul 2019 10:59:20 +0200 Subject: [PATCH] Stop building debug-and-release packages for MinGW MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The requirement to separate debug and release DLLs on Windows stems from the Visual Studio C run-time library appearing in two different variants (debug and release) and not mixing well. It's possible to perform builds without optimzations and with debug symbols while linking against the release version of the C run-time, but at the same time the debug version of the run-time brings other developer visible advantages. MinGW on the other hand does not have this distinction, does not ship with separate DLLS and does also not require the VS C runtime library. Therefore we do not need this separation for MinGW, which means that our packages can be reduced in size and application developers wishing to debug their applications do not have to use debug builds of the Qt libraries or run into Qt internal debug code. This change is in preparation for turning off debug-and-release in qtbase. Since coin overrides the Qt defaults, this change needs to be applied first. Change-Id: I2ed6e2c0ae54cf23f78119d115f8d21906859e35 Reviewed-by: Cristian Adam Reviewed-by: Qt CI Bot Reviewed-by: Jörg Bornemann --- coin/platform_configs/qt3d-runtime.txt | 4 ++-- coin/platform_configs/qt5.txt | 4 ++-- coin/platform_configs/qtwebkit.txt | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/coin/platform_configs/qt3d-runtime.txt b/coin/platform_configs/qt3d-runtime.txt index 80319e1b..7fe6794b 100644 --- a/coin/platform_configs/qt3d-runtime.txt +++ b/coin/platform_configs/qt3d-runtime.txt @@ -2,8 +2,8 @@ Template Target OS Target arch Compiler Target C --------------------------- ------------------- ----------- ----------- --------------- -------------------------- -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- qtci-windows-10-x86_64-14 WinRT_10 MSVC2015 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake examples -nomake tests -platform win32-msvc2015 -xplatform winrt-x64-msvc2015 qtci-windows-10-x86_64-14 WinRT_10 x86 MSVC2017 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake examples -nomake tests -platform win32-msvc2017 -xplatform winrt-x86-msvc2017 -qtci-windows-7-x86-3 Mingw73 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -opengl dynamic -nomake examples -nomake tests -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++ -qtci-windows-10-x86_64-14 Mingw73 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -opengl dynamic -nomake examples -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% -platform win32-g++ +qtci-windows-7-x86-3 Mingw73 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -opengl dynamic -nomake examples -nomake tests -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++ +qtci-windows-10-x86_64-14 Mingw73 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -opengl dynamic -nomake examples -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% -platform win32-g++ qtci-windows-10-x86_64-14 WinRT_10 armv7 MSVC2017 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake examples -nomake tests -platform win32-msvc2017 -xplatform winrt-arm-msvc2017 qtci-windows-10-x86_64-14 WinRT_10 MSVC2017 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake examples -nomake tests -platform win32-msvc2017 -xplatform winrt-x64-msvc2017 qtci-linux-RHEL-7.6-x86_64 Android_ANY x86 GCC Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -opengl es2 -no-use-gold-linker -nomake examples -nomake tests -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -no-dbus -sysconfdir /etc/xdg -openssl -I /home/qt/openssl-1.0.2/include -android-ndk-host linux-x86_64 -no-qpa-platform-guard -android-arch x86 diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index 80319e1b..7fe6794b 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -2,8 +2,8 @@ Template Target OS Target arch Compiler Target C --------------------------- ------------------- ----------- ----------- --------------- -------------------------- -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- qtci-windows-10-x86_64-14 WinRT_10 MSVC2015 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake examples -nomake tests -platform win32-msvc2015 -xplatform winrt-x64-msvc2015 qtci-windows-10-x86_64-14 WinRT_10 x86 MSVC2017 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake examples -nomake tests -platform win32-msvc2017 -xplatform winrt-x86-msvc2017 -qtci-windows-7-x86-3 Mingw73 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -opengl dynamic -nomake examples -nomake tests -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++ -qtci-windows-10-x86_64-14 Mingw73 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -opengl dynamic -nomake examples -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% -platform win32-g++ +qtci-windows-7-x86-3 Mingw73 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -opengl dynamic -nomake examples -nomake tests -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++ +qtci-windows-10-x86_64-14 Mingw73 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -opengl dynamic -nomake examples -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% -platform win32-g++ qtci-windows-10-x86_64-14 WinRT_10 armv7 MSVC2017 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake examples -nomake tests -platform win32-msvc2017 -xplatform winrt-arm-msvc2017 qtci-windows-10-x86_64-14 WinRT_10 MSVC2017 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake examples -nomake tests -platform win32-msvc2017 -xplatform winrt-x64-msvc2017 qtci-linux-RHEL-7.6-x86_64 Android_ANY x86 GCC Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -opengl es2 -no-use-gold-linker -nomake examples -nomake tests -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -no-dbus -sysconfdir /etc/xdg -openssl -I /home/qt/openssl-1.0.2/include -android-ndk-host linux-x86_64 -no-qpa-platform-guard -android-arch x86 diff --git a/coin/platform_configs/qtwebkit.txt b/coin/platform_configs/qtwebkit.txt index 9e1c893f..ed004999 100644 --- a/coin/platform_configs/qtwebkit.txt +++ b/coin/platform_configs/qtwebkit.txt @@ -1,4 +1,4 @@ Template Target OS Target arch Compiler Features Configure arguments --------------------------- ------------------- ----------- ----------- ------------------------ -------------------------------------------------------------------------------------------------------------------------------------------------------- qtci-windows-10-x86_64-14 x86 MSVC2017 DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -nomake tests -debug-and-release -release -force-debug-info -opengl dynamic -qtci-windows-7-x86-3 Mingw73 Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -nomake tests -debug-and-release -release -opengl dynamic +qtci-windows-7-x86-3 Mingw73 Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -nomake tests -release -opengl dynamic