aboutsummaryrefslogtreecommitdiffstats
path: root/coin
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2020-04-24 11:05:13 +0200
committerAlexandru Croitor <alexandru.croitor@qt.io>2020-05-12 15:35:45 +0000
commit70bfcf5198928469318468f788371e3f06f5491e (patch)
tree901c164e8a26a40772303312fd4d182a2864b8ea /coin
parent7127f57038085fca64ce98829fbb709edf10f3a7 (diff)
Update configurations and repositories to allow cmake binary packaging
Disable qt5.git builds of repositories that have not been ported to CMake yet. Remove qmake configurations from qt5.yaml and default.yaml. Add cmake configurations to qt5.yaml. Add the Packaging feature to them. Keep one configuration in qt5.yaml, because it's apparently illegal to have it empty All of this to test out if the binary package creation process can work with the cmake artifacts. Change-Id: Iebb6c4303fa2104765a7b0a71489560afe7df244 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Simon Hausmann <hausmann@gmail.com> Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
Diffstat (limited to 'coin')
-rw-r--r--coin/platform_configs/default.yaml100
-rw-r--r--coin/platform_configs/qt5.yaml34
2 files changed, 23 insertions, 111 deletions
diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml
index b6295f90..ff5be5de 100644
--- a/coin/platform_configs/default.yaml
+++ b/coin/platform_configs/default.yaml
@@ -2,95 +2,35 @@ Version: 2
Module only: True
Configurations:
-
- Template: 'qtci-windows-7-x86-3'
- Compiler: 'Mingw73'
- Features: ['UseLegacyInstructions']
- Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -developer-build -release -nomake tests -opengl dynamic -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% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -platform win32-g++ -qt-zlib'
+ Template: 'qtci-macos-10.14-x86_64'
+ Compiler: 'Clang'
+ Features: ['Packaging']
+ Configure arguments: '-DBUILD_EXAMPLES=OFF -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode11.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl'
-
- Template: 'qtci-windows-10-x86_64-16'
+ Template: 'qtci-windows-10-x86_64-15'
Compiler: 'MSVC2019'
- Features: ['Packaging', 'UseLegacyInstructions']
- 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%'
+ Features: ['Packaging']
+ Configure arguments: '-DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..'
-
- Template: 'qtci-linux-Ubuntu-18.04-x86_64'
- Compiler: 'GCC'
- Features: ['UseLegacyInstructions']
- Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -force-debug-info -nomake tests -no-widgets -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib'
--
- Template: 'qtci-linux-Ubuntu-18.04-x86_64'
- Compiler: 'GCC'
- Features: ['OutOfSourceBuild', 'Documentation', 'UseLegacyInstructions']
- Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -no-warnings-are-errors -nomake tests -R . -qtlibinfix TestInfix -qtnamespace TestNamespace -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib'
--
- Template: 'qtci-linux-openSUSE-15.0-x86_64'
- Target os: 'WebAssembly'
- Compiler: 'GCC'
- Features: ['Packaging', 'DisableTests', 'UseLegacyInstructions']
- 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-15-x86_64'
+ Template: 'qtci-linux-RHEL-7.6-x86_64'
Compiler: 'GCC'
- Features: ['DisableTests', 'UseLegacyInstructions']
- 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'
+ Features: ['Packaging']
+ Configure arguments: '-DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}'
-
Template: 'qtci-linux-RHEL-7.6-x86_64'
+ Target os: 'Android_ANY'
+ Target arch: 'arm64'
Compiler: 'GCC'
- Features: ['Packaging', 'UseLegacyInstructions']
- 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 -xcb -bundled-xcb-xinput -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.14-x86_64'
- Compiler: 'Clang'
- Features: ['DisableTests', 'Packaging', 'UseLegacyInstructions']
- Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -force-debug-info -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: ['UseLegacyInstructions']
- 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 -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include'
--
- Template: 'qtci-macos-10.14-x86_64'
- Compiler: 'Clang'
- Features: ['DisableTests', 'UseLegacyInstructions']
- 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'
+ Features: ['Packaging']
+ Target compiler: 'Clang'
+ Configure arguments: '-DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}'
+ Environment variables: ['TARGET_CONFIGURE_ARGS=-DBUILD_EXAMPLES=OFF -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_HOME}} -DANDROID_ABI=arm64-v8a -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}']
-
Template: 'qtci-macos-10.14-x86_64'
Target os: 'IOS_ANY'
- Target arch: 'multi'
- Compiler: 'Clang'
- Features: ['Packaging', 'DisableTests', 'UseLegacyInstructions']
- Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -nomake tests -no-icu -nomake examples -no-sql-mysql -no-sql-psql -plugin-sql-sqlite -static -xplatform macx-ios-clang'
--
- Template: 'qtci-linux-RHEL-7.6-x86_64'
- Target os: 'Android_ANY'
- Target arch: 'multi'
+ Target arch: 'arm64'
Compiler: 'Clang'
+ Features: ['Packaging']
Target compiler: 'Clang'
- Features: ['Packaging', 'DisableTests', 'UseLegacyInstructions']
- 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'
--
- Template: 'qtci-linux-Ubuntu-18.04-x86_64'
- Target os: 'QEMU'
- Target arch: 'armv7'
- Compiler: 'GCC'
- Features: ['UseLegacyInstructions']
- 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'
- Features: ['UseLegacyInstructions']
- 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'
- Target os: 'QEMU'
- Target arch: 'mips64'
- Compiler: 'GCC'
- Features: ['DisableTests', 'UseLegacyInstructions']
- 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/mips64r2-poky-linux -extprefix /home/qt/work/install -mysql_config /opt/yocto-mips64/sysroots/mips64r2-poky-linux/usr/bin/mysql_config -psql_config /dev/null -tslib'
--
- Template: 'qtci-linux-Ubuntu-18.04-x86_64'
- Compiler: 'GCC'
- Features: ['TestOnly', 'LicenseCheck', 'UseLegacyInstructions']
+ Configure arguments: '-DBUILD_EXAMPLES=OFF -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode11.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl'
+ Environment variables: ['TARGET_CONFIGURE_ARGS=-DCMAKE_BUILD_TYPE=Release -DBUILD_EXAMPLES=OFF -DCMAKE_SYSTEM_NAME=iOS -DQT_UIKIT_SDK=iphoneos']
diff --git a/coin/platform_configs/qt5.yaml b/coin/platform_configs/qt5.yaml
index c48b63ab..34194c3d 100644
--- a/coin/platform_configs/qt5.yaml
+++ b/coin/platform_configs/qt5.yaml
@@ -1,32 +1,4 @@
-
- Template: 'qtci-windows-7-x86-3'
- Compiler: 'Mingw73'
- Features: ['Packaging', 'DisableTests', 'UseLegacyInstructions']
- Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -separate-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% -platform win32-g++ QMAKE_LFLAGS_APP+=-s -qt-zlib'
--
- Template: 'qtci-windows-10-x86_64-16'
- Compiler: 'Mingw73'
- Features: ['Packaging', 'DisableTests', 'UseLegacyInstructions']
- Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -separate-debug-info -nomake tests -nomake examples -opengl dynamic -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% -platform win32-g++ QMAKE_LFLAGS_APP+=-s -qt-zlib'
--
- Template: 'qtci-windows-10-x86_64-16'
- Target os: 'Android_ANY'
- Target arch: 'multi'
- Compiler: 'Mingw73'
- Target compiler: 'Clang'
- Features: ['Packaging', 'DisableTests', 'UseLegacyInstructions']
- 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 -qt-zlib'
--
- Template: 'qtci-macos-10.14-x86_64'
- Target os: 'Android_ANY'
- Target arch: 'multi'
- Compiler: 'Clang'
- Target compiler: 'Clang'
- Features: ['Packaging', 'DisableTests', 'UseLegacyInstructions']
- 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.14-x86_64'
- Target os: 'WebAssembly'
- Compiler: 'Clang'
- Features: ['Packaging', 'DisableTests', 'UseLegacyInstructions']
- Configure arguments: '-opensource -confirm-license -verbose -prefix /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 -xplatform wasm-emscripten'
+ Template: 'qtci-linux-Ubuntu-18.04-x86_64'
+ Compiler: 'GCC'
+ Features: ['TestOnly', 'LicenseCheck', 'UseLegacyInstructions']