diff options
72 files changed, 300 insertions, 98 deletions
diff --git a/.gitmodules b/.gitmodules index 2f6addc7..f6948954 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,60 +1,60 @@ [submodule "qtbase"] path = qtbase url = ../qtbase.git - branch = 5.13 + branch = 5.14 status = essential [submodule "qtsvg"] depends = qtbase path = qtsvg url = ../qtsvg.git - branch = 5.13 + branch = 5.14 status = addon [submodule "qtdeclarative"] depends = qtbase recommends = qtsvg path = qtdeclarative url = ../qtdeclarative.git - branch = 5.13 + branch = 5.14 status = essential [submodule "qtactiveqt"] depends = qtbase path = qtactiveqt url = ../qtactiveqt.git - branch = 5.13 + branch = 5.14 status = addon [submodule "qtscript"] depends = qtbase recommends = qttools path = qtscript url = ../qtscript.git - branch = 5.13 + branch = 5.14 status = deprecated [submodule "qtmultimedia"] depends = qtbase recommends = qtdeclarative path = qtmultimedia url = ../qtmultimedia.git - branch = 5.13 + branch = 5.14 status = essential [submodule "qttools"] depends = qtbase recommends = qtdeclarative qtactiveqt path = qttools url = ../qttools.git - branch = 5.13 + branch = 5.14 status = essential [submodule "qtxmlpatterns"] depends = qtbase recommends = qtdeclarative path = qtxmlpatterns url = ../qtxmlpatterns.git - branch = 5.13 + branch = 5.14 status = deprecated [submodule "qttranslations"] depends = qttools path = qttranslations url = ../qttranslations.git - branch = 5.13 + branch = 5.14 status = essential priority = 30 [submodule "qtdoc"] @@ -62,7 +62,7 @@ recommends = qtmultimedia qtquickcontrols qtquickcontrols2 path = qtdoc url = ../qtdoc.git - branch = 5.13 + branch = 5.14 status = essential priority = 40 [submodule "qtrepotools"] @@ -83,14 +83,14 @@ recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport path = qtlocation url = ../qtlocation.git - branch = 5.13 + branch = 5.14 status = addon [submodule "qtsensors"] depends = qtbase recommends = qtdeclarative path = qtsensors url = ../qtsensors.git - branch = 5.13 + branch = 5.14 status = addon [submodule "qtsystems"] depends = qtbase @@ -123,99 +123,99 @@ recommends = qtdeclarative qtandroidextras path = qtconnectivity url = ../qtconnectivity.git - branch = 5.13 + branch = 5.14 status = addon [submodule "qtwayland"] depends = qtbase recommends = qtdeclarative path = qtwayland url = ../qtwayland.git - branch = 5.13 + branch = 5.14 status = addon [submodule "qt3d"] depends = qtbase recommends = qtdeclarative qtimageformats qtgamepad path = qt3d url = ../qt3d.git - branch = 5.13 + branch = 5.14 status = addon [submodule "qtimageformats"] depends = qtbase path = qtimageformats url = ../qtimageformats.git - branch = 5.13 + branch = 5.14 status = addon [submodule "qtgraphicaleffects"] depends = qtdeclarative path = qtgraphicaleffects url = ../qtgraphicaleffects.git - branch = 5.13 + branch = 5.14 status = addon [submodule "qtquickcontrols"] depends = qtdeclarative recommends = qtgraphicaleffects path = qtquickcontrols url = ../qtquickcontrols.git - branch = 5.13 + branch = 5.14 status = addon [submodule "qtserialbus"] depends = qtbase recommends = qtserialport path = qtserialbus url = ../qtserialbus.git - branch = 5.13 + branch = 5.14 status = addon [submodule "qtserialport"] depends = qtbase path = qtserialport url = ../qtserialport.git - branch = 5.13 + branch = 5.14 status = addon [submodule "qtx11extras"] depends = qtbase path = qtx11extras url = ../qtx11extras.git - branch = 5.13 + branch = 5.14 status = addon [submodule "qtmacextras"] depends = qtbase path = qtmacextras url = ../qtmacextras.git - branch = 5.13 + branch = 5.14 status = addon [submodule "qtwinextras"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtwinextras url = ../qtwinextras.git - branch = 5.13 + branch = 5.14 status = addon [submodule "qtandroidextras"] depends = qtbase path = qtandroidextras url = ../qtandroidextras.git - branch = 5.13 + branch = 5.14 status = addon [submodule "qtwebsockets"] depends = qtbase recommends = qtdeclarative path = qtwebsockets url = ../qtwebsockets.git - branch = 5.13 + branch = 5.14 status = addon [submodule "qtwebchannel"] depends = qtbase recommends = qtdeclarative qtwebsockets path = qtwebchannel url = ../qtwebchannel.git - branch = 5.13 + branch = 5.14 status = addon [submodule "qtwebengine"] depends = qtdeclarative recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel qttools path = qtwebengine url = ../qtwebengine.git - branch = 5.13 + branch = 5.14 status = addon priority = 10 [submodule "qtcanvas3d"] @@ -229,86 +229,98 @@ recommends = qtwebengine path = qtwebview url = ../qtwebview.git - branch = 5.13 + branch = 5.14 status = addon [submodule "qtquickcontrols2"] depends = qtgraphicaleffects recommends = qtimageformats path = qtquickcontrols2 url = ../qtquickcontrols2.git - branch = 5.13 + branch = 5.14 status = essential [submodule "qtpurchasing"] depends = qtbase recommends = qtdeclarative qtandroidextras path = qtpurchasing url = ../qtpurchasing.git - branch = 5.13 + branch = 5.14 status = addon [submodule "qtcharts"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtcharts url = ../qtcharts.git - branch = 5.13 + branch = 5.14 status = addon [submodule "qtdatavis3d"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtdatavis3d url = ../qtdatavis3d.git - branch = 5.13 + branch = 5.14 status = addon [submodule "qtvirtualkeyboard"] depends = qtbase qtdeclarative qtsvg recommends = qtmultimedia qtquickcontrols path = qtvirtualkeyboard url = ../qtvirtualkeyboard.git - branch = 5.13 + branch = 5.14 status = addon [submodule "qtgamepad"] depends = qtbase recommends = qtdeclarative path = qtgamepad url = ../qtgamepad.git - branch = 5.13 + branch = 5.14 status = addon [submodule "qtscxml"] depends = qtbase qtdeclarative path = qtscxml url = ../qtscxml.git - branch = 5.13 + branch = 5.14 status = addon [submodule "qtspeech"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtspeech url = ../qtspeech.git - branch = 5.13 + branch = 5.14 status = addon [submodule "qtnetworkauth"] depends = qtbase path = qtnetworkauth url = ../qtnetworkauth.git - branch = 5.13 + branch = 5.14 status = addon [submodule "qtremoteobjects"] depends = qtbase recommends = qtdeclarative path = qtremoteobjects url = ../qtremoteobjects.git - branch = 5.13 + branch = 5.14 status = addon [submodule "qtwebglplugin"] depends = qtbase qtwebsockets recommends = qtdeclarative path = qtwebglplugin url = ../qtwebglplugin.git - branch = 5.13 + branch = 5.14 status = addon [submodule "qtlottie"] depends = qtbase qtdeclarative path = qtlottie url = ../qtlottie.git - branch = 5.13 + branch = 5.14 + status = preview +[submodule "qtquicktimeline"] + depends = qtbase qtdeclarative + path = qtquicktimeline + url = ../qtquicktimeline + branch = 5.14 + status = preview +[submodule "qtquick3d"] + depends = qtbase qtdeclarative + path = qtquick3d + url = ../qtquick3d.git + branch = 5.14 status = preview diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index 4ac899de..b98c451e 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -53,16 +53,6 @@ Configurations: 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' - Features: ['DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -no-opengl -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib' - Template: 'qtci-linux-openSUSE-15.0-x86_64' @@ -80,11 +70,6 @@ Configurations: 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-SLES-15-x86_64' Compiler: 'GCC' Features: ['DisableTests'] @@ -136,7 +121,7 @@ Configurations: 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 /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' @@ -144,7 +129,7 @@ Configurations: 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 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-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' diff --git a/coin/platform_configs/meta-boot2qt.yaml b/coin/platform_configs/meta-boot2qt.yaml new file mode 100644 index 00000000..95cc79c4 --- /dev/null +++ b/coin/platform_configs/meta-boot2qt.yaml @@ -0,0 +1,40 @@ +- + 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/qt5.yaml b/coin/platform_configs/qt5.yaml index 69f1c7e3..f502de7c 100644 --- a/coin/platform_configs/qt5.yaml +++ b/coin/platform_configs/qt5.yaml @@ -15,12 +15,12 @@ Template: 'qtci-windows-7-x86-3' Compiler: 'Mingw73' Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-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++' + 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 -debug-and-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++' + 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' @@ -41,7 +41,15 @@ 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' + 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-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-r20 -android-ndk-host linux-x86_64 -android-arch x86_64' - Template: 'qtci-windows-10-x86_64-14' Target os: 'Android_ANY' @@ -49,7 +57,7 @@ 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 armeabi-v7a' + 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' @@ -57,7 +65,7 @@ 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-r20 -android-arch arm64-v8a' - Template: 'qtci-windows-10-x86_64-14' Target os: 'Android_ANY' @@ -65,7 +73,15 @@ 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-r20 -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-r20 -android-arch x86_64' - Template: 'qtci-macos-10.13-x86_64-2' Target os: 'Android_ANY' @@ -73,7 +89,7 @@ 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 armeabi-v7a' + 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' @@ -81,7 +97,7 @@ 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 arm64-v8a' + 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' @@ -89,7 +105,15 @@ 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' + 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: '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-r20 -android-ndk-host darwin-x86_64 -android-arch x86_64' - Template: 'qtci-macos-10.13-x86_64-2' Target os: 'QNX_700' diff --git a/coin/platform_configs/qtwebkit.yaml b/coin/platform_configs/qtwebkit.yaml index 49426405..0a1d5d31 100644 --- a/coin/platform_configs/qtwebkit.yaml +++ b/coin/platform_configs/qtwebkit.yaml @@ -2,4 +2,4 @@ Template: 'qtci-windows-7-x86-3' Compiler: 'Mingw73' Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-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++' + 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/provisioning/common/linux/android_linux.sh b/coin/provisioning/common/linux/android_linux.sh index 5840d4b4..1e151efe 100755 --- a/coin/provisioning/common/linux/android_linux.sh +++ b/coin/provisioning/common/linux/android_linux.sh @@ -51,13 +51,13 @@ basePath="http://ci-files01-hki.intra.qt.io/input/android" toolsVersion="r26.1.1" toolsFile="sdk-tools-linux-4333796.zip" -ndkVersion="r19c" +ndkVersion="r20" ndkFile="android-ndk-$ndkVersion-linux-x86_64.zip" sdkBuildToolsVersion="28.0.3" sdkApiLevel="android-28" toolsSha1="8c7c28554a32318461802c1291d76fccfafde054" -ndkSha1="fd94d0be6017c6acbd193eb95e09cf4b6f61b834" +ndkSha1="8665fc84a1b1f0d6ab3b5fdd1e30200cc7b9adff" toolsTargetFile="/tmp/$toolsFile" toolsSourceFile="$basePath/$toolsFile" diff --git a/coin/provisioning/common/linux/docker.sh b/coin/provisioning/common/linux/docker.sh index 1d9e8419..9be84e38 100755 --- a/coin/provisioning/common/linux/docker.sh +++ b/coin/provisioning/common/linux/docker.sh @@ -2,7 +2,7 @@ ############################################################################# ## -## Copyright (C) 2018 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. @@ -42,14 +42,15 @@ sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubun sudo apt-get update sudo apt-get install docker-ce -y sudo usermod -a -G docker $USER -sudo docker info +sudo docker --version # Download and install the docker-compose extension. sudo curl -L https://github.com/docker/compose/releases/download/1.21.0/docker-compose-$(uname -s)-$(uname -m) -o /usr/local/bin/docker-compose sudo chmod +x /usr/local/bin/docker-compose +sudo docker-compose --version # Install Avahi to discover Docker containers in the test network sudo apt-get install avahi-daemon -y # Start testserver provisioning -source "${BASH_SOURCE%/*}/docker_testserver.sh" +sudo "$(readlink -f $(dirname ${BASH_SOURCE[0]}))/../shared/testserver/docker_testserver.sh" diff --git a/coin/provisioning/common/shared/testserver/.gitattributes b/coin/provisioning/common/shared/testserver/.gitattributes new file mode 100644 index 00000000..fcadb2cf --- /dev/null +++ b/coin/provisioning/common/shared/testserver/.gitattributes @@ -0,0 +1 @@ +* text eol=lf diff --git a/coin/provisioning/common/shared/testserver/apache2_18.04/Dockerfile b/coin/provisioning/common/shared/testserver/apache2_18.04/Dockerfile new file mode 100644 index 00000000..dff9fe43 --- /dev/null +++ b/coin/provisioning/common/shared/testserver/apache2_18.04/Dockerfile @@ -0,0 +1,4 @@ +FROM ubuntu:18.04 +ARG packages="apache2 libcgi-session-perl avahi-daemon" +RUN apt-get update && apt-get install -y $packages && dpkg -l $packages +EXPOSE 80 443 diff --git a/coin/provisioning/common/shared/testserver/californium/Dockerfile b/coin/provisioning/common/shared/testserver/californium/Dockerfile new file mode 100644 index 00000000..90722510 --- /dev/null +++ b/coin/provisioning/common/shared/testserver/californium/Dockerfile @@ -0,0 +1,15 @@ +FROM ubuntu:18.04 + +RUN apt-get update && apt-get -y install git maven default-jdk avahi-daemon + +RUN mkdir -p /root/src/ + +# Get californium-based CoAP test server +WORKDIR /root/src +RUN git clone https://github.com/selart/californium.git +WORKDIR /root/src/californium +RUN mvn clean install -q -DskipTests + +WORKDIR / + +EXPOSE 5683/udp 5684/udp diff --git a/coin/provisioning/common/shared/testserver/cyrus/Dockerfile b/coin/provisioning/common/shared/testserver/cyrus/Dockerfile new file mode 100644 index 00000000..55486175 --- /dev/null +++ b/coin/provisioning/common/shared/testserver/cyrus/Dockerfile @@ -0,0 +1,4 @@ +FROM ubuntu:16.04 +ARG packages="cyrus-imapd avahi-daemon" +RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y $packages && dpkg -l $packages +EXPOSE 143 993 diff --git a/coin/provisioning/common/shared/testserver/cyrus_18.04/Dockerfile b/coin/provisioning/common/shared/testserver/cyrus_18.04/Dockerfile new file mode 100644 index 00000000..2e525ec6 --- /dev/null +++ b/coin/provisioning/common/shared/testserver/cyrus_18.04/Dockerfile @@ -0,0 +1,4 @@ +FROM ubuntu:18.04 +ARG packages="cyrus-imapd avahi-daemon" +RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y $packages && dpkg -l $packages +EXPOSE 143 993 diff --git a/coin/provisioning/common/shared/testserver/danted_18.04/Dockerfile b/coin/provisioning/common/shared/testserver/danted_18.04/Dockerfile new file mode 100644 index 00000000..f48794af --- /dev/null +++ b/coin/provisioning/common/shared/testserver/danted_18.04/Dockerfile @@ -0,0 +1,4 @@ +FROM ubuntu:18.04 +ARG packages="dante-server avahi-daemon" +RUN apt-get update && apt-get install -y $packages && dpkg -l $packages +EXPOSE 1080-1081 diff --git a/coin/provisioning/common/linux/docker_testserver.sh b/coin/provisioning/common/shared/testserver/docker_images.sh index 2d5d9611..e98183d8 100755 --- a/coin/provisioning/common/linux/docker_testserver.sh +++ b/coin/provisioning/common/shared/testserver/docker_images.sh @@ -2,7 +2,7 @@ ############################################################################# ## -## Copyright (C) 2018 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. @@ -35,14 +35,21 @@ set -ex -case ${BASH_SOURCE[0]} in - */linux/*) SERVER_PATH="${BASH_SOURCE[0]%/linux/*}/shared/testserver" ;; - */*) SERVER_PATH="${BASH_SOURCE[0]%/*}/../shared/testserver" ;; - *) SERVER_PATH="../shared/testserver" ;; +[ -x "$(command -v realpath)" ] && FILE=$(realpath ${BASH_SOURCE[0]}) || FILE=${BASH_SOURCE[0]} +case $FILE in + */*) SERVER_PATH="${FILE%/*}" ;; + *) SERVER_PATH="." ;; esac -# testserver shared scripts -source "$SERVER_PATH/testserver_util.sh" +# Sort files by their SHA-1, and then return the accumulated result +sha1tree () { + # For example, macOS doesn't install sha1sum by default. In such case, it uses shasum instead. + [ -x "$(command -v sha1sum)" ] || SHASUM=shasum + + find "$@" -type f -print0 | \ + xargs -0 ${SHASUM-sha1sum} | cut -d ' ' -f 1 | \ + sort | ${SHASUM-sha1sum} | cut -d ' ' -f 1 +} # Using SHA-1 of each server context as the tag of docker images. A tag labels a # specific image version. It is used by docker compose file (docker-compose.yml) @@ -55,8 +62,7 @@ source "$SERVER_PATH/settings.sh" for server in $testserver do context="$SERVER_PATH/$server" - # Sort files by their SHA-1 and use the accumulated result as the TAG - sudo docker build -t qt-test-server-$server:$(sha1tree $context) $context + docker build -t qt-test-server-$server:$(sha1tree $context) $context done -sudo docker images +docker images diff --git a/coin/provisioning/common/shared/testserver/docker_machine.sh b/coin/provisioning/common/shared/testserver/docker_machine.sh index 601056a4..8d791074 100755 --- a/coin/provisioning/common/shared/testserver/docker_machine.sh +++ b/coin/provisioning/common/shared/testserver/docker_machine.sh @@ -2,7 +2,7 @@ ############################################################################# ## -## Copyright (C) 2018 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. @@ -40,8 +40,11 @@ TestMachine='qt-test-server' # Deploy docker virtual machine (Boot2Docker) into VirtualBox only if it doesn't exist if [ -z $(docker-machine ls -q --filter "name=$TestMachine") ] then - docker-machine create -d virtualbox $TestMachine + docker-machine create $@ $TestMachine docker-machine ip $TestMachine +else + # Otherwise, start the docker machine and update with new TLS certificates. + docker-machine start $TestMachine && docker-machine regenerate-certs -f $TestMachine fi # Switch the docker engine to $TestMachine diff --git a/coin/provisioning/common/shared/testserver/testserver_util.sh b/coin/provisioning/common/shared/testserver/docker_testserver.sh index c42fb5e0..3a7c87e8 100644..100755 --- a/coin/provisioning/common/shared/testserver/testserver_util.sh +++ b/coin/provisioning/common/shared/testserver/docker_testserver.sh @@ -1,6 +1,8 @@ +#!/usr/bin/env bash + ############################################################################# ## -## Copyright (C) 2018 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,9 +35,23 @@ set -ex -# Sort files by their SHA-1, and then return the accumulated result -sha1tree () { - find "$@" -type f -print0 | \ - xargs -0 shasum | cut -d ' ' -f 1 | \ - sort | shasum | cut -d ' ' -f 1 -} +[ -x "$(command -v realpath)" ] && FILE=$(realpath ${BASH_SOURCE[0]}) || FILE=${BASH_SOURCE[0]} +case $FILE in + */*) SERVER_PATH="${FILE%/*}" ;; + *) SERVER_PATH="." ;; +esac + +# Create docker virtual machine (Boot2docker) +case $1 in + VMX) source "$SERVER_PATH/docker_machine.sh" "-d virtualbox" ;; + Hyper-V) + # The Hyper-v has been enabled in Windows 10. Disable checking the hardware virtualization. + source "$SERVER_PATH/docker_machine.sh" "-d virtualbox --virtualbox-no-vtx-check" ;; + *) ;; +esac + +# Display system-wide information of docker-engine +docker info + +# Create images +$SERVER_PATH/docker_images.sh diff --git a/coin/provisioning/common/shared/testserver/echo/Dockerfile b/coin/provisioning/common/shared/testserver/echo/Dockerfile new file mode 100644 index 00000000..653ca714 --- /dev/null +++ b/coin/provisioning/common/shared/testserver/echo/Dockerfile @@ -0,0 +1,4 @@ +FROM ubuntu:16.04 +ARG packages="xinetd avahi-daemon" +RUN apt-get update && apt-get install -y $packages && dpkg -l $packages +EXPOSE 7 7/UDP 13 diff --git a/coin/provisioning/common/shared/testserver/echo_18.04/Dockerfile b/coin/provisioning/common/shared/testserver/echo_18.04/Dockerfile new file mode 100644 index 00000000..37f488cb --- /dev/null +++ b/coin/provisioning/common/shared/testserver/echo_18.04/Dockerfile @@ -0,0 +1,4 @@ +FROM ubuntu:18.04 +ARG packages="xinetd avahi-daemon" +RUN apt-get update && apt-get install -y $packages && dpkg -l $packages +EXPOSE 7 7/UDP 13 diff --git a/coin/provisioning/common/shared/testserver/freecoap/Dockerfile b/coin/provisioning/common/shared/testserver/freecoap/Dockerfile new file mode 100644 index 00000000..2c665bd5 --- /dev/null +++ b/coin/provisioning/common/shared/testserver/freecoap/Dockerfile @@ -0,0 +1,20 @@ +FROM ubuntu:18.04 + +RUN apt-get update && apt-get -y install git avahi-daemon autoconf automake libtool make libgnutls28-dev + +RUN mkdir -p /root/src/ + +# Get FreeCoAP test server +WORKDIR /root/src +RUN git clone https://github.com/keith-cullen/FreeCoAP.git +WORKDIR /root/src/FreeCoAP +RUN autoreconf --install +RUN ./configure +RUN make +RUN make install +WORKDIR /root/src/FreeCoAP/sample/time_server +RUN make + +WORKDIR / + +EXPOSE 5685/udp diff --git a/coin/provisioning/common/shared/testserver/ftp-proxy_18.04/Dockerfile b/coin/provisioning/common/shared/testserver/ftp-proxy_18.04/Dockerfile new file mode 100644 index 00000000..0e7146ba --- /dev/null +++ b/coin/provisioning/common/shared/testserver/ftp-proxy_18.04/Dockerfile @@ -0,0 +1,4 @@ +FROM ubuntu:18.04 +ARG packages="ftp-proxy avahi-daemon" +RUN apt-get update && apt-get install -y $packages && dpkg -l $packages +EXPOSE 2121 diff --git a/coin/provisioning/common/shared/testserver/iptables/Dockerfile b/coin/provisioning/common/shared/testserver/iptables/Dockerfile new file mode 100644 index 00000000..cbee61d4 --- /dev/null +++ b/coin/provisioning/common/shared/testserver/iptables/Dockerfile @@ -0,0 +1,4 @@ +FROM ubuntu:16.04 +ARG packages="iptables avahi-daemon" +RUN apt-get update && apt-get install -y $packages && dpkg -l $packages +EXPOSE 1357 diff --git a/coin/provisioning/common/shared/testserver/iptables_18.04/Dockerfile b/coin/provisioning/common/shared/testserver/iptables_18.04/Dockerfile new file mode 100644 index 00000000..5865e9c8 --- /dev/null +++ b/coin/provisioning/common/shared/testserver/iptables_18.04/Dockerfile @@ -0,0 +1,4 @@ +FROM ubuntu:18.04 +ARG packages="iptables avahi-daemon" +RUN apt-get update && apt-get install -y $packages && dpkg -l $packages +EXPOSE 1357 diff --git a/coin/provisioning/common/shared/testserver/settings.sh b/coin/provisioning/common/shared/testserver/settings.sh index 041661f2..27832773 100644 --- a/coin/provisioning/common/shared/testserver/settings.sh +++ b/coin/provisioning/common/shared/testserver/settings.sh @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2018 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. @@ -34,4 +34,5 @@ set -ex # A list of test servers to be provisioned -testserver='apache2 squid vsftpd ftp-proxy danted' +testserver='apache2 squid vsftpd ftp-proxy danted echo cyrus iptables californium freecoap' +testserver="$testserver apache2_18.04 squid_18.04 vsftpd_18.04 ftp-proxy_18.04 danted_18.04 echo_18.04 cyrus_18.04 iptables_18.04" diff --git a/coin/provisioning/common/shared/testserver/squid_18.04/Dockerfile b/coin/provisioning/common/shared/testserver/squid_18.04/Dockerfile new file mode 100644 index 00000000..208feec7 --- /dev/null +++ b/coin/provisioning/common/shared/testserver/squid_18.04/Dockerfile @@ -0,0 +1,4 @@ +FROM ubuntu:18.04 +ARG packages="squid avahi-daemon" +RUN apt-get update && apt-get install -y $packages && dpkg -l $packages +EXPOSE 3128-3130 diff --git a/coin/provisioning/common/shared/testserver/vsftpd_18.04/Dockerfile b/coin/provisioning/common/shared/testserver/vsftpd_18.04/Dockerfile new file mode 100644 index 00000000..843472fd --- /dev/null +++ b/coin/provisioning/common/shared/testserver/vsftpd_18.04/Dockerfile @@ -0,0 +1,4 @@ +FROM ubuntu:18.04 +ARG packages="vsftpd avahi-daemon" +RUN apt-get update && apt-get install -y $packages && dpkg -l $packages +EXPOSE 20-21 diff --git a/coin/provisioning/common/windows/android-openssl.ps1 b/coin/provisioning/common/windows/android-openssl.ps1 index 981fa51d..fb5c5aab 100644 --- a/coin/provisioning/common/windows/android-openssl.ps1 +++ b/coin/provisioning/common/windows/android-openssl.ps1 @@ -51,7 +51,7 @@ $sha1 = "e9710abf5e95c48ebf47991b10cbb48c09dae102" $destination = "C:\Utils\openssl-android-master" # msys unix style paths -$ndkPath = "/c/Utils/Android/android-ndk-r19c" +$ndkPath = "/c/Utils/Android/android-ndk-r20" $openssl_path = "/c/Utils/openssl-android-master" $cc_path = "$ndkPath/toolchains/llvm/prebuilt/windows-x86_64/bin" Download https://www.openssl.org/source/openssl-$version.tar.gz \\ci-files01-hki.intra.qt.io\provisioning\openssl\openssl-$version.tar.gz $zip diff --git a/coin/provisioning/common/windows/android.ps1 b/coin/provisioning/common/windows/android.ps1 index def09116..537e14a2 100644 --- a/coin/provisioning/common/windows/android.ps1 +++ b/coin/provisioning/common/windows/android.ps1 @@ -40,10 +40,10 @@ # That's why we need to use Andoid-21 API version in Qt 5.9. # NDK -$ndkVersion = "r19c" +$ndkVersion = "r20" $ndkCachedUrl = "\\ci-files01-hki.intra.qt.io\provisioning\android\android-ndk-$ndkVersion-windows-x86_64.zip" $ndkOfficialUrl = "https://dl.google.com/android/repository/android-ndk-$ndkVersion-windows-x86_64.zip" -$ndkChecksum = "c4cd8c0b6e7618ca0a871a5f24102e40c239f6a3" +$ndkChecksum = "36e1dc77fad08ad2498fb94b13ad8caf26bbd9df" $ndkFolder = "c:\Utils\Android\android-ndk-$ndkVersion" $ndkZip = "c:\Windows\Temp\android_ndk_$ndkVersion.zip" diff --git a/coin/provisioning/common/windows/disable-windows-updates.ps1 b/coin/provisioning/common/windows/disable-windows-updates.ps1 index 87414f03..15644cfe 100644 --- a/coin/provisioning/common/windows/disable-windows-updates.ps1 +++ b/coin/provisioning/common/windows/disable-windows-updates.ps1 @@ -33,6 +33,8 @@ # This script disables the automatic Windows updates +. "$PSScriptRoot\helpers.ps1" + $service = get-service wuauserv if (-not $service) { Write-Host "Windows Update service not found." @@ -43,7 +45,7 @@ if ($service.Status -eq "Stopped") { Write-Host "Windows Update service already stopped." } else { Write-Host "Stopping Windows Update service." - Stop-Service -Name "wuauserv" -Force + Retry {Stop-Service -Name "wuauserv" -Force} 20 5 } $startup = Get-WmiObject Win32_Service | Where-Object {$_.Name -eq "wuauserv"} | Select -ExpandProperty "StartMode" diff --git a/coin/provisioning/common/windows/helpers.ps1 b/coin/provisioning/common/windows/helpers.ps1 index ba35f6b5..100f14ae 100644 --- a/coin/provisioning/common/windows/helpers.ps1 +++ b/coin/provisioning/common/windows/helpers.ps1 @@ -204,6 +204,38 @@ function Get-Proxy { return (Get-ItemProperty -Path 'HKCU:\Software\Microsoft\Windows\CurrentVersion\Internet Settings').proxyServer } +function Retry{ + <# + usage: + Retry{CODE} + Retry{CODE} <num of retries> <delay_s> + #delay is in seconds + #> + Param( + [Parameter(mandatory=$true)] + [scriptblock]$command, + [int][ValidateRange(1, 20)]$retry = 5, + [int][ValidateRange(1, 60)]$delay_s = 5 + ) + $success=$false + $retry_count=0 + do{ + try { + Invoke-Command -ScriptBlock $command + $success=$true + } + catch { + $retry_count++ + Write-Host "Error: $_, try: $retry_count, retrying in $delay_s seconds" + Start-Sleep -Seconds $delay_s + } + } until ($success -or $retry+1 -le $retry_count) + + if (-not $success) { + Throw("Failed to run command successfully in $retry_count tries") + } +} + function Remove { Param ( diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh b/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh index 544364b0..1886cce3 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh @@ -51,7 +51,7 @@ toolsVersion="r26.1.1" # toolsFile dertermines tools version toolsFile="sdk-tools-darwin-4333796.zip" -ndkVersion="r19c" +ndkVersion="r20" ndkFile="android-ndk-$ndkVersion-darwin-x86_64.zip" sdkBuildToolsVersion="28.0.3" # this is compile sdk version diff --git a/qt3d b/qt3d -Subproject a5b02c4f78b0bc7d0c48143e83d8d222f153be5 +Subproject a79c34fe6ef7e47582de9188e284644e9665f31 diff --git a/qtactiveqt b/qtactiveqt -Subproject 5075808ee2e1a644bb85764367b60a31e5dcae9 +Subproject e9f78adad0205ff539a35587be86c8e7a0bfd5b diff --git a/qtandroidextras b/qtandroidextras -Subproject 6586350b36a40be682cc351d7963c82c003be82 +Subproject d9378c4324ddf6febbcd0e4ae052b384f75acca diff --git a/qtbase b/qtbase -Subproject bc34784d053ebf9b0d167e9398052fcc80d8af8 +Subproject 78437ef0d2d662663bbc827befc849cad5886b6 diff --git a/qtcharts b/qtcharts -Subproject 73efdb1066dcf5b4690de44f712f3de4d5f1fc1 +Subproject ff84fb0fdaf7ed1a0b646705dcf8b0254f862cd diff --git a/qtconnectivity b/qtconnectivity -Subproject c1803d266854c6f71994705133e5b2b93a060d1 +Subproject 2c6dcc643f29c212fca0ead123a377e96b9a17c diff --git a/qtdatavis3d b/qtdatavis3d -Subproject 1a58c3cffe2190f20aca3d7acbb25a9ff62d677 +Subproject 548b93d6e5e70afeb220502170a51cc2e251013 diff --git a/qtdeclarative b/qtdeclarative -Subproject f19ec4561b4975d68290593b599d3c38d0f9f6d +Subproject 1bb96cfcce47152c578bcc9a7c2ad80b0f0e655 diff --git a/qtdoc b/qtdoc -Subproject 2d9332410e4353e463c3e492bf4364396e45168 +Subproject b490a2028f4c03783e76646bf9ff47e3601bf14 diff --git a/qtgamepad b/qtgamepad -Subproject 572ef46c5fd98e1052211051362e7c48930deac +Subproject ea0457b8058191b4bb22477c7b51975a70af0b0 diff --git a/qtgraphicaleffects b/qtgraphicaleffects -Subproject 3cac429c9bf0bc43f281aa12cb121bece608cb3 +Subproject cb8c28031c60c708721ef8a875076f12a630e6b diff --git a/qtimageformats b/qtimageformats -Subproject cd646ff7e1990ddcd5438767fa7093131734c17 +Subproject 44000c87d352e4f88b7eea3d441a807b755698d diff --git a/qtlocation b/qtlocation -Subproject 55e127bb430aaea9ebf4c770c9efb228e019af2 +Subproject 08972f5e65c8d7286fe1435cb85be4574ac3772 diff --git a/qtlottie b/qtlottie -Subproject b6b7fa3596d1957237d327a37941c6eb3ff8d6b +Subproject 03b666a967fb7501248e9f40a5b187ec3a16c45 diff --git a/qtmacextras b/qtmacextras -Subproject 7f207d3e31fb768083462ef13a8163ab0a86621 +Subproject af348830a3ae6852a4e7ff612c045e11c094ef5 diff --git a/qtmultimedia b/qtmultimedia -Subproject 81e87e34c444404c79a7365e490607c35dc0c66 +Subproject c9058d90d0b08781f14a494780c3094594c81f2 diff --git a/qtnetworkauth b/qtnetworkauth -Subproject a2e48c7e2a039b7eeeca9d35757e071e8c74605 +Subproject 272ea7f508d8ee30311c08c07c6e0501f17338c diff --git a/qtpurchasing b/qtpurchasing -Subproject 2fa7323376c99f6ef51fd22a68704e993a7f486 +Subproject bc6d56861b93bd87958baa3384c3cbd895f1c3f diff --git a/qtquick3d b/qtquick3d new file mode 160000 +Subproject f34be375adbaadd2232d97a3743680e32e7b549 diff --git a/qtquickcontrols b/qtquickcontrols -Subproject ac9f2e582dc6c0f740b8c5b225bc65a8c1b35e9 +Subproject 6ab10d971d7d98eeaa50203c24d53da35cfe218 diff --git a/qtquickcontrols2 b/qtquickcontrols2 -Subproject c18c7bd7f9596e5ad3d13876a91203e1ceba254 +Subproject e0b2a30357a6fbb2d52fcba69f0a5059d3b065b diff --git a/qtquicktimeline b/qtquicktimeline new file mode 160000 +Subproject 18bd2a9fbb38d3357aa0bfece163c80e88d8325 diff --git a/qtremoteobjects b/qtremoteobjects -Subproject b94871ce10d5d319b7a3293cf939b6a072c3be2 +Subproject acb75637a429d1a540b0b86b35554f75bd13b44 diff --git a/qtscript b/qtscript -Subproject 5b75f4edd91a99945f04f34f78875d99e9d919b +Subproject 1de1f080ef4b37576843bd59a8aa3e484c91882 diff --git a/qtscxml b/qtscxml -Subproject a57befb1da4b7386caf634293ab4563ad90c310 +Subproject 07c62001b55b515629062ccc51e8c12aaa7d4ee diff --git a/qtsensors b/qtsensors -Subproject 7191c267395a079eb6621198c219fc19ab79d3d +Subproject c4519ffcfc009d4ffbfa77bfa1b7c9749b9fe7d diff --git a/qtserialbus b/qtserialbus -Subproject e6b042a795902226c7d7f1ec576c8e063ef7674 +Subproject 47eaa2b1a58db67643f32cb1d8779c5b199ccb1 diff --git a/qtserialport b/qtserialport -Subproject f6b43c36b3839dae54308a6437bbdd99ae9a44d +Subproject 78bfc0a93077dafb217f854782e14b65a574694 diff --git a/qtspeech b/qtspeech -Subproject 9e2f02d8c8a05e9fe54cd56934fb00c4c5bd1da +Subproject c1860e04dfcf9eddcf14cbc4e44f441ad75ffc8 diff --git a/qtsvg b/qtsvg -Subproject de830ffd455d8a2eb95eba81f86e9a75ed87676 +Subproject d8ccc52c038a033b20c96041b998322a907521c diff --git a/qttools b/qttools -Subproject b0e9c1c5367ab6da76850139bddab2578fc179c +Subproject 01d70a3150191445b043873db2a19474983a411 diff --git a/qttranslations b/qttranslations -Subproject ccb71797f2bc8f9ebd55954adc71370beed4165 +Subproject c3f688fbdfaf633d7e6dd198865d4dc6cdef04b diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard -Subproject 57b9af923b30ff301d60d86cf77fbbf1ab53bbb +Subproject 997a4c23d5c062644eda3b0db74252654289bdc diff --git a/qtwayland b/qtwayland -Subproject 813365f472cf3b955d0985f83d0169016806cc3 +Subproject a85e1542de6fcd84de22955c8aa764e8c831733 diff --git a/qtwebchannel b/qtwebchannel -Subproject e724c01be4a5abf093d936ec263a51d4dfa3ab1 +Subproject 744a7330f786259bd48e442da391d11ab12d62c diff --git a/qtwebengine b/qtwebengine -Subproject 2f72083601fb6a4fcc66b6440222291fc334cb3 +Subproject 8daefcfd8e1bf41ae4d06c7a79a526b81a78dc5 diff --git a/qtwebglplugin b/qtwebglplugin -Subproject 7e9f4028c5ac856d9a307927528fd4065f8b4ff +Subproject e51341cf20447c42a62281e633513837058f62e diff --git a/qtwebsockets b/qtwebsockets -Subproject 81587889b1563557dd6fdc61dcde2a08445a924 +Subproject 87a5151adfc9947f2ab2e560fea7da0088eb59c diff --git a/qtwebview b/qtwebview -Subproject b206dd8a3ccff693eed9bdc271351ed613f23fd +Subproject fb2a2003fbb41ac91b319afb56f290b415befb6 diff --git a/qtwinextras b/qtwinextras -Subproject fb6d18a116dea6f8f1db61053454ce77c17f0e9 +Subproject ee2d2f7a93c5b0866e91293d6233ae2703281ca diff --git a/qtx11extras b/qtx11extras -Subproject a5c017a00bcaf4d68a1cb6cc8a937d7af63be09 +Subproject a0443bd723601205c8cc4666dd89be5a32decf9 diff --git a/qtxmlpatterns b/qtxmlpatterns -Subproject 61f18cc3619bbdeed47b0e161ff44089a6f82f0 +Subproject 85bec28aafc05c9b1fe3428832ee18af8274712 |