diff options
68 files changed, 166 insertions, 427 deletions
diff --git a/.gitmodules b/.gitmodules index ef01576e..4c618445 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,47 +1,47 @@ [submodule "qtbase"] path = qtbase url = ../qtbase.git - branch = dev + branch = wip/cmake status = essential [submodule "qtsvg"] depends = qtbase path = qtsvg url = ../qtsvg.git - branch = dev + branch = wip/cmake status = addon [submodule "qtdeclarative"] depends = qtbase recommends = qtsvg path = qtdeclarative url = ../qtdeclarative.git - branch = dev + branch = wip/cmake status = essential [submodule "qtactiveqt"] depends = qtbase path = qtactiveqt url = ../qtactiveqt.git branch = dev - status = addon + status = ignore [submodule "qtscript"] depends = qtbase recommends = qttools path = qtscript url = ../qtscript.git branch = dev - status = deprecated + status = ignore [submodule "qtmultimedia"] depends = qtbase recommends = qtdeclarative path = qtmultimedia url = ../qtmultimedia.git branch = dev - status = essential + status = ignore [submodule "qttools"] depends = qtbase recommends = qtdeclarative qtactiveqt path = qttools url = ../qttools.git - branch = dev + branch = wip/cmake status = essential [submodule "qtxmlpatterns"] depends = qtbase @@ -49,13 +49,13 @@ path = qtxmlpatterns url = ../qtxmlpatterns.git branch = dev - status = deprecated + status = ignore [submodule "qttranslations"] depends = qttools path = qttranslations url = ../qttranslations.git branch = dev - status = essential + status = ignore priority = 30 [submodule "qtdoc"] depends = qtdeclarative qttools @@ -63,7 +63,7 @@ path = qtdoc url = ../qtdoc.git branch = dev - status = essential + status = ignore priority = 40 [submodule "qtrepotools"] path = qtrepotools @@ -76,7 +76,7 @@ path = qtqa url = ../qtqa.git branch = master - status = essential + status = ignore priority = 50 [submodule "qtlocation"] depends = qtbase @@ -84,14 +84,14 @@ path = qtlocation url = ../qtlocation.git branch = dev - status = addon + status = ignore [submodule "qtsensors"] depends = qtbase recommends = qtdeclarative path = qtsensors url = ../qtsensors.git branch = dev - status = addon + status = ignore [submodule "qtsystems"] depends = qtbase recommends = qtdeclarative @@ -124,32 +124,32 @@ path = qtconnectivity url = ../qtconnectivity.git branch = dev - status = addon + status = ignore [submodule "qtwayland"] depends = qtbase recommends = qtdeclarative path = qtwayland url = ../qtwayland.git branch = dev - status = addon + status = ignore [submodule "qt3d"] depends = qtbase recommends = qtdeclarative qtimageformats qtgamepad path = qt3d url = ../qt3d.git branch = dev - status = addon + status = ignore [submodule "qtimageformats"] depends = qtbase path = qtimageformats url = ../qtimageformats.git - branch = dev + branch = wip/cmake status = addon [submodule "qtgraphicaleffects"] depends = qtdeclarative path = qtgraphicaleffects url = ../qtgraphicaleffects.git - branch = dev + branch = wip/cmake status = addon [submodule "qtquickcontrols"] depends = qtdeclarative @@ -157,51 +157,51 @@ path = qtquickcontrols url = ../qtquickcontrols.git branch = dev - status = addon + status = ignore [submodule "qtserialbus"] depends = qtbase recommends = qtserialport path = qtserialbus url = ../qtserialbus.git branch = dev - status = addon + status = ignore [submodule "qtserialport"] depends = qtbase path = qtserialport url = ../qtserialport.git - branch = dev + branch = wip/cmake status = addon [submodule "qtx11extras"] depends = qtbase path = qtx11extras url = ../qtx11extras.git branch = dev - status = addon + status = ignore [submodule "qtmacextras"] depends = qtbase path = qtmacextras url = ../qtmacextras.git branch = dev - status = addon + status = ignore [submodule "qtwinextras"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtwinextras url = ../qtwinextras.git branch = dev - status = addon + status = ignore [submodule "qtandroidextras"] depends = qtbase path = qtandroidextras url = ../qtandroidextras.git branch = dev - status = addon + status = ignore [submodule "qtwebsockets"] depends = qtbase recommends = qtdeclarative path = qtwebsockets url = ../qtwebsockets.git - branch = dev + branch = wip/cmake status = addon [submodule "qtwebchannel"] depends = qtbase @@ -209,14 +209,14 @@ path = qtwebchannel url = ../qtwebchannel.git branch = dev - status = addon + status = ignore [submodule "qtwebengine"] depends = qtdeclarative recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel qttools path = qtwebengine url = ../qtwebengine.git branch = dev - status = addon + status = ignore priority = 10 [submodule "qtcanvas3d"] depends = qtdeclarative @@ -230,67 +230,67 @@ path = qtwebview url = ../qtwebview.git branch = dev - status = addon + status = ignore [submodule "qtquickcontrols2"] depends = qtgraphicaleffects recommends = qtimageformats path = qtquickcontrols2 url = ../qtquickcontrols2.git branch = dev - status = essential + status = ignore [submodule "qtpurchasing"] depends = qtbase recommends = qtdeclarative qtandroidextras path = qtpurchasing url = ../qtpurchasing.git branch = dev - status = addon + status = ignore [submodule "qtcharts"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtcharts url = ../qtcharts.git branch = dev - status = addon + status = ignore [submodule "qtdatavis3d"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtdatavis3d url = ../qtdatavis3d.git branch = dev - status = addon + status = ignore [submodule "qtvirtualkeyboard"] depends = qtbase qtdeclarative qtsvg recommends = qtmultimedia qtquickcontrols path = qtvirtualkeyboard url = ../qtvirtualkeyboard.git branch = dev - status = addon + status = ignore [submodule "qtgamepad"] depends = qtbase recommends = qtdeclarative path = qtgamepad url = ../qtgamepad.git branch = dev - status = addon + status = ignore [submodule "qtscxml"] depends = qtbase qtdeclarative path = qtscxml url = ../qtscxml.git branch = dev - status = addon + status = ignore [submodule "qtspeech"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtspeech url = ../qtspeech.git branch = dev - status = addon + status = ignore [submodule "qtnetworkauth"] depends = qtbase path = qtnetworkauth url = ../qtnetworkauth.git - branch = dev + branch = wip/cmake status = addon [submodule "qtremoteobjects"] depends = qtbase @@ -298,29 +298,29 @@ path = qtremoteobjects url = ../qtremoteobjects.git branch = dev - status = addon + status = ignore [submodule "qtwebglplugin"] depends = qtbase qtwebsockets recommends = qtdeclarative path = qtwebglplugin url = ../qtwebglplugin.git branch = dev - status = addon + status = ignore [submodule "qtlottie"] depends = qtbase qtdeclarative path = qtlottie url = ../qtlottie.git branch = dev - status = preview + status = ignore [submodule "qtquicktimeline"] depends = qtbase qtdeclarative path = qtquicktimeline url = ../qtquicktimeline branch = dev - status = preview + status = ignore [submodule "qtquick3d"] depends = qtbase qtdeclarative path = qtquick3d url = ../qtquick3d.git branch = dev - status = preview + status = ignore diff --git a/coin/module_config.yaml b/coin/module_config.yaml new file mode 100644 index 00000000..d10eb769 --- /dev/null +++ b/coin/module_config.yaml @@ -0,0 +1,10 @@ +version: 1 +accept_configuration: + condition: property + property: host.os + equals_property: target.os + +build_instructions: + - type: EnvironmentVariable + variableName: Dummy + variableValue: dummy diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index 40c7bdaf..4bceae07 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -1,99 +1,12 @@ -- - Template: 'qtci-windows-7-x86-3' - Compiler: 'Mingw73' - 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++' -- - 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%' -- - Template: 'qtci-linux-Ubuntu-18.04-x86_64' - Compiler: 'GCC' - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -force-debug-info -nomake tests -no-widgets -nomake examples -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib' -- - Template: 'qtci-linux-Ubuntu-18.04-x86_64' +- Template: 'qtci-linux-Ubuntu-18.04-x86_64' 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-openSUSE-15.0-x86_64' + Configure arguments: '-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF -DFEATURE_developer_build=ON' +- Template: 'qtci-linux-openSUSE-15.0-x86_64' Compiler: 'ICC_18' - Features: ['DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-pch -system-sqlite -R . -platform linux-icc-64 -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'] - 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-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 -separate-debug-info -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -xcb -sysconfdir /etc/xdg -qt-pcre -qt-harfbuzz -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib' -- - 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' -- - Template: 'qtci-macos-10.13-x86_64-2' - Target os: 'IOS_ANY' - Target arch: 'multi' - Compiler: 'Clang' - Features: ['Packaging', 'DisableTests'] - 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-macos-10.13-x86_64-2' - Target os: 'TvOS_ANY' - Target arch: 'multi' - 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-tvos-clang' -- - Template: 'qtci-macos-10.13-x86_64-2' - Target os: 'WatchOS_ANY' - Target arch: 'multi' + Configure arguments: '-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF -DBUILD_SHARED_LIBS=OFF' +- Template: 'qtci-macos-10.13-x86_64-2' 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: '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-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 -android-arch armeabi-v7a -xplatform android-clang' -- - Template: 'qtci-linux-RHEL-7.6-x86_64' - Target os: 'Android_ANY' - Target arch: 'arm64' - 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 -android-arch arm64-v8a -xplatform android-clang' -- - Template: 'qtci-linux-Ubuntu-18.04-x86_64' - 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' -- - Template: 'qtci-linux-Ubuntu-18.04-x86_64' - Target os: 'QEMU' - 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' - Compiler: 'GCC' - Features: ['TestOnly', 'LicenseCheck'] -- - Template: 'qtci-linux-RHEL-7.6-x86_64' - Target os: 'QNX_700' - 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: '-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode10.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.12' +- Template: 'qtci-windows-10-x86_64-14' + Compiler: 'MSVC2017' + Configure arguments: '-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF -DCMAKE_TOOLCHAIN_FILE={{.Env.VCPKG_ROOT}}/scripts/buildsystems/vcpkg.cmake' diff --git a/coin/platform_configs/meta-boot2qt.yaml b/coin/platform_configs/meta-boot2qt.yaml deleted file mode 100644 index 95cc79c4..00000000 --- a/coin/platform_configs/meta-boot2qt.yaml +++ /dev/null @@ -1,40 +0,0 @@ -- - Template: 'qtci-linux-Ubuntu-18.04-x86_64' - Compiler: 'Yocto' - Target arch: 'TARGET1' -- - Template: 'qtci-linux-Ubuntu-18.04-x86_64' - Compiler: 'Yocto' - Target arch: 'TARGET2' -- - Template: 'qtci-linux-Ubuntu-18.04-x86_64' - Compiler: 'Yocto' - Target arch: 'TARGET3' -- - Template: 'qtci-linux-Ubuntu-18.04-x86_64' - Compiler: 'Yocto' - Target arch: 'TARGET4' -- - Template: 'qtci-linux-Ubuntu-18.04-x86_64' - Compiler: 'Yocto' - Target arch: 'TARGET5' -- - Template: 'qtci-linux-Ubuntu-18.04-x86_64' - Compiler: 'Yocto' - Target arch: 'TARGET6' -- - Template: 'qtci-linux-Ubuntu-18.04-x86_64' - Compiler: 'Yocto' - Target arch: 'TARGET7' -- - Template: 'qtci-linux-Ubuntu-18.04-x86_64' - Compiler: 'Yocto' - Target arch: 'TARGET8' -- - Template: 'qtci-linux-Ubuntu-18.04-x86_64' - Compiler: 'Yocto' - Target arch: 'TARGET9' -- - Template: 'qtci-linux-Ubuntu-18.04-x86_64' - Compiler: 'Yocto' - Target arch: 'TARGET10' diff --git a/coin/platform_configs/ogl-runtime.yaml b/coin/platform_configs/ogl-runtime.yaml deleted file mode 100644 index c1ec5493..00000000 --- a/coin/platform_configs/ogl-runtime.yaml +++ /dev/null @@ -1 +0,0 @@ -qt5.yaml diff --git a/coin/platform_configs/qt3d-runtime.yaml b/coin/platform_configs/qt3d-runtime.yaml deleted file mode 100644 index c1ec5493..00000000 --- a/coin/platform_configs/qt3d-runtime.yaml +++ /dev/null @@ -1 +0,0 @@ -qt5.yaml diff --git a/coin/platform_configs/qt5.yaml b/coin/platform_configs/qt5.yaml deleted file mode 100644 index c164eb44..00000000 --- a/coin/platform_configs/qt5.yaml +++ /dev/null @@ -1,140 +0,0 @@ -- - Template: 'qtci-windows-10-x86_64-14' - Target os: 'WinRT_10' - Compiler: 'MSVC2015' - Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -no-sql-mysql -platform win32-msvc2015 -xplatform winrt-x64-msvc2015' -- - Template: 'qtci-windows-10-x86_64-14' - Target os: 'WinRT_10' - Target arch: 'x86' - Compiler: 'MSVC2017' - Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -no-sql-mysql -platform win32-msvc2017 -xplatform winrt-x86-msvc2017' -- - Template: 'qtci-windows-7-x86-3' - Compiler: 'Mingw73' - Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -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++' -- - Template: 'qtci-windows-10-x86_64-14' - Compiler: 'Mingw73' - Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -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++' -- - Template: 'qtci-windows-10-x86_64-14' - Target os: 'WinRT_10' - Target arch: 'armv7' - Compiler: 'MSVC2017' - Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -no-sql-mysql -platform win32-msvc2017 -xplatform winrt-arm-msvc2017' -- - Template: 'qtci-windows-10-x86_64-14' - Target os: 'WinRT_10' - Compiler: 'MSVC2017' - Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -no-sql-mysql -platform win32-msvc2017 -xplatform winrt-x64-msvc2017' -- - Template: 'qtci-linux-RHEL-7.6-x86_64' - Target os: 'Android_ANY' - 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-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' -- - Template: 'qtci-windows-10-x86_64-14' - Target os: 'Android_ANY' - 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-r20 -android-arch armeabi-v7a' -- - Template: 'qtci-windows-10-x86_64-14' - Target os: 'Android_ANY' - 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-r20 -android-arch arm64-v8a' -- - 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-r20 -android-arch x86' -- - Template: 'qtci-macos-10.13-x86_64-2' - Target os: 'Android_ANY' - Target arch: 'armv7' - 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 -android-arch armeabi-v7a' -- - Template: 'qtci-macos-10.13-x86_64-2' - Target os: 'Android_ANY' - Target arch: 'arm64' - 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 -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-r20 -android-ndk-host darwin-x86_64 -android-arch x86' -- - Template: 'qtci-macos-10.13-x86_64-2' - Target os: 'QNX_700' - 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' -- - 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' -- - 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' -- - 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' -- - 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' -- - 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' -- - Template: 'qtci-macos-10.13-x86_64-2' - Target os: 'WebAssembly' - Compiler: 'Clang' - Features: ['Packaging', 'DisableTests'] - 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' diff --git a/coin/platform_configs/qtbase.yaml b/coin/platform_configs/qtbase.yaml deleted file mode 100644 index 16fa518d..00000000 --- a/coin/platform_configs/qtbase.yaml +++ /dev/null @@ -1,20 +0,0 @@ -- - Template: 'qtci-linux-Ubuntu-18.04-x86_64' - Target os: 'QEMU' - 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' -- - Template: 'qtci-linux-Ubuntu-18.04-x86_64' - Target os: 'QEMU' - Target arch: 'arm64' - 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-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-openSUSE-15.0-x86_64' - Target os: 'WebAssembly' - Compiler: 'GCC' - Features: ['DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -developer-build -static -nomake tests -nomake examples -no-pch -no-feature-thread -no-dbus -no-headersclean -no-ssl -no-warnings-are-errors -xplatform wasm-emscripten' diff --git a/coin/platform_configs/qtconnectivity.yaml b/coin/platform_configs/qtconnectivity.yaml deleted file mode 100644 index 782d6bce..00000000 --- a/coin/platform_configs/qtconnectivity.yaml +++ /dev/null @@ -1,6 +0,0 @@ -- - Template: 'qtci-windows-10-x86_64-14' - Target os: 'WinRT_10' - Target arch: 'x86_64' - Compiler: 'MSVC2015' - Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -developer-build -static -nomake tests -nomake examples -no-icu -force-debug-info -platform win32-msvc2015 -xplatform winrt-x64-msvc2015' diff --git a/coin/platform_configs/qtdeclarative.yaml b/coin/platform_configs/qtdeclarative.yaml deleted file mode 100644 index 9327b92e..00000000 --- a/coin/platform_configs/qtdeclarative.yaml +++ /dev/null @@ -1,24 +0,0 @@ -- - Template: 'qtci-linux-Ubuntu-18.04-x86_64' - 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' -- - Template: 'qtci-linux-Ubuntu-18.04-x86_64' - Target os: 'QEMU' - Target arch: 'arm64' - 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-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: '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' -- - Template: 'qtci-linux-Ubuntu-18.04-x86_64' - Target os: 'QEMU' - Target arch: 'arm64' - Compiler: 'GCC' - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake examples -nomake tests -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 -no-xcb' diff --git a/coin/platform_configs/qtsaferenderer.yaml b/coin/platform_configs/qtsaferenderer.yaml deleted file mode 100644 index cc0c29d7..00000000 --- a/coin/platform_configs/qtsaferenderer.yaml +++ /dev/null @@ -1,13 +0,0 @@ -- - Template: 'qtci-windows-10-x86_64-14' - Compiler: 'Mingw73' - Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -developer-build -nomake tests -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% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -platform win32-g++' -- - Template: 'qtci-windows-10-x86_64-14' - Compiler: 'Mingw73' - 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.6-x86_64' - Compiler: 'GCC' - Features: ['DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -developer-build -static -nomake tests -nomake examples -no-use-gold-linker' diff --git a/coin/platform_configs/qtsdk.yaml b/coin/platform_configs/qtsdk.yaml deleted file mode 100644 index 2c001058..00000000 --- a/coin/platform_configs/qtsdk.yaml +++ /dev/null @@ -1,8 +0,0 @@ -- - Template: 'qtci-windows-10-x86-3' - Compiler: 'MSVC2017' - Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -opengl dynamic -nomake examples -nomake tests' -- - Template: 'qtci-linux-RHEL-6.6-x86_64' - Compiler: 'GCC' - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -force-debug-info -nomake examples -nomake tests' diff --git a/coin/platform_configs/qtwebkit.yaml b/coin/platform_configs/qtwebkit.yaml deleted file mode 100644 index 0a1d5d31..00000000 --- a/coin/platform_configs/qtwebkit.yaml +++ /dev/null @@ -1,5 +0,0 @@ -- - Template: 'qtci-windows-7-x86-3' - Compiler: 'Mingw73' - Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -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++' diff --git a/coin/platform_configs/tqtc-qt-rta.yaml b/coin/platform_configs/tqtc-qt-rta.yaml deleted file mode 100644 index 76664d06..00000000 --- a/coin/platform_configs/tqtc-qt-rta.yaml +++ /dev/null @@ -1,14 +0,0 @@ -- - Template: 'qtci-windows-7-x86_64-4' - Compiler: 'MSVC2013' - Features: ['DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -opengl dynamic -nomake examples -nomake tests' -- - Template: 'qtci-windows-8.1-x86_64' - Compiler: 'MSVC2013' - Features: ['DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -opengl dynamic -nomake examples -nomake tests' -- - Template: 'qtci-windows-10-x86-3' - Compiler: 'MSVC2017' - Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -opengl dynamic -nomake examples -nomake tests' diff --git a/coin/provisioning/common/linux/cmake_linux.sh b/coin/provisioning/common/linux/cmake_linux.sh index 2b8d71d0..bfe7a9c5 100755 --- a/coin/provisioning/common/linux/cmake_linux.sh +++ b/coin/provisioning/common/linux/cmake_linux.sh @@ -33,7 +33,7 @@ ## ############################################################################# -# This script installs CMake 3.6.2 +# This script installs CMake # CMake is needed for autotests that verify that Qt can be built with CMake @@ -42,10 +42,11 @@ source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh" # shellcheck source=../unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" -version="3.6.2" -PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/cmake/cmake-3.6.2-Linux-x86_64.tar.gz" -AltUrl="https://cmake.org/files/v3.6/cmake-3.6.2-Linux-x86_64.tar.gz" -SHA1="dd9d8d57b66109d4bac6eef9209beb94608a185c" +majorminorversion="3.15" +version="3.15.0-rc1" +PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/cmake/cmake-$version-Linux-x86_64.tar.gz" +AltUrl="https://cmake.org/files/v$majorminorversion/cmake-$version-Linux-x86_64.tar.gz" +SHA1="5e4d2b4478485f1a16c91463fc91eea3a9487b7a" targetFolder="/opt/cmake-$version" appPrefix="cmake-$version-Linux-x86_64" diff --git a/coin/provisioning/common/macos/cmake.sh b/coin/provisioning/common/macos/cmake.sh index e22425b7..ed49de81 100755 --- a/coin/provisioning/common/macos/cmake.sh +++ b/coin/provisioning/common/macos/cmake.sh @@ -42,13 +42,13 @@ source "${BASH_SOURCE%/*}/InstallAppFromCompressedFileFromURL.sh" # shellcheck source=../unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" -PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/macos_10.13_high_sierra/cmake-3.11.3-Darwin-x86_64.tar.gz" -AltUrl="https://cmake.org/files/v3.11/cmake-3.11.3-Darwin-x86_64.tar.gz" -SHA1="3d13de8020ce560159fa5cecb669498c48552d96" -appPrefix="cmake-3.11.3-Darwin-x86_64" +PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/macos_10.13_high_sierra/cmake-3.15.0-rc1-Darwin-x86_64.tar.gz" +AltUrl="https://cmake.org/files/v3.15/cmake-3.15.0-rc1-Darwin-x86_64.tar.gz" +SHA1="94b6aa5f36fd20811eb6c5c036bb2ec154f2d652" +appPrefix="cmake-3.15.0-rc1-Darwin-x86_64" InstallAppFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$appPrefix" SetEnvVar "PATH" "/Applications/CMake.app/Contents/bin:\$PATH" -echo "CMake = 3.11.3" >> ~/versions.txt +echo "CMake = 3.15.0-rc1" >> ~/versions.txt diff --git a/coin/provisioning/common/windows/cmake.ps1 b/coin/provisioning/common/windows/cmake.ps1 index ec84d706..3367440b 100644 --- a/coin/provisioning/common/windows/cmake.ps1 +++ b/coin/provisioning/common/windows/cmake.ps1 @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2019 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -33,8 +33,8 @@ . "$PSScriptRoot\helpers.ps1" -$majorminorversion = "3.6" -$version = "3.6.2" +$majorminorversion = "3.15" +$version = "3.15.0-rc1" $zip = Get-DownloadLocation ("cmake-" + $version + "-win32-x86.zip") $officialurl = "https://cmake.org/files/v" + $majorminorversion + "/cmake-" + $version + "-win32-x86.zip" @@ -44,7 +44,7 @@ Write-Host "Removing old cmake" Remove-Item "C:\CMake" -Force -Recurse -ErrorAction SilentlyContinue Download $officialurl $cachedurl $zip -Verify-Checksum $zip "541F6E7EFD228E46770B8631FFE57097576E4D4E" +Verify-Checksum $zip "3739F2FF0CAD6EC15475A32D419EBEB0864C4800" Extract-7Zip $zip C: $defaultinstallfolder = "C:\cmake-" + $version + "-win32-x86" diff --git a/coin/provisioning/common/windows/install-vcpkg.ps1 b/coin/provisioning/common/windows/install-vcpkg.ps1 new file mode 100644 index 00000000..36b0d826 --- /dev/null +++ b/coin/provisioning/common/windows/install-vcpkg.ps1 @@ -0,0 +1,66 @@ +############################################################################# +## +## Copyright (C) 2019 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# +. "$PSScriptRoot\helpers.ps1" + +# This script will install vcpkg + +Write-Host "Installing vcpkg" + +$version = "qt-snapshot-2019-06-20" +$officialUrl = "https://codeload.github.com/tronical/vcpkg/zip/$version" +$zip = "C:\Utils\vcpkg.zip" + +Download "$officialUrl" "" "$zip" +Extract-7Zip "$zip" c:\utils +Remove-Item $zip + +$installationFolder = "c:\utils\vcpkg-$version" + +cd $installationFolder + +cmd /c bootstrap-vcpkg.bat + +if(![System.IO.File]::Exists("$installationFolder\vcpkg.exe")){ + Write-Host "Can't find $installationFolder\vcpkg.exe. Installation probably failed!" + exit 1 +} + +Set-EnvironmentVariable VCPKG_DEFAULT_TRIPLET "qt-x64-windows-static" +Set-EnvironmentVariable VCPKG_ROOT "$installationFolder" + +cmd /c $installationFolder\vcpkg.exe install --triplet qt-x64-windows-static @qt-packages-windows.txt +cmd /c $installationFolder\vcpkg.exe install --triplet qt-x86-windows-static @qt-packages-windows.txt + +Remove-Item -Recurse -Force packages +Remove-Item -Recurse -Force buildtrees +Remove-Item -Recurse -Force downloads diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh index 280e6b45..bfb58a2c 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh @@ -166,6 +166,9 @@ installPackages+=(git-lfs) installPackages+=(chrpath) installPackages+=(gawk) installPackages+=(texinfo) +# Needed for QtCore +installPackages+=(libdouble-conversion-dev) +installPackages+=(libpcre2-dev) echo "Running update for apt" waitLoop diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/40-cmake.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/40-install-cmake.sh index db8a3ff5..db8a3ff5 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/40-cmake.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/40-install-cmake.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/02-zypperpackages.sh b/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/02-zypperpackages.sh index d1f3050f..9da9ed0f 100755 --- a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/02-zypperpackages.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/02-zypperpackages.sh @@ -2,7 +2,7 @@ set -ex -sudo zypper -nq install git gcc7 gcc7-c++ +sudo zypper -nq install git gcc7 gcc7-c++ ninja sudo /usr/sbin/update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-7 1 \ --slave /usr/bin/g++ g++ /usr/bin/g++-7 \ --slave /usr/bin/cc cc /usr/bin/gcc-7 \ @@ -17,7 +17,8 @@ sudo zypper -nq install bison flex gperf \ fontconfig-devel \ sqlite3-devel \ libxkbcommon-devel \ - libxkbcommon-x11-devel + libxkbcommon-x11-devel \ + pcre2-devel libpng16-devel # EGL support sudo zypper -nq install Mesa-libEGL-devel Mesa-libGL-devel diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/25-cmake.sh b/coin/provisioning/qtci-macos-10.13-x86_64/25-install-cmake.sh index 4f4d405e..4f4d405e 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/25-cmake.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/25-install-cmake.sh diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/26-freetype.sh b/coin/provisioning/qtci-macos-10.13-x86_64/26-freetype.sh new file mode 100755 index 00000000..0faec4b4 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.13-x86_64/26-freetype.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash + +set -ex + +brew install freetype diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/26-ninja.sh b/coin/provisioning/qtci-macos-10.13-x86_64/26-ninja.sh new file mode 100755 index 00000000..c9d3e309 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.13-x86_64/26-ninja.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash + +set -ex + +brew install ninja diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/26-pcre2.sh b/coin/provisioning/qtci-macos-10.13-x86_64/26-pcre2.sh new file mode 100755 index 00000000..f8af516b --- /dev/null +++ b/coin/provisioning/qtci-macos-10.13-x86_64/26-pcre2.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash + +set -ex + +brew install pcre2 diff --git a/coin/provisioning/qtci-windows-10-x86_64/90-install-vcpkg.ps1 b/coin/provisioning/qtci-windows-10-x86_64/90-install-vcpkg.ps1 new file mode 100644 index 00000000..c898da22 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/90-install-vcpkg.ps1 @@ -0,0 +1,2 @@ +. "$PSScriptRoot\..\common\windows\install-vcpkg.ps1" + diff --git a/qt3d b/qt3d -Subproject 67f7a83d935539e185b4bf26e7c1c79e254497a +Subproject 299c0bc6d2ea5817ba32b3724290c349789be11 diff --git a/qtactiveqt b/qtactiveqt -Subproject 855c01603e19a78cb73421d4a5c2410c4ad31c3 +Subproject 3832b74aca592f8edf4cc54867d0a56334e797e diff --git a/qtandroidextras b/qtandroidextras -Subproject 9ee2af5485f02cbd4cd88cc02ab147f830007a7 +Subproject fe09a2dc3edb4b9a4377b25847f0c684c17fcc1 diff --git a/qtbase b/qtbase -Subproject bf8fcab8bb92ff534c5cec048d6dbebb3b73a34 +Subproject 900df4812278f8c9cde915690a2be355307f09d diff --git a/qtcharts b/qtcharts -Subproject a5d54eb0efd0155174e6b69bb6c4c069d20e99f +Subproject 40149204fe6df6c7bcee1d215b277d4553b385f diff --git a/qtconnectivity b/qtconnectivity -Subproject 75bb24bf9efc771d8462a3ee69ace6b398f8515 +Subproject b58c470962aa6831f53d088afd523c1b1530fbc diff --git a/qtdatavis3d b/qtdatavis3d -Subproject a54a5a253fce25d0ffa215996a3cdf2fca8b06b +Subproject 452cac276b493b6e9d6f1864eecaa97250cefd8 diff --git a/qtdeclarative b/qtdeclarative -Subproject bdf0a46c289298f7378796d62ae5fb283e08657 +Subproject bf58a1cc043c72c6df97b4c00ce7f90c83237f6 diff --git a/qtdoc b/qtdoc -Subproject c3a3c01c7f4df8cbdcf328cfb76f530c90f4281 +Subproject c2eb165e4cad518fa3a0660588199144477fb30 diff --git a/qtgamepad b/qtgamepad -Subproject 301af00942b710d8157a916907e2c8324f2502c +Subproject 2ff613b5971d687d8d92e6baad3466ee2af5c43 diff --git a/qtgraphicaleffects b/qtgraphicaleffects -Subproject 446eb21ff4a6787169c9ef4f9e9ebd531ce58c7 +Subproject 93d9b1e891666137f475223d1855d202f97045b diff --git a/qtimageformats b/qtimageformats -Subproject e6ab94c607d8bc078e3d6ba776aa2b69a144846 +Subproject 1d4a58a877b8b28074ca84a07340d2d8604b38d diff --git a/qtlocation b/qtlocation -Subproject 2b743cdca353f84959dac47e4ca24615c6f1830 +Subproject c8771162fca507caaf3c1881ac26e47593608b6 diff --git a/qtlottie b/qtlottie -Subproject 5891e5d7f5b1134a184fb82926c10866257f1f6 +Subproject 0278037c6a91a916f790971eafbc2ca0f8a9e4a diff --git a/qtmacextras b/qtmacextras -Subproject d1c4e8d6e4dd6200e9c3371e43b63e18911a9cc +Subproject c4353f2fbcc444aa349648e1c23e49156ae5946 diff --git a/qtmultimedia b/qtmultimedia -Subproject 18e6110dfdfd62cc0032f8e43586d075f15299f +Subproject bb1fde2553fa05de0603df96dcd9d60cecc8548 diff --git a/qtnetworkauth b/qtnetworkauth -Subproject 2b5e2bf759946d3c3f3eddafc4092338b05923a +Subproject e31ed2abc236f0c92ede9e1dd5ad6ecd53cc26f diff --git a/qtpurchasing b/qtpurchasing -Subproject 689db87975134dc7332cf32ce2afe96d8a5211a +Subproject 5b705a2b6896f8b613ad1e3120696ec0f81885e diff --git a/qtqa b/qtqa -Subproject 3cbc0456a5c238c755e47c49ee4b047836eae5e +Subproject 507202b4e7ae9f7a429e7f4d6eceb326e1b1b4a diff --git a/qtquickcontrols b/qtquickcontrols -Subproject 61463e781f1892f11a45f9c924aa9b5dbbb359f +Subproject f984a80d055e4c9bbd2224d0db54f4233838591 diff --git a/qtquickcontrols2 b/qtquickcontrols2 -Subproject 72149cbb6fe7b1e6af4018c945ece738f8ad0a1 +Subproject 247dad297cb7f8d5af42434c67d24ffcc7bae01 diff --git a/qtremoteobjects b/qtremoteobjects -Subproject a23672bad7e28cc0b9c573ad6909e15a4639065 +Subproject d9b4c020eb158d7fceb439ff66f7ce5db5a9df5 diff --git a/qtrepotools b/qtrepotools -Subproject 37df2fd634feac3458c19b8a37a44a36f8e3a72 +Subproject 3b937032f51c75b3f517e02b1db670884a8dc10 diff --git a/qtscript b/qtscript -Subproject 19a5026113c88ed1be83ed7c18f56c19daeea8d +Subproject 54176314d1c06ef387e797258cfc3993274665c diff --git a/qtscxml b/qtscxml -Subproject 1b555247e953d9be2b442f281698df475ad9fff +Subproject f149bb9d9afbe7a3d81741e95a121b78be25bbd diff --git a/qtsensors b/qtsensors -Subproject 3935d25914a98615ef1e857efb568da1c6db1ef +Subproject ae5af8baa9c0323f1908a6d218c28f9c504bc77 diff --git a/qtserialbus b/qtserialbus -Subproject d59e2a4b72154b64e1d26fd1068933b8a25da77 +Subproject 8dd3e45961b7098bc50649cfb8191eb3cbdf19e diff --git a/qtserialport b/qtserialport -Subproject cb8cf3e7fd7a4ea39c25057c59888112e342ee6 +Subproject 2e27d1967a9a4146697028ed8feed14d0df2a46 diff --git a/qtspeech b/qtspeech -Subproject bcca555e7227a0e651dd27dcb61bb5ae0f0b9c6 +Subproject 0b7c9acbafbfe32f6ccb254b7ec656fac6fb189 diff --git a/qtsvg b/qtsvg -Subproject 7831afe0d496794cdc7a7ffbf1b374120941c3e +Subproject e5b211a4adc313cc10d1216ff3e8a166b562137 diff --git a/qttools b/qttools -Subproject cbb56d8dab2447ce8fda454e6c6cd6938dffacb +Subproject 342f402c002f1bfcc842dd7711b040de4e2b27e diff --git a/qttranslations b/qttranslations -Subproject ab5af4c676b80a69e0f1b8459d4c081a43f6331 +Subproject 66952c79bc648e1074936dddb7fa2cffc17b177 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard -Subproject 92404f740116f29866e9f91505d94a2be6dd23e +Subproject 3744d0c3c961049a84023b7f8567e48196475b2 diff --git a/qtwayland b/qtwayland -Subproject fb1f6733b6d98d84f8abd89623c3878ed4a6257 +Subproject c9970025bc912c6d3b2fe6183762c6f254e84ae diff --git a/qtwebchannel b/qtwebchannel -Subproject 869a1a5f7321dcd3fdd57735fb503a6d3506c61 +Subproject 8b701450aeceb878784879eaf65dc42d5befd3a diff --git a/qtwebengine b/qtwebengine -Subproject 7268797ab9e32de7497f13ffa9820c49d8cb3e4 +Subproject bbd11d8da5c52c5c76a6657d884d2e648e41010 diff --git a/qtwebglplugin b/qtwebglplugin -Subproject 5f7bd72592576bb193592702a26a8b0288642a5 +Subproject bd97e6e554c21144cadc9e047fa7d5f22f5f32b diff --git a/qtwebsockets b/qtwebsockets -Subproject 4f29e93b157ed6e4e264297d27a8e1c006e098a +Subproject 5feeb5867d032cc4641ee088cfa5bd9063bcf5c diff --git a/qtwebview b/qtwebview -Subproject 64f9899781446d73e6ccc42021d4efbd8d1feb8 +Subproject f8c190945d7b3679db5a322de8e49acc88748c7 diff --git a/qtwinextras b/qtwinextras -Subproject 23fb8fa7d3894d5f93ec5d51461e1366274a0c0 +Subproject c496ca49dc0a01edcb0576818dab705ff5e02fe diff --git a/qtx11extras b/qtx11extras -Subproject 82d4d38d2037ae36b38fe81916b14feb4068972 +Subproject 4e35f08d17c277e36fa5fb636b374b3d1dceb76 diff --git a/qtxmlpatterns b/qtxmlpatterns -Subproject 3101514787f7f3a451514b2ef3fc6e7bcfe1f0c +Subproject bc4290cde83470dd72eb49e8cf6275f7b7a70f3 |