diff options
95 files changed, 478 insertions, 486 deletions
diff --git a/.gitmodules b/.gitmodules index 5782a1e9..45223365 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,60 +1,60 @@ [submodule "qtbase"] path = qtbase url = ../qtbase.git - branch = 5.14 + branch = 5.15 status = essential [submodule "qtsvg"] depends = qtbase path = qtsvg url = ../qtsvg.git - branch = 5.14 + branch = 5.15 status = addon [submodule "qtdeclarative"] depends = qtbase recommends = qtsvg path = qtdeclarative url = ../qtdeclarative.git - branch = 5.14 + branch = 5.15 status = essential [submodule "qtactiveqt"] depends = qtbase path = qtactiveqt url = ../qtactiveqt.git - branch = 5.14 + branch = 5.15 status = addon [submodule "qtscript"] depends = qtbase recommends = qttools path = qtscript url = ../qtscript.git - branch = 5.14 + branch = 5.15 status = deprecated [submodule "qtmultimedia"] depends = qtbase recommends = qtdeclarative path = qtmultimedia url = ../qtmultimedia.git - branch = 5.14 + branch = 5.15 status = essential [submodule "qttools"] depends = qtbase recommends = qtdeclarative qtactiveqt path = qttools url = ../qttools.git - branch = 5.14 + branch = 5.15 status = essential [submodule "qtxmlpatterns"] depends = qtbase recommends = qtdeclarative path = qtxmlpatterns url = ../qtxmlpatterns.git - branch = 5.14 + branch = 5.15 status = deprecated [submodule "qttranslations"] depends = qttools path = qttranslations url = ../qttranslations.git - branch = 5.14 + branch = 5.15 status = essential priority = 30 [submodule "qtdoc"] @@ -62,7 +62,7 @@ recommends = qtmultimedia qtquickcontrols qtquickcontrols2 path = qtdoc url = ../qtdoc.git - branch = 5.14 + branch = 5.15 status = essential priority = 40 [submodule "qtrepotools"] @@ -83,14 +83,14 @@ recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport path = qtlocation url = ../qtlocation.git - branch = 5.14 + branch = 5.15 status = addon [submodule "qtsensors"] depends = qtbase recommends = qtdeclarative path = qtsensors url = ../qtsensors.git - branch = 5.14 + branch = 5.15 status = addon [submodule "qtsystems"] depends = qtbase @@ -123,99 +123,99 @@ recommends = qtdeclarative qtandroidextras path = qtconnectivity url = ../qtconnectivity.git - branch = 5.14 + branch = 5.15 status = addon [submodule "qtwayland"] depends = qtbase recommends = qtdeclarative path = qtwayland url = ../qtwayland.git - branch = 5.14 + branch = 5.15 status = addon [submodule "qt3d"] depends = qtbase recommends = qtdeclarative qtimageformats qtgamepad path = qt3d url = ../qt3d.git - branch = 5.14 + branch = 5.15 status = addon [submodule "qtimageformats"] depends = qtbase path = qtimageformats url = ../qtimageformats.git - branch = 5.14 + branch = 5.15 status = addon [submodule "qtgraphicaleffects"] depends = qtdeclarative path = qtgraphicaleffects url = ../qtgraphicaleffects.git - branch = 5.14 + branch = 5.15 status = essential [submodule "qtquickcontrols"] depends = qtdeclarative recommends = qtgraphicaleffects path = qtquickcontrols url = ../qtquickcontrols.git - branch = 5.14 + branch = 5.15 status = addon [submodule "qtserialbus"] depends = qtbase recommends = qtserialport path = qtserialbus url = ../qtserialbus.git - branch = 5.14 + branch = 5.15 status = addon [submodule "qtserialport"] depends = qtbase path = qtserialport url = ../qtserialport.git - branch = 5.14 + branch = 5.15 status = addon [submodule "qtx11extras"] depends = qtbase path = qtx11extras url = ../qtx11extras.git - branch = 5.14 + branch = 5.15 status = addon [submodule "qtmacextras"] depends = qtbase path = qtmacextras url = ../qtmacextras.git - branch = 5.14 + branch = 5.15 status = addon [submodule "qtwinextras"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtwinextras url = ../qtwinextras.git - branch = 5.14 + branch = 5.15 status = addon [submodule "qtandroidextras"] depends = qtbase path = qtandroidextras url = ../qtandroidextras.git - branch = 5.14 + branch = 5.15 status = addon [submodule "qtwebsockets"] depends = qtbase recommends = qtdeclarative path = qtwebsockets url = ../qtwebsockets.git - branch = 5.14 + branch = 5.15 status = addon [submodule "qtwebchannel"] depends = qtbase recommends = qtdeclarative qtwebsockets path = qtwebchannel url = ../qtwebchannel.git - branch = 5.14 + branch = 5.15 status = addon [submodule "qtwebengine"] depends = qtdeclarative recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel qttools path = qtwebengine url = ../qtwebengine.git - branch = 5.14 + branch = 5.15 status = addon priority = 10 [submodule "qtcanvas3d"] @@ -229,98 +229,98 @@ recommends = qtwebengine path = qtwebview url = ../qtwebview.git - branch = 5.14 + branch = 5.15 status = addon [submodule "qtquickcontrols2"] depends = qtgraphicaleffects recommends = qtimageformats path = qtquickcontrols2 url = ../qtquickcontrols2.git - branch = 5.14 + branch = 5.15 status = essential [submodule "qtpurchasing"] depends = qtbase recommends = qtdeclarative qtandroidextras path = qtpurchasing url = ../qtpurchasing.git - branch = 5.14 + branch = 5.15 status = addon [submodule "qtcharts"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtcharts url = ../qtcharts.git - branch = 5.14 + branch = 5.15 status = addon [submodule "qtdatavis3d"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtdatavis3d url = ../qtdatavis3d.git - branch = 5.14 + branch = 5.15 status = addon [submodule "qtvirtualkeyboard"] depends = qtbase qtdeclarative qtsvg recommends = qtmultimedia qtquickcontrols path = qtvirtualkeyboard url = ../qtvirtualkeyboard.git - branch = 5.14 + branch = 5.15 status = addon [submodule "qtgamepad"] depends = qtbase recommends = qtdeclarative path = qtgamepad url = ../qtgamepad.git - branch = 5.14 + branch = 5.15 status = addon [submodule "qtscxml"] depends = qtbase qtdeclarative path = qtscxml url = ../qtscxml.git - branch = 5.14 + branch = 5.15 status = addon [submodule "qtspeech"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtspeech url = ../qtspeech.git - branch = 5.14 + branch = 5.15 status = addon [submodule "qtnetworkauth"] depends = qtbase path = qtnetworkauth url = ../qtnetworkauth.git - branch = 5.14 + branch = 5.15 status = addon [submodule "qtremoteobjects"] depends = qtbase recommends = qtdeclarative path = qtremoteobjects url = ../qtremoteobjects.git - branch = 5.14 + branch = 5.15 status = addon [submodule "qtwebglplugin"] depends = qtbase qtwebsockets recommends = qtdeclarative path = qtwebglplugin url = ../qtwebglplugin.git - branch = 5.14 + branch = 5.15 status = addon [submodule "qtlottie"] depends = qtbase qtdeclarative path = qtlottie url = ../qtlottie.git - branch = 5.14 - status = preview + branch = 5.15 + status = addon [submodule "qtquicktimeline"] depends = qtbase qtdeclarative path = qtquicktimeline url = ../qtquicktimeline - branch = 5.14 - status = preview + branch = 5.15 + status = addon [submodule "qtquick3d"] depends = qtbase qtdeclarative path = qtquick3d url = ../qtquick3d.git - branch = 5.14 - status = preview + branch = 5.15 + status = addon diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index 91a5fde8..553232bd 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -1,55 +1,44 @@ Version: 2 -Module only: True Configurations: - - Template: 'qtci-windows-10-x86_64-16' + Template: 'qtci-windows-10-x86_64-17' Compiler: 'MSVC2015' Features: ['DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -developer-build -release -angle -qtnamespace TestNamespace -qtlibinfix TestInfix -nomake tests -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -qt-zlib' - Template: 'qtci-windows-7-x86-3' - Compiler: 'Mingw73' + Compiler: 'Mingw' + Environment variables: ['PATH=C:\MINGW810_i686\mingw32\bin;$PATH'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -developer-build -release -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -platform win32-g++ -qt-zlib' - - Template: 'qtci-windows-10-x86_64-16' - Target arch: 'x86' - 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_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% -qt-zlib' -- - Template: 'qtci-windows-10-x86_64-16' + Template: 'qtci-windows-10-x86_64-17' Target arch: 'x86' Compiler: 'MSVC2019' - Features: ['DisableTests'] + Features: ['Packaging'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -qt-zlib' - - Template: 'qtci-windows-10-x86_64-16' + Template: 'qtci-windows-10-x86_64-17' Compiler: 'MSVC2015' Features: ['Packaging', 'DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_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% -qt-zlib' - - Template: 'qtci-windows-10-x86_64-16' + Template: 'qtci-windows-10-x86_64-17' Target os: 'WinRT_10' Target arch: 'x86' Compiler: 'MSVC2015' Features: ['DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -no-sql-mysql -platform win32-msvc2015 -xplatform winrt-x86-msvc2015' - - Template: 'qtci-windows-10-x86_64-16' + Template: 'qtci-windows-10-x86_64-17' Target os: 'WinRT_10' Target arch: 'armv7' Compiler: 'MSVC2015' Features: ['Packaging', 'DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -no-sql-mysql -platform win32-msvc2015 -xplatform winrt-arm-msvc2015' - - Template: 'qtci-windows-10-x86_64-16' - 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% -qt-zlib' -- - Template: 'qtci-windows-10-x86_64-16' + Template: 'qtci-windows-10-x86_64-17' Compiler: 'MSVC2019' - Features: ['DisableTests'] + 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% -qt-zlib' - Template: 'qtci-linux-Ubuntu-18.04-x86_64' @@ -58,12 +47,7 @@ Configurations: - 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' - 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' + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -force-debug-info -nomake tests -no-widgets -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib' - Template: 'qtci-linux-Ubuntu-18.04-x86_64' Compiler: 'GCC' @@ -71,16 +55,16 @@ Configurations: 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' + Template: 'qtci-linux-openSUSE-15.1-x86_64' Compiler: 'GCC' Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-pch -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib' - - Template: 'qtci-linux-openSUSE-15.0-x86_64' + Template: 'qtci-linux-openSUSE-15.1-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' + Template: 'qtci-linux-openSUSE-15.1-x86_64' Target os: 'WebAssembly' Compiler: 'GCC' Features: ['Packaging', 'DisableTests'] @@ -94,7 +78,7 @@ Configurations: 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 -qt-xcb -sysconfdir /etc/xdg -qt-pcre -qt-harfbuzz -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib QMAKE_LFLAGS_APP+=-s' + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -force-debug-info -separate-debug-info -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -xcb -bundled-xcb-xinput -sysconfdir /etc/xdg -qt-pcre -qt-harfbuzz -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib QMAKE_LFLAGS_APP+=-s' - Template: 'qtci-macos-10.13-x86_64-2' Compiler: 'Clang' @@ -117,20 +101,6 @@ Configurations: 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.14-x86_64' - 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.14-x86_64' - Target os: 'WatchOS_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-watchos-clang' -- Template: 'qtci-linux-RHEL-7.6-x86_64' Target os: 'Android_ANY' Target arch: 'multi' diff --git a/coin/platform_configs/flashing-wizard.yaml b/coin/platform_configs/flashing-wizard.yaml index d64d3edf..eff6e9f6 100644 --- a/coin/platform_configs/flashing-wizard.yaml +++ b/coin/platform_configs/flashing-wizard.yaml @@ -2,13 +2,13 @@ Version: 2 Module only: True Configurations: - - Template: 'qtci-windows-10-x86_64-16' - Compiler: 'MSVC2017' + Template: 'qtci-windows-10-x86_64-17' + Compiler: 'MSVC2019' Features: ['Packaging'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -static -no-icu' - - Template: 'qtci-windows-10-x86_64-16' - Compiler: 'MSVC2017' + Template: 'qtci-windows-10-x86_64-17' + Compiler: 'MSVC2019' Target arch: 'x86' Features: ['Packaging'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -static -no-icu' diff --git a/coin/platform_configs/qdb.yaml b/coin/platform_configs/qdb.yaml index 69f4b77f..544a1b90 100644 --- a/coin/platform_configs/qdb.yaml +++ b/coin/platform_configs/qdb.yaml @@ -2,13 +2,13 @@ Version: 2 Module only: True Configurations: - - Template: 'qtci-windows-10-x86_64-16' + Template: 'qtci-windows-10-x86_64-17' Compiler: 'MSVC2015' Target arch: 'x86' Features: ['Packaging'] Configure arguments: '-opensource -confirm-license -nomake tests -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -opengl dynamic -static -no-icu -nomake examples -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86%' - - Template: 'qtci-windows-10-x86_64-16' + Template: 'qtci-windows-10-x86_64-17' Compiler: 'MSVC2015' Features: ['Packaging'] Configure arguments: '-opensource -confirm-license -nomake tests -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -opengl dynamic -static -no-icu -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64%' @@ -18,6 +18,11 @@ Configurations: Features: ['Packaging'] Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -force-debug-info -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -qt-xcb -sysconfdir /etc/xdg -qt-pcre -qt-harfbuzz -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib QMAKE_LFLAGS_APP+=-s -static -no-icu' - + Template: 'qtci-macos-10.13-x86_64-2' + Compiler: 'Clang' + Features: ['Packaging'] + Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -release -nomake tests -nomake examples -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include -static -no-icu' + - Template: 'qtci-linux-Ubuntu-18.04-x86_64' Compiler: 'GCC' Features: ['TestOnly', 'LicenseCheck'] diff --git a/coin/platform_configs/qt5.yaml b/coin/platform_configs/qt5.yaml index 8bbef9d8..a0b69657 100644 --- a/coin/platform_configs/qt5.yaml +++ b/coin/platform_configs/qt5.yaml @@ -1,44 +1,49 @@ +Version: 2 +Configurations: - - Template: 'qtci-windows-10-x86_64-16' + Template: 'qtci-windows-10-x86_64-17' 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-16' + Template: 'qtci-windows-10-x86_64-17' Target os: 'WinRT_10' Target arch: 'x86' - Compiler: 'MSVC2017' + Compiler: 'MSVC2019' 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' + 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-msvc2019 -xplatform winrt-x86-msvc2019' - Template: 'qtci-windows-7-x86-3' - Compiler: 'Mingw73' + Compiler: 'Mingw' + Environment variables: ['PATH=C:\MINGW810_i686\mingw32\bin;$PATH'] Features: ['Packaging', 'DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -separate-debug-info -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -platform win32-g++ QMAKE_LFLAGS_APP+=-s -qt-zlib' - - Template: 'qtci-windows-10-x86_64-16' - Compiler: 'Mingw73' + Template: 'qtci-windows-10-x86_64-17' + Compiler: 'Mingw' + Environment variables: ['PATH=C:\MINGW810\mingw64\bin;$PATH'] Features: ['Packaging', 'DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -separate-debug-info -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -platform win32-g++ QMAKE_LFLAGS_APP+=-s -qt-zlib' - - Template: 'qtci-windows-10-x86_64-16' + Template: 'qtci-windows-10-x86_64-17' Target os: 'WinRT_10' Target arch: 'armv7' - Compiler: 'MSVC2017' + Compiler: 'MSVC2019' 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' + 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-msvc2019 -xplatform winrt-arm-msvc2019' - - Template: 'qtci-windows-10-x86_64-16' + Template: 'qtci-windows-10-x86_64-17' Target os: 'WinRT_10' - Compiler: 'MSVC2017' + Compiler: 'MSVC2019' 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' + 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-msvc2019 -xplatform winrt-x64-msvc2019' - - Template: 'qtci-windows-10-x86_64-16' + Template: 'qtci-windows-10-x86_64-17' Target os: 'Android_ANY' Target arch: 'multi' - Compiler: 'Mingw73' + Compiler: 'Mingw' + Environment variables: ['PATH=C:\MINGW810\mingw64\bin;$PATH'] 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' @@ -58,24 +63,27 @@ Features: ['DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -extprefix /Users/qt/work/install -release -nomake tests -nomake examples -no-use-gold-linker -opengl es2 -qpa qnx -xplatform qnx-x86-qcc' - - Template: 'qtci-windows-10-x86_64-16' + Template: 'qtci-windows-10-x86_64-17' Target os: 'QNX_700' Target arch: 'armv7' - Compiler: 'Mingw73' + Compiler: 'Mingw' + Environment variables: ['PATH=C:\Program Files\Git\bin;C:\MINGW810\mingw64\bin;$PATH;C:\qnx700\host\win64\x86_64\usr\bin;C:\qnx700\.qnx\bin', 'MAKEFLAGS=-j4 -Ic:\qnx700\target\qnx7\usr\include', 'QNX_CONFIGURATION=c:/qnx700/.qnx', 'QNX_CONFIGURATION_EXCLUSIVE=c:/qnx700/.qnx', 'QNX_TARGET=c:/qnx700/target/qnx7', 'QNX_HOST=c:/qnx700/host/win64/x86_64', 'LIB=""', 'INCLUDE=""'] Features: ['Packaging', 'DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -extprefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -opengl es2 -xplatform qnx-armle-v7-qcc' - - Template: 'qtci-windows-10-x86_64-16' + Template: 'qtci-windows-10-x86_64-17' Target os: 'QNX_700' Target arch: 'armv8' - Compiler: 'Mingw73' + Compiler: 'Mingw' + Environment variables: ['PATH=C:\Program Files\Git\bin;C:\MINGW810\mingw64\bin;$PATH;C:\qnx700\host\win64\x86_64\usr\bin;C:\qnx700\.qnx\bin', 'MAKEFLAGS=-j4 -Ic:\qnx700\target\qnx7\usr\include', 'QNX_CONFIGURATION=c:/qnx700/.qnx', 'QNX_CONFIGURATION_EXCLUSIVE=c:/qnx700/.qnx', 'QNX_TARGET=c:/qnx700/target/qnx7', 'QNX_HOST=c:/qnx700/host/win64/x86_64', 'LIB=""', 'INCLUDE=""'] Features: ['Packaging', 'DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -extprefix c:\Users\qt\work\install -release -opengl es2 -nomake tests -nomake examples -no-sql-mysql -xplatform qnx-aarch64le-qcc' - - Template: 'qtci-windows-10-x86_64-16' + Template: 'qtci-windows-10-x86_64-17' Target os: 'QNX_700' Target arch: 'x86_64' - Compiler: 'Mingw73' + Compiler: 'Mingw' + Environment variables: ['PATH=C:\Program Files\Git\bin;C:\MINGW810\mingw64\bin;$PATH;C:\qnx700\host\win64\x86_64\usr\bin;C:\qnx700\.qnx\bin', 'MAKEFLAGS=-j4 -Ic:\qnx700\target\qnx7\usr\include', 'QNX_CONFIGURATION=c:/qnx700/.qnx', 'QNX_CONFIGURATION_EXCLUSIVE=c:/qnx700/.qnx', 'QNX_TARGET=c:/qnx700/target/qnx7', 'QNX_HOST=c:/qnx700/host/win64/x86_64', 'LIB=""', 'INCLUDE=""'] Features: ['Packaging', 'DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -extprefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -opengl es2 -xplatform qnx-x86-64-qcc' - @@ -93,9 +101,10 @@ Features: ['Packaging', 'DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -extprefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-use-gold-linker -opengl es2 -qpa qnx -xplatform qnx-x86-64-qcc' - - Template: 'qtci-windows-10-x86_64-16' + Template: 'qtci-windows-10-x86_64-17' Target os: 'WebAssembly' - Compiler: 'Mingw73' + Compiler: 'Mingw' + Environment variables: ['PATH=C:\MINGW810\mingw64\bin;$PATH'] Features: ['Packaging', 'DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\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 -platform win32-g++ -xplatform wasm-emscripten' - diff --git a/coin/platform_configs/qtbase.yaml b/coin/platform_configs/qtbase.yaml index 680a9bbf..a520e6ca 100644 --- a/coin/platform_configs/qtbase.yaml +++ b/coin/platform_configs/qtbase.yaml @@ -13,13 +13,13 @@ 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-windows-10-x86_64-16' + Template: 'qtci-windows-10-x86_64-17' 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' - - Template: 'qtci-linux-openSUSE-15.0-x86_64' + Template: 'qtci-linux-openSUSE-15.1-x86_64' Target os: 'WebAssembly' Compiler: 'GCC' Features: ['DisableTests'] diff --git a/coin/platform_configs/qtconnectivity.yaml b/coin/platform_configs/qtconnectivity.yaml index 30ac284d..6c232f2a 100644 --- a/coin/platform_configs/qtconnectivity.yaml +++ b/coin/platform_configs/qtconnectivity.yaml @@ -1,5 +1,5 @@ - - Template: 'qtci-windows-10-x86_64-16' + Template: 'qtci-windows-10-x86_64-17' Target os: 'WinRT_10' Target arch: 'x86_64' Compiler: 'MSVC2015' diff --git a/coin/platform_configs/qtsaferenderer.yaml b/coin/platform_configs/qtsaferenderer.yaml index 5844a186..246925fb 100644 --- a/coin/platform_configs/qtsaferenderer.yaml +++ b/coin/platform_configs/qtsaferenderer.yaml @@ -1,10 +1,14 @@ +Version: 2 +Configurations: - - Template: 'qtci-windows-10-x86_64-16' - Compiler: 'Mingw73' + Template: 'qtci-windows-10-x86_64-17' + Compiler: 'Mingw' + Environment variables: ['PATH=C:\MINGW810\mingw64\bin;$PATH'] 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-16' - Compiler: 'Mingw73' + Template: 'qtci-windows-10-x86_64-17' + Compiler: 'Mingw' + Environment variables: ['PATH=C:\MINGW810\mingw64\bin;$PATH'] Features: ['Packaging', 'DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -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++' - diff --git a/coin/platform_configs/qtsdk.yaml b/coin/platform_configs/qtsdk.yaml index 75af86fd..2dc7f0bc 100644 --- a/coin/platform_configs/qtsdk.yaml +++ b/coin/platform_configs/qtsdk.yaml @@ -1,6 +1,6 @@ - Template: 'qtci-windows-10-x86-4' - Compiler: 'MSVC2017' + Compiler: 'MSVC2019' 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' diff --git a/coin/platform_configs/qtwebkit.yaml b/coin/platform_configs/qtwebkit.yaml index 29291d53..900793c2 100644 --- a/coin/platform_configs/qtwebkit.yaml +++ b/coin/platform_configs/qtwebkit.yaml @@ -1,6 +1,9 @@ +Version: 2 +Configurations: - Template: 'qtci-windows-7-x86-3' - Compiler: 'Mingw73' + Compiler: 'Mingw' + Environment variables: ['PATH=C:\MINGW810_i686\mingw32\bin;$PATH'] 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++ QMAKE_LFLAGS_APP+=-s' - diff --git a/coin/platform_configs/tqtc-qt-config-gui.yaml b/coin/platform_configs/tqtc-qt-config-gui.yaml index 9f76340e..ad35fc2c 100644 --- a/coin/platform_configs/tqtc-qt-config-gui.yaml +++ b/coin/platform_configs/tqtc-qt-config-gui.yaml @@ -2,13 +2,13 @@ Version: 2 Module only: True Configurations: - - Template: 'qtci-windows-10-x86_64-16' - Compiler: 'MSVC2017' + Template: 'qtci-windows-10-x86_64-17' + Compiler: 'MSVC2019' Features: ['Packaging'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -static -no-icu' - - Template: 'qtci-windows-10-x86_64-16' - Compiler: 'MSVC2017' + Template: 'qtci-windows-10-x86_64-17' + Compiler: 'MSVC2019' Target arch: 'x86' Features: ['Packaging'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -static -no-icu' diff --git a/coin/platform_configs/tqtc-qt-rta.yaml b/coin/platform_configs/tqtc-qt-rta.yaml index 1bf9cf9e..a8586ddf 100644 --- a/coin/platform_configs/tqtc-qt-rta.yaml +++ b/coin/platform_configs/tqtc-qt-rta.yaml @@ -10,5 +10,5 @@ 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-4' - Compiler: 'MSVC2017' + Compiler: 'MSVC2019' 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/pre-provisioning/qtci-windows-10-x86_64/README_MANUAL_INSTALLATIONS b/coin/pre-provisioning/qtci-windows-10-x86_64/README_MANUAL_INSTALLATIONS index c2daf225..fd646cbf 100644 --- a/coin/pre-provisioning/qtci-windows-10-x86_64/README_MANUAL_INSTALLATIONS +++ b/coin/pre-provisioning/qtci-windows-10-x86_64/README_MANUAL_INSTALLATIONS @@ -1,14 +1,50 @@ # List about manual pre-installations to Tier1 image: -Vmware tools: installed -Resolution: 1280 X 800 -Coin setup (installed boostrap agent, disabled fast boot, disabled firewall (both public and private), disabled UAC, enabled autologin) -Remote Desktop Connection: enabled -Timezone: set to UTC -Administrator tools - services - Windows search: stop & disable -Power settings screen & slee: never -Turn windows features on or off -> Check the "SMB 1.0/CIFS File Sharing Support" -MSVC 2019 build tools (default installation, no additional selections). - * Install after MSVC2019 is installed! - * Installer: "http://ci-files01-hki.intra.qt.io/input/windows/vs_buildtools__251503345.1575372514.exe" - * Version: 16.3.10 +Virtual Hardware: +CPU: 4 +Memory: 8 GB +Hard Disk: 550 GB +CI_NW +Video Card - total memory: 32MB + +VM Options: +Boot options/Firmware: BIOS + +Language: English US +Keyboard: finnish +location: finnish +Windows 10 Enterprise +Region: Finland +Keyboard layout: Finnish + +* VMware tools (complete) installed +* Resolution set to 1280x800 +* Coin-setup: + - Installing Boostrap agent + - Disabling fast boot + - Disabling firewall + - Disabling UAC + - Enabling autologin + - Automatic login + - Disabling windows updates +* Windows Defender Antivirus turned off: Open 'gpedit.msc': 'Computer Configuration' - 'Administrative Templates' - 'Windows Components' - 'Windows Defender Antivirus' + - Edit 'Turn off Windows Defender Antivirus' > 'Enabled' > 'Apply' + - NOTE! Without this step windows defender can't be disabled! +* Remote connections allowed: + - Enable Remote Desktop +* Background defrag disabled: 'defragment and optimize drives' - 'change settings' - unchecked "run on a schedule" + - Run in terminal: 'schtasks /Delete /TN "Microsoft\Windows\Defrag\ScheduledDefrag"' +* Time zone: Coordinated Universal Time +* Windows search disabled: 'Control Panel\System and Security\Administrative Tools\Services' - 'Windows search' - stop & disable +* Sysmain disabled: 'Control Panel\System and Security\Administrative Tools\Services' - 'SysMain' - stop & disable +* Power saver disabled: Open 'Power & sleep' and set 'Screen' to 'never' +* Turn windows features on or off -> Check the "SMB 1.0/CIFS File Sharing Support +* Google Chrome installed for RTA +* Turn off Virus & threat protection (all sections) manually + - Real-tiem protection -> off + - Cloud-delivered protection -> off + - Automatic sample submission -> off + - Tamper protection -> off +* Activate Windows +* Modify 'Windows Software Development Kit - Windows 10.0.18362.1' from 'Add or remove programs' + - Add feature 'Debugging Tools for Windows' diff --git a/coin/pre-provisioning/qtci-windows-10-x86_64/disable-clean-manager.ps1 b/coin/pre-provisioning/qtci-windows-10-x86_64/disable-clean-manager.ps1 new file mode 100644 index 00000000..45ce141f --- /dev/null +++ b/coin/pre-provisioning/qtci-windows-10-x86_64/disable-clean-manager.ps1 @@ -0,0 +1,8 @@ +# This script will disable automatic disk cleanup + +. "$PSScriptRoot\..\..\provisioning\common\windows\helpers.ps1" + +Run-Executable "reg.exe" "ADD `"HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\StorageSense\Parameters\StoragePolicy`" /V 04 /T REG_dWORD /D 0 /F" + +# Maintenance task used by the system to launch a silent auto disk cleanup when running low on free disk space. +DisableSchedulerTask "DiskCleanup\SilentCleanup" diff --git a/coin/pre-provisioning/qtci-windows-10-x86_64/disable-ntp.ps1 b/coin/pre-provisioning/qtci-windows-10-x86_64/disable-ntp.ps1 index 757f0d18..22651763 100644 --- a/coin/pre-provisioning/qtci-windows-10-x86_64/disable-ntp.ps1 +++ b/coin/pre-provisioning/qtci-windows-10-x86_64/disable-ntp.ps1 @@ -1,4 +1,4 @@ -. "$PSScriptRoot\helpers.ps1" +. "$PSScriptRoot\..\..\provisioning\common\windows\helpers.ps1" # Disable the NTP from syncing Run-Executable "w32tm.exe" "/config /syncfromflags:NO" diff --git a/coin/pre-provisioning/qtci-windows-10-x86_64/disable-schedule-tasks.ps1 b/coin/pre-provisioning/qtci-windows-10-x86_64/disable-schedule-tasks.ps1 index 351f10c6..1febd88c 100644 --- a/coin/pre-provisioning/qtci-windows-10-x86_64/disable-schedule-tasks.ps1 +++ b/coin/pre-provisioning/qtci-windows-10-x86_64/disable-schedule-tasks.ps1 @@ -1,4 +1,4 @@ -. "$PSScriptRoot\helpers.ps1" +. "$PSScriptRoot\..\..\provisioning\common\windows\helpers.ps1" # This script will remove unneeded Tasks from Task Scheduler diff --git a/coin/pre-provisioning/qtci-windows-10-x86_64/disable-update-orchestrator.ps1 b/coin/pre-provisioning/qtci-windows-10-x86_64/disable-update-orchestrator.ps1 index 5ae8fb0d..c7f23470 100644 --- a/coin/pre-provisioning/qtci-windows-10-x86_64/disable-update-orchestrator.ps1 +++ b/coin/pre-provisioning/qtci-windows-10-x86_64/disable-update-orchestrator.ps1 @@ -8,7 +8,6 @@ icacls $path /grant Administrators:F /T SCHTASKS /Change /TN "Microsoft\Windows\$name\Reboot" /DISABLE del "$path\Schedule Scan" del "$path\Schedule Scan Static Task" -del "$path\Backup Scan" del "$path\UpdateModelTask" del "$path\USO_UxBroker" diff --git a/coin/pre-provisioning/qtci-windows-10-x86_64/disable-windefender.ps1 b/coin/pre-provisioning/qtci-windows-10-x86_64/disable-windefender.ps1 index 02ed54da..21938f7f 100644 --- a/coin/pre-provisioning/qtci-windows-10-x86_64/disable-windefender.ps1 +++ b/coin/pre-provisioning/qtci-windows-10-x86_64/disable-windefender.ps1 @@ -35,10 +35,14 @@ # # If disabled manually, windows will automatically enable it after # some period of time. Disabling it speeds up the builds. +# NOTE! Windows Defender Antivirus needs to be turned off! +# Open 'gpedit.msc': 'Computer Configuration' - 'Administrative Templates' - 'Windows Components' - 'Windows Defender Antivirus' +# Edit 'Turn off Windows Defender Antivirus' > 'Enabled' > 'Apply' -. "$PSScriptRoot\helpers.ps1" +. "$PSScriptRoot\..\..\provisioning\common\windows\helpers.ps1" Run-Executable "reg.exe" "ADD `"HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows Defender`" /V DisableAntiSpyware /T REG_dWORD /D 1 /F" +Run-Executable "reg.exe" "ADD `"HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows Defender`" /V DisableRoutinelyTakingAction /T REG_dWORD /D 1 /F" # 'Windows Defender Cache Maintenance' - "Periodic maintenance task." DisableSchedulerTask "Windows Defender\Windows Defender Cache Maintenance" diff --git a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2015_update.ps1 b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2015_update.ps1 index 00f8af72..69f3e27b 100644 --- a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2015_update.ps1 +++ b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2015_update.ps1 @@ -33,7 +33,7 @@ # Visual Studio $version was installed manually using $installer. $version = "2015 update 3" -$version_number ="14.0.25431.01" +$version_number ="14.0.25420.1" $installer = "http://ci-files01-hki.intra.qt.io/input/windows/en_visual_studio_professional_2015_with_update_3_x86_x64_web_installer_8922978" # default plus following components were selected: diff --git a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2017.ps1 b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2017.ps1 deleted file mode 100644 index c4b04df0..00000000 --- a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2017.ps1 +++ /dev/null @@ -1,88 +0,0 @@ -############################################################################ -## -## Copyright (C) 2018 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$ -## -############################################################################# - -# Visual Studio $version version $version_number was installed manually using $installer. - -$version = "2017" -# Current version was manually upgraded from the installer -$version_number = "15.9.17" -$installer = "http://ci-files01-hki.ci.local/input/windows/vs_professional__1312218103.1526017942.exe" - -# Following components were selected from installer: -# Microsoft.Net.Component.4.5.TargetingPack (.NET Framework 4.5 targeting pack) -# Microsoft.Net.Component.4.6.1.SDK (.NET Framework 4.6.1 SDK) -# Microsoft.Component.NetFX.Native (.NET Native) -# Microsoft.VisualStudio.Component.PortableLibrary (.NET Portable Library targeting pack) -# Microsoft.VisualStudio.Component.SQL.CLR (CLR data types for SQL Server) -# Microsoft.VisualStudio.Component.VisualStudioData (Data sources and service references) -# Microsoft.Component.ClickOnce (ClickOnce Publishing) -# Microsoft.VisualStudio.Component.AppInsights.Tools (Developer Analytics tools) -# Microsoft.VisualStudio.Component.NuGet (NuGet package manager) -# Microsoft.VisualStudio.Component.Static.Analysis.Tools (Static analysis tools) -# Microsoft.VisualStudio.Component.TextTemplating (Text Template Transformation) -# Microsoft.VisualStudio.Component.Roslyn.Compiler (C# and Visual Basic Roslyn compilers) -# Microsoft.Component.MSBuild (MSBuild) -# Microsoft.VisualStudio.Component.VC.Tools.x86.x64 (VC++ 2017 version 15.8 v14.15 latest v141 tools) -# Microsoft.VisualStudio.Component.VC.Redist.14.Latest (Visual C++ 2017 Redistributable Update) -# Microsoft.VisualStudio.Component.VC.Tools.ARM (Visual C++ compilers and libraries for ARM) -# Microsoft.VisualStudio.Component.VC.Tools.ARM64 (Visual C++ compilers and libraries for ARM64) -# Microsoft.VisualStudio.Component.VC.CMake.Project (Visual C++ tools for CMake) -# Microsoft.VisualStudio.Component.DiagnosticTools (.NET profiling tools) -# Microsoft.VisualStudio.Component.VC.DiagnosticTools (C++ profiling tools) -# Microsoft.VisualStudio.Component.JavaScript.Diagnostics (JavaScript diagnostics) -# Microsoft.VisualStudio.Component.Debugger.JustInTime (Just-In-Time debugger) -# Microsoft.VisualStudio.Component.Roslyn.LanguageServices (C# and Visual Basic) -# Microsoft.VisualStudio.Component.JavaScript.TypeScript (JavaScript and TypeScript language support) -# Component.Microsoft.VisualStudio.RazorExtension (Razor Language Services) -# Component.Linux.CMake (Visual C++ tools for CMake and Linux) -# Microsoft.VisualStudio.Component.VC.CoreIde (Visual Studio C++ core features) -# Microsoft.VisualStudio.Component.Graphics.Tools (Graphics debugger and GPU profiler for DirectX) -# Microsoft.VisualStudio.Component.Graphics (Image and 3D model editors) -# Microsoft.VisualStudio.Component.Graphics.Win81 (Graphics Tools Windows 8.1 SDK) -# Microsoft.VisualStudio.Component.TypeScript.2.3 (TypeScript 2.3 SDK) -# Microsoft.VisualStudio.Component.TypeScript.3.0 (TypeScript 3.0 SDK) -# Microsoft.VisualStudio.Component.VC.ATL (Visual C++ ATL for x86 and x64) -# Microsoft.VisualStudio.Component.Windows10SDK.10240 (Windows 10 SDK (10.0.10240.0)) -# Microsoft.VisualStudio.Component.Windows10SDK.10586 (Windows 10 SDK (10.0.10586.0)) -# Microsoft.VisualStudio.Component.Windows10SDK.14393 (Windows 10 SDK (10.0.14393.0)) -# Microsoft.VisualStudio.Component.Windows10SDK.15063.Desktop (Windows 10 SDK (10.0.15063.0) for Desktop C++ [x86 and x64]) -# Microsoft.VisualStudio.Component.Windows10SDK.15063.UWP (Windows 10 SDK (10.0.15063.0) for UWP: C#, VB, JS) -# Microsoft.VisualStudio.Component.Windows10SDK.15063.UWP.Native (Windows 10 SDK (10.0.15063.0) for UWP: C++) -# Microsoft.VisualStudio.Component.Windows10SDK.16299.Desktop (Windows 10 SDK (10.0.16299.0) for Desktop C++ [x86 and x64]) -# Microsoft.VisualStudio.Component.Windows10SDK.16299.UWP (Windows 10 SDK (10.0.16299.0) for UWP: C#, VB, JS) -# Microsoft.VisualStudio.Component.Windows10SDK.16299.UWP.Native (Windows 10 SDK (10.0.16299.0) for UWP: C++) -# Microsoft.VisualStudio.Component.Windows10SDK.16299.Desktop.arm (Windows 10 SDK (10.0.16299.0) for Desktop C++ [ARM and ARM64]) -# Microsoft.VisualStudio.Component.Windows10SDK.17134 (Windows 10 SDK (10.0.17134.0)) -# Microsoft.VisualStudio.Component.Windows10SDK.17763 (Windows 10 SDK (10.0.17763.0)) - -echo "Visual Studio = $version version version_number" >> ~\versions.txt diff --git a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2019.ps1 b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2019.ps1 deleted file mode 100644 index 538d478c..00000000 --- a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2019.ps1 +++ /dev/null @@ -1,91 +0,0 @@ -############################################################################ -## -## 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$ -## -############################################################################# - -# Visual Studio $version version $version_number was installed manually using $installer. - -$version = "2019" -# Current version was manually upgraded from the installer -$version_number = "16.3.10" -$installer = "http://ci-files01-hki.ci.local/input/windows/vs_professional__505064367.1547034421.exe" - -.NET Framework 4.5 targeting pack -.NET Framework 4.5.1 targeting pack -.NET Framework 4.5.2 targeting pack -.NET Framework 4.6.1 SDK -.NET Framework 4.6.1 targeting pack -.NET Framework 4.6.2 SDK -.NET Framework 4.6.2 targeting pack -.NET Framework 4.7.2 SDK -.NET Framework 4.7.2 targeting pack -.NET Native -.NET Portable Library targeting pack -CLR data typer for SQL Sever -Connectivity and publishing tools -Data sources for SQL Server support -SQL ADAL runtime -SQL Server Command Linne Utilities -SQL Server Data Tools -SQL Server Express 2016 LocalDB -SQL Server ODBC Driver -ClickOnce Publishing -Developer Analytics tools -NuGet package manager -Text Template Transformation -C# and Visual Basic Roslyn compilers -C++ 2019 Redistributable Update -C++ Cmake tools for Windows -C++/CLI support for v142 build tools -MSBuild -MSVC v142 - VS 2019 C++ ARM build tools (v14.20) -MSVC v142 - VS 2019 C++ ARM64 build tools (v14.20) -MSVC v142 - VS 2019 C++ x64/x86 build tools (v14.20) -.NET profiling tools -C++ profiling tools -JavaScript diagnostics -Just-In-Time debugger -C# and Visual Basic -C++ core features -JavaSript and TypeScript language support -Razor Language Services -Graphics debugger and GPU profiler for DirectX -Image and 3D model editors -C++ ATL for v142 build tools (x86 & x64) -TypeScript 3.3 SDK -Windows 10 SDK (10.0.16299.0) -Windows 10 SDK (10.0.17134.0) -Windows 10 SDK (10.0.17763.0) -Windows 10 SDK (10.0.18362.0) - -# NOTE! Work loads were added during installation! - -echo "Visual Studio = $version version version_number" >> ~\versions.txt diff --git a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2019.txt b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2019.txt new file mode 100644 index 00000000..28f63762 --- /dev/null +++ b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2019.txt @@ -0,0 +1,67 @@ +# Visual Studio $version version $version_number was installed manually using $installer. + +$version = "2019" +# Current version was manually upgraded from the installer +$version_number = "16.4.4" +$installer = "http://ci-files01-hki.ci.local/input/windows/vs_professional__505064367.1547034421.exe" + +MSVC 2019 build tools (default installation, no additional selections). + * Install after MSVC2019 is installed! + * Installer: "http://ci-files01-hki.intra.qt.io/input/windows/vs_buildtools__251503345.1575372514.exe" + * Version: 16.4.4 + +Installed MSVC-2019 Components: + +.NET Framework 4.5 targeting pack +.NET Framework 4.5.1 targeting pack +.NET Framework 4.5.2 targeting pack +.NET Framework 4.6.1 SDK +.NET Framework 4.6.1 targeting pack +.NET Framework 4.6.2 SDK +.NET Framework 4.6.2 targeting pack +.NET Framework 4.7.2 SDK +.NET Framework 4.7.2 targeting pack +.NET Native +.NET Portable Library targeting pack +CLR data typer for SQL Sever +Connectivity and publishing tools +Data sources for SQL Server support +SQL ADAL runtime +SQL Server Command Linne Utilities +SQL Server Data Tools +SQL Server Express 2016 LocalDB +SQL Server ODBC Driver +ClickOnce Publishing +Developer Analytics tools +NuGet package manager +Text Template Transformation +C# and Visual Basic Roslyn compilers +C++ 2019 Redistributable Update +C++ Cmake tools for Windows +C++/CLI support for v142 build tools /14.24) +MSBuild +MSVC v142 - VS 2019 C++ ARM build tools (v14.20) +MSVC v142 - VS 2019 C++ ARM build tools (v14.24) +MSVC v142 - VS 2019 C++ ARM64 build tools (v14.20) +MSVC v142 - VS 2019 C++ ARM64 build tools (v14.24) +MSVC v142 - VS 2019 C++ x64/x86 build tools (v14.20) +MSVC v142 - VS 2019 C++ x64/x86 build tools (v14.24) +.NET profiling tools +C++ profiling tools +JavaScript diagnostics +Just-In-Time debugger +C# and Visual Basic +C++ core features +JavaSript and TypeScript language support +Razor Language Services +Graphics debugger and GPU profiler for DirectX +Image and 3D model editors +C++ ATL for latest v142 build tools (x86 & x64) +TypeScript 3.7 SDK +Windows 10 SDK (10.0.16299.0) +Windows 10 SDK (10.0.17134.0) +Windows 10 SDK (10.0.17763.0) +Windows 10 SDK (10.0.18362.0) + +# NOTE! Work loads were added during installation! + diff --git a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc_2015_update3_patch.ps1 b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc_2015_update3_patch.ps1 deleted file mode 100644 index bfbb397a..00000000 --- a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc_2015_update3_patch.ps1 +++ /dev/null @@ -1,67 +0,0 @@ -############################################################################# -## -## Copyright (C) 2017 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" - -# Install Cumulative Servicing Release Visual Studio 2015 update 3 -# Original download page: https://msdn.microsoft.com/en-us/library/mt752379.aspx - -$version = "2015 update3 (KB3165756)" -$packagePath = "C:\Windows\Temp" -$package = $packagePath + "\vs14-kb3165756.exe" -$url_cache = "http://ci-files01-hki.intra.qt.io/input/windows/vs14-kb3165756.exe" -$url_official = "http://go.microsoft.com/fwlink/?LinkID=816878" -$sha1 = "6a21d9b291ca75d44baad95e278fdc0d05d84c02" -$preparedPackage = "\\ci-files01-hki.intra.qt.io\provisioning\windows\vs14-kb3165756-update" - -if (Test-Path $preparedPackage) { - # The prepared package contains updated packages so that not everything has to be downloaded - Write-Host "Using prepared package" - Copy-Item -Recurse $preparedPackage $packagePath - # Remove the whole downloaded folder - $toRemove = $packagePath + "\vs14-kb3165756-update" - $executable = "$toRemove\vs14-kb3165756.exe" -} else { - Write-Host "Fetching patch for Visual Studio $version..." - Download $url_official $url_cache $package - $executable = $package - # Remove the downloaded executable - $toRemove = $executable -} - -Verify-Checksum $executable $sha1 -Write-Host "Installing patch for Visual Studio $version..." -Run-Executable $executable "/norestart /passive" - -Remove-Item -Force -Recurse -Path $toRemove - -Write-Output "Visual Studio = $version" >> ~\versions.txt diff --git a/coin/provisioning/common/linux/gcc.sh b/coin/provisioning/common/linux/gcc.sh index c26c9bf1..06fe8bf7 100755 --- a/coin/provisioning/common/linux/gcc.sh +++ b/coin/provisioning/common/linux/gcc.sh @@ -88,15 +88,15 @@ function InstallGCC() { # openSUSE has update-alternatives under /usr/sbin and it has grouped the commands by means of master and slave links if [ -f "/usr/sbin/update-alternatives" ]; then - sudo /usr/sbin/update-alternatives --install /usr/bin/gcc gcc "$installPrefix/bin/gcc-$suffixVersion" "$priority" \ - --slave /usr/bin/g++ g++ "$installPrefix/bin/g++-$suffixVersion" \ - --slave /usr/bin/cc cc "$installPrefix/bin/gcc-$suffixVersion" \ - --slave /usr/bin/c++ c++ "$installPrefix/bin/g++-$suffixVersion" + sudo /usr/sbin/update-alternatives --install /usr/bin/gcc gcc "$installPrefix/bin/gcc${suffixVersion}" "$priority" \ + --slave /usr/bin/g++ g++ "$installPrefix/bin/g++${suffixVersion}" \ + --slave /usr/bin/cc cc "$installPrefix/bin/gcc${suffixVersion}" \ + --slave /usr/bin/c++ c++ "$installPrefix/bin/g++${suffixVersion}" else - sudo /usr/bin/update-alternatives --install /usr/bin/gcc gcc "$installPrefix/bin/gcc-$suffixVersion" "$priority" - sudo /usr/bin/update-alternatives --install /usr/bin/g++ g++ "$installPrefix/bin/g++-$suffixVersion" "$priority" - sudo /usr/bin/update-alternatives --install /usr/bin/cc cc "$installPrefix/bin/gcc-$suffixVersion" "$priority" - sudo /usr/bin/update-alternatives --install /usr/bin/c++ c++ "$installPrefix/bin/g++-$suffixVersion" "$priority" + sudo /usr/bin/update-alternatives --install /usr/bin/gcc gcc "$installPrefix/bin/gcc${suffixVersion}" "$priority" + sudo /usr/bin/update-alternatives --install /usr/bin/g++ g++ "$installPrefix/bin/g++${suffixVersion}" "$priority" + sudo /usr/bin/update-alternatives --install /usr/bin/cc cc "$installPrefix/bin/gcc${suffixVersion}" "$priority" + sudo /usr/bin/update-alternatives --install /usr/bin/c++ c++ "$installPrefix/bin/g++${suffixVersion}" "$priority" fi echo "/usr/local/lib64" | sudo tee /etc/ld.so.conf.d/gcc-libraries.conf diff --git a/coin/provisioning/common/macos/libusb.sh b/coin/provisioning/common/macos/libusb.sh new file mode 100755 index 00000000..cf9e7150 --- /dev/null +++ b/coin/provisioning/common/macos/libusb.sh @@ -0,0 +1,43 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2020 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$ +## +############################################################################# + +# Install libusb +set -ex + +source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" +brew install libusb +read -r -a arr <<< $(brew list --versions libusb) +version=${arr[1]} +echo "libusb = $version" >> ~/versions.txt diff --git a/coin/provisioning/common/macos/pkgconfig.sh b/coin/provisioning/common/macos/pkgconfig.sh new file mode 100755 index 00000000..9fad4912 --- /dev/null +++ b/coin/provisioning/common/macos/pkgconfig.sh @@ -0,0 +1,43 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2020 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$ +## +############################################################################# + +# Install pkgconfig +set -ex + +source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" +brew install pkgconfig +read -r -a arr <<< $(brew list --versions pkgconfig) +version=${arr[1]} +echo "pkgconfig = $version" >> ~/versions.txt diff --git a/coin/provisioning/common/unix/InstallFromCompressedFileFromURL.sh b/coin/provisioning/common/unix/InstallFromCompressedFileFromURL.sh index 34bcf289..8aaa0dc3 100755 --- a/coin/provisioning/common/unix/InstallFromCompressedFileFromURL.sh +++ b/coin/provisioning/common/unix/InstallFromCompressedFileFromURL.sh @@ -67,6 +67,9 @@ function InstallFromCompressedFileFromURL { "xz") tar -xf "$targetFile" --directory "$targetDirectory" ;; + "tbz2") + tar -xjf "$targetFile" --directory "$targetDirectory" + ;; *) exit 1 ;; diff --git a/coin/provisioning/common/unix/emsdk.sh b/coin/provisioning/common/unix/emsdk.sh index acb2483a..a2fda735 100755 --- a/coin/provisioning/common/unix/emsdk.sh +++ b/coin/provisioning/common/unix/emsdk.sh @@ -39,59 +39,55 @@ source "${BASH_SOURCE%/*}/SetEnvVar.sh" # shellcheck source=./DownloadURL.sh source "${BASH_SOURCE%/*}/DownloadURL.sh" -version="1.38.27" -version_node="8.9.1" -urlOfficial="https://s3.amazonaws.com/mozilla-games/emscripten/packages" +version="1.39.8" urlCache="http://ci-files01-hki.intra.qt.io/input/emsdk" targetFolder="/opt/emsdk" -urlEmscriptenCache="$urlCache/emscripten-$version.tar.gz" -urlEmscriptenExternal="https://github.com/kripken/emscripten/archive/$version.tar.gz" -sha1Emscripten="ff9748a8f6b8eaa8192cce9fe2befc801443a161" +# cross-platform emscripten SDK +urlEmscriptenExternal="https://github.com/emscripten-core/emscripten/archive/$version.tar.gz" +urlEmscriptenCache="$urlCache/emscripten.$version.tar.gz" +sha1Emscripten="a593ea3b4ab7e3d57e1232b19a903ccf8f137d2f" +# platform-specific toolchain and node binaries. urls obtained from "emsdk install" if uname -a |grep -q Darwin; then - urlEmscriptenLlvmCache="$urlCache/macos/emscripten-llvm-e$version.tar.gz" - urlEmscriptenLlvmExternal="$urlOfficial/llvm/tag/osx_64bit/emscripten-llvm-e$version.tar.gz" - urlNodeCache="$urlCache/macos/node-v$version_node-darwin-x64.tar.gz" - urlNodeExternal="$urlOfficial/node-v$version_node-darwin-x64.tar.gz" - sha1EmscriptenLlvm="66dffbc44cfcb7bcb1ed0d2658b519276c3077fa" - sha1Node="b9ec6fe9701d385e385886a4b171ba02bb6aead7" - node_js="$targetFolder/node-v$version_node-darwin-x64/bin" + urlWasmBinariesExternal="https://storage.googleapis.com/webassembly/emscripten-releases-builds/mac/9e60f34accb4627d7358223862a7e74291886ab6/wasm-binaries.tbz2" + urlWasmBinariesCache="$urlCache/macos/wasm-binaries.$version.tbz2" + sha1WasmBinaries="aedb30fb07d565c35305af0920ab072ae743895d" + + urlNodeBinariesExternal="https://storage.googleapis.com/webassembly/emscripten-releases-builds/deps/node-v12.9.1-darwin-x64.tar.gz" + urlNodeBinariesCache="$urlCache/mac/node-v12.9.1-darwin-x64.tar.gz" + sha1NodeBinaries="f5976321ded091e70358e406b223f6fd64e35a43" + pathNodeExecutable='node-v12.9.1-darwin-x64/bin/node' else - urlEmscriptenLlvmCache="$urlCache/linux/emscripten-llvm-e$version.tar.gz" - urlEmscriptenLlvmExternal="$urlOfficial/llvm/tag/linux_64bit/emscripten-llvm-e$version.tar.gz" - urlNodeCache="$urlCache/linux/node-v$version_node-linux-x64.tar.xz" - urlNodeExternal="$urlOfficial/node-v$version_node-linux-x64.tar.xz" - sha1EmscriptenLlvm="8f5cd026c98cd40e53e6d11fbc32b116280ef9bb" - sha1Node="eaec5de2af934f7ebc7f9597983e71c5d5a9a726" - node_js="$targetFolder/node-v$version_node-linux-x64/bin" + urlWasmBinariesExternal="https://storage.googleapis.com/webassembly/emscripten-releases-builds/linux/9e60f34accb4627d7358223862a7e74291886ab6/wasm-binaries.tbz2" + urlWasmBinariesCache="$urlCache/linux/wasm-binaries.$version.tbz2" + sha1WasmBinaries="eb7fc94aa79a6e215272e2586173515aa37c3141" + + urlNodeBinariesExternal="https://storage.googleapis.com/webassembly/emscripten-releases-builds/deps/node-v12.9.1-linux-x64.tar.xz" + urlNodeBinariesCache="$urlCache/linux/node-v12.9.1-linux-x64.tar.xz" + sha1NodeBinaries="cde96023b468d593c50de27470dd714c8cfda9aa" + pathNodeExecutable='node-v12.9.1-linux-x64/bin/node' fi sudo mkdir "$targetFolder" InstallFromCompressedFileFromURL "$urlEmscriptenCache" "$urlEmscriptenExternal" "$sha1Emscripten" "$targetFolder" "" -InstallFromCompressedFileFromURL "$urlEmscriptenLlvmCache" "$urlEmscriptenLlvmExternal" "$sha1EmscriptenLlvm" "$targetFolder" "" -InstallFromCompressedFileFromURL "$urlNodeCache" "$urlNodeExternal" "$sha1Node" "$targetFolder" "" +InstallFromCompressedFileFromURL "$urlWasmBinariesCache" "$urlWasmBinariesExternal" "$sha1WasmBinaries" "$targetFolder" "" +InstallFromCompressedFileFromURL "$urlNodeBinariesCache" "$urlNodeBinariesExternal" "$sha1NodeBinaries" "$targetFolder" "" sudo chmod -R a+rwx "$targetFolder" echo "Writing $targetFolder/.emscripten" cat <<EOM >"$targetFolder/.emscripten" -LLVM_ROOT='$targetFolder/emscripten-llvm-e$version/' -EMSCRIPTEN_NATIVE_OPTIMIZER='$targetFolder/emscripten-llvm-e$version/optimizer' -BINARYEN_ROOT='$targetFolder/emscripten-llvm-e$version/binaryen' -NODE_JS='$node_js/node' EMSCRIPTEN_ROOT='$targetFolder/emscripten-$version' -SPIDERMONKEY_ENGINE = '' -V8_ENGINE = '' +LLVM_ROOT='$targetFolder/install/bin' +BINARYEN_ROOT='$targetFolder/install' +NODE_JS='$targetFolder/$pathNodeExecutable' TEMP_DIR = '/tmp' -COMPILER_ENGINE = NODE_JS -JS_ENGINES = [NODE_JS] EOM -SetEnvVar "PATH" "\"\$PATH:$targetFolder/emscripten-llvm-e$version/:$node_js:$targetFolder/emscripten-$version\"" +SetEnvVar "PATH" "\"\$PATH:$targetFolder/emscripten-$version/\"" SetEnvVar "EMSCRIPTEN" "$targetFolder/emscripten-$version" SetEnvVar "EM_CONFIG" "$targetFolder/.emscripten" echo "Emsdk = $version" >> ~/versions.txt -echo "Emsdk node = $version_node" >> ~/versions.txt diff --git a/coin/provisioning/common/windows/conan.ps1 b/coin/provisioning/common/windows/conan.ps1 index c5984e26..e7e0de22 100644 --- a/coin/provisioning/common/windows/conan.ps1 +++ b/coin/provisioning/common/windows/conan.ps1 @@ -77,27 +77,20 @@ function Run-Conan-Install $manifestsDir = "$PSScriptRoot\conan_manifests" $buildinfoRoot = "C:\Utils\conanbuildinfos" + # Make up to 5 attempts for all download operations in conan + $env:CONAN_RETRY = "5" + Get-ChildItem -Path "$ConanfilesDir\*.txt" | ForEach-Object { $conanfile = $_.FullName $outpwd = "$buildinfoRoot\$BuildinfoDir\$($_.BaseName)" New-Item $outpwd -Type directory -Force | Out-Null - for ($i = 1; $i -le 5; $i++) { - try { - Push-Location $outpwd - Run-Executable "$scriptsPath\conan.exe" "install --no-imports --verify $manifestsDir", ` - '-s', ('compiler="' + $Compiler + '"'), ` - "-s os=Windows -s arch=$Arch -s compiler.version=$CompilerVersion $extraArgs $conanfile" - break; - } catch { - if ($i -eq 5) { - throw "Could not install conan content" - } - } finally { - Pop-Location - } - } + Push-Location $outpwd + Run-Executable "$scriptsPath\conan.exe" "install --no-imports --verify $manifestsDir", ` + '-s', ('compiler="' + $Compiler + '"'), ` + "-s os=Windows -s arch=$Arch -s compiler.version=$CompilerVersion $extraArgs $conanfile" + Pop-Location Copy-Item -Path $conanfile -Destination "$outpwd\conanfile.txt" } diff --git a/coin/provisioning/common/windows/emsdk.ps1 b/coin/provisioning/common/windows/emsdk.ps1 index 2ce2754f..b3375d07 100755 --- a/coin/provisioning/common/windows/emsdk.ps1 +++ b/coin/provisioning/common/windows/emsdk.ps1 @@ -35,33 +35,38 @@ # This script will install emscripten needed by WebAssembly -$version = "1.38.27" -$versionNode = "8.9.1" -$versionWinPython = "2.7.13" +$version = "1.39.8" +$versionNode = "12.9.1" +$versionWinPython = "3.7.4" $versionJre = "8_update_152" -$urlOfficialMozilla = "https://s3.amazonaws.com/mozilla-games/emscripten/packages" +$urlEmscripten = "https://storage.googleapis.com/webassembly/emscripten-releases-builds" + +# cross-platform emscripten SDK +$urlEmscriptenExternal="https://github.com/emscripten-core/emscripten/archive/$version.zip" $urlCache = "http://ci-files01-hki.intra.qt.io/input/emsdk" -$urlOfficialEmscriptenLlvm = "$urlOfficialMozilla/llvm/tag/win_64bit/emscripten-llvm-e$version.zip" -$urlCacheEmscriptenLlvm = "$urlCache/windows/emscripten-llvm-e$version.zip" -$sha1EmscriptenLlvm = "1cd950feec50f1f3265f04ab01fb270250eb4232" +$urlEmscriptenCache="$urlCache/emscripten.$version.zip" + +$urlWasmBinariesExternal="$urlEmscripten/win/9e60f34accb4627d7358223862a7e74291886ab6/wasm-binaries.zip" +$urlWasmBinariesCache="$urlCache\windows\wasm-binaries.$version.zip" +$sha1WasmBinaries="E94DCA7BA0526F88EDDBE45A0A0F61778D173603" -$urlOfficialNode = "$urlOfficialMozilla/node-v$versionNode-win-x64.zip" +$urlOfficialNode = "$urlEmscripten/deps/node-v$versionNode-win-x64.zip" $urlCacheNode = "$urlCache/windows/node-v$versionNode-win-x64.zip" -$sha1Node = "249c840f7b953e4cb7ac9db89aa92a98daa1dc63" +$sha1Node = "D064145694578D6617AA99C694772D21480B6B6D" -$urlOfficialWinPython = "$urlOfficialMozilla/WinPython-64bit-$versionWinPython.1Zero.zip" -$urlCacheWinPython = "$urlCache/windows/WinPython-64bit-$versionWinPython.1Zero.zip" -$sha1WinPython = "7e5a021878e0165ba0603e995b013e244d6e10cb" +$urlOfficialWinPython = "$urlEmscripten/deps/python-$versionWinPython-embed-amd64-patched.zip" +$urlCacheWinPython = "$urlCache/windows/python-$versionWinPython-embed-amd64-patched.zip" +$sha1WinPython = "27C5A465390167FC03F3DD9075E3FDAAD9FBE104" -$urlOfficialProtableJre = "$urlOfficialMozilla/portable_jre_${versionJre}_64bit.zip" +$urlOfficialProtableJre = "$urlEmscripten/deps/portable_jre_${versionJre}_64bit.zip" $urlCacheProtableJre = "$urlCache/windows/portable_jre_${versionJre}_64bit.zip" $sha1ProtableJre = "6830524ec8b16742f956897abb6b6f5ef890a1c2" $urlOfficialEmscripten = "https://github.com/kripken/emscripten/archive/$version.zip" $urlCacheEmscripten = "$urlCache/windows/emscripten-$version.zip" -$sha1Emscripten = "22d78a0af48b50271ab183fd3d8ea2f9ba311ee7" +$sha1Emscripten = "3721DC133824BA59CDBDFC93704D47CE265F2AFE" $installLocationEmsdk = "C:\\Utils\\emsdk" $temp = "C:\Windows\Temp" @@ -84,35 +89,33 @@ function Install { New-Item -ItemType directory -Force -Path "$installLocationEmsdk" -Install $urlOfficialEmscriptenLlvm $urlCacheEmscriptenLlvm $sha1EmscriptenLlvm "$temp\emscripten-llvm-e$version.zip" "$installLocationEmsdk\emscripten-llvm-e$version" +Install $urlWasmBinariesExternal $urlWasmBinariesCache $sha1WasmBinaries "$temp\wasm-binaries.$version.zip" "$installLocationEmsdk\emscripten-llvm-e$version" Install $urlOfficialNode $urlCacheNode $sha1Node "$temp\node-v$versionNode-win-x64.zip" "$installLocationEmsdk" -Install $urlOfficialWinPython $urlCacheWinPython $sha1WinPython "$temp\WinPython-64bit-$versionWinPython.1Zero.zip" "$installLocationEmsdk" +Install $urlOfficialWinPython $urlCacheWinPython $sha1WinPython "$temp\python-$versionWinPython-embed-amd64-patched.zip" "$installLocationEmsdk\python-$versionWinPython-embed-amd64-patched" Install $urlOfficialProtableJre $urlCacheProtableJre $sha1ProtableJre "$temp\portable_jre_$versionJre_64bit.zip" "$installLocationEmsdk" Install $urlOfficialEmscripten $urlCacheEmscripten $sha1Emscripten "$temp\emscripten-$version.zip" "$installLocationEmsdk" cd $installLocationEmsdk -"LLVM_ROOT='$installLocationEmsdk\\emscripten-llvm-e$version'" | Out-File '.emscripten' -Encoding ASCII -"EMSCRIPTEN_NATIVE_OPTIMIZER='$installLocationEmsdk\\emscripten-llvm-e$version\\optimizer'" | Out-File '.emscripten' -Append -Encoding ASCII -"BINARYEN_ROOT='$installLocationEmsdk\\emscripten-llvm-e$version\\binaryen'" | Out-File '.emscripten' -Append -Encoding ASCII -"NODE_JS='$installLocationEmsdk\\node-v$versionNode-win-x64\\bin\\node'" | Out-File '.emscripten' -Append -Encoding ASCII -"EMSCRIPTEN_ROOT='$installLocationEmsdk\emscripten-$version'" | Out-File '.emscripten' -Append -Encoding ASCII -"SPIDERMONKEY_ENGINE = ''" | Out-File '.emscripten' -Append -Encoding ASCII -"V8_ENGINE = ''" | Out-File '.emscripten' -Append -Encoding ASCII +"LLVM_ROOT='$installLocationEmsdk\\emscripten-llvm-e$version\\install\\bin'" | Out-File '.emscripten' -Encoding ASCII +"BINARYEN_ROOT='$installLocationEmsdk\\emscripten-llvm-e$version\\install'" | Out-File '.emscripten' -Append -Encoding ASCII +"PYTHON='$installLocationEmsdk\\python-$versionWinPython-embed-amd64-patched\\python.exe'" | Out-File '.emscripten' -Append -Encoding ASCII +"NODE_JS='$installLocationEmsdk\\node-v$versionNode-win-x64\\bin\\node.exe'" | Out-File '.emscripten' -Append -Encoding ASCII +"EMSCRIPTEN_ROOT='$installLocationEmsdk\\emscripten-llvm-e$version\\install\\emscripten'" | Out-File '.emscripten' -Append -Encoding ASCII +"JAVA='$installLocationEmsdk\\Java64'" | Out-File '.emscripten' -Append -Encoding ASCII "TEMP_DIR = '/tmp'" | Out-File '.emscripten' -Append -Encoding ASCII "COMPILER_ENGINE = NODE_JS" | Out-File '.emscripten' -Append -Encoding ASCII "JS_ENGINES = [NODE_JS]" | Out-File '.emscripten' -Append -Encoding ASCII Set-EnvironmentVariable "EMSDK" "$installLocationEmsdk" Set-EnvironmentVariable "EM_CONFIG" "$installLocationEmsdk\.emscripten" -Set-EnvironmentVariable "EMSDK_LLVM_ROOT" "$installLocationEmsdk\emscripten-llvm-e$version" -Set-EnvironmentVariable "EMSCRIPTEN_NATIVE_OPTIMIZER" "$installLocationEmsdk\emscripten-llvm-e$version\optimizer.exe" -Set-EnvironmentVariable "BINARYEN_ROOT" "$installLocationEmsdk\emscripten-llvm-e$version\binaryen" +Set-EnvironmentVariable "EMSDK_LLVM_ROOT" "$installLocationEmsdk\emscripten-llvm-e$version\install\bin" +Set-EnvironmentVariable "BINARYEN_ROOT" "$installLocationEmsdk\emscripten-llvm-e$version\install\" Set-EnvironmentVariable "EMSDK_NODE" "$installLocationEmsdk\node$versionNode-win-x64\bin\node.exe" -Set-EnvironmentVariable "EMSDK_PYTHON" "$installLocationEmsdk\WinPython-64bit-$versionWinPython.1Zero\python-$versionWinPython.amd64\python.exe" +Set-EnvironmentVariable "EMSDK_PYTHON" "$installLocationEmsdk\python-$versionWinPython-embed-amd64-patched\python.exe" Set-EnvironmentVariable "EMSDK_JAVA_HOME" "$installLocationEmsdk\java64" Set-EnvironmentVariable "EMSCRIPTEN" "$installLocationEmsdk\emscripten-$version" -Set-EnvironmentVariable "EMSCRIPTEN_ROOT" "$installLocationEmsdk\emscripten-$version" -Set-EnvironmentVariable "EMSDK_PATH" "$installLocationEmsdk\emscripten-$version;$installLocationEmsdk;$installLocationEmsdk\node$versionNode-win-x64\bin;$installLocationEmsdk\emscripten-llvm-e$version;$installLocationEmsdk\WinPython-64bit-$versionWinPython.1Zero\python-$versionWinPython.amd64;$installLocationEmsdk\java64\bin" +Set-EnvironmentVariable "EMSCRIPTEN_ROOT" "$installLocationEmsdk\emscripten-llvm-e$version\install\emscripten" +Set-EnvironmentVariable "EMSDK_PATH" "$installLocationEmsdk\emscripten-llvm-e$version\install\emscripten;$installLocationEmsdk\node$versionNode-win-x64\bin;$installLocationEmsdk\emscripten-llvm-e$version\install\bin;$installLocationEmsdk\python-$versionWinPython-embed-amd64-patched;$installLocationEmsdk\java64\bin" Write-Output "emsdk = $version" >> ~/versions.txt Write-Output "emsdk llvm = $version" >> ~/versions.txt diff --git a/coin/provisioning/common/windows/install-msys2.ps1 b/coin/provisioning/common/windows/install-msys2.ps1 index 0c4a9680..b26df151 100644 --- a/coin/provisioning/common/windows/install-msys2.ps1 +++ b/coin/provisioning/common/windows/install-msys2.ps1 @@ -1,6 +1,6 @@ ############################################################################ ## -## Copyright (C) 2019 The Qt Company Ltd. +## Copyright (C) 2020 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -61,8 +61,13 @@ Extract-tar_gz $PackagePath $TargetLocation $msys = "$TargetLocation\$folder\msys2_shell.cmd" # install perl -Run-Executable "$msys" "`"-l`" `"-c`" `"rm -rf /etc/pacman.d/gnupg;pacman-key --init;pacman-key --populate msys2;pacman -S --noconfirm perl make`"" -Run-Executable "$msys" "`"-l`" `"-c`" `"cpan -i Text::Template Test::More`"" +# Run these without 'Run-Executable' function. When using the function the gpg-agent will lock the needed tmp*.tmp file. +cmd /c "$msys `"-l`" `"-c`" `"rm -rf /etc/pacman.d/gnupg;pacman-key --init;pacman-key --populate msys2;pacman -S --noconfirm perl make`"" +Start-Sleep -s 30 +cmd /c "$msys `"-l`" `"-c`" `"cpan -i Text::Template Test::More`"" + +if (Get-Process -Name "gpg-agent" -ErrorAction SilentlyContinue) { Stop-Process -Force -Name gpg-agent } +if (Get-Process -Name "dirmngr" -ErrorAction SilentlyContinue) { Stop-Process -Force -Name dirmngr } Write-Host "Cleaning $PackagePath.." Remove-Item -Recurse -Force -Path "$PackagePath" 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 50eea33b..639c82fd 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 @@ -169,6 +169,8 @@ installPackages+=(git-lfs) installPackages+=(chrpath) installPackages+=(gawk) installPackages+=(texinfo) +# Needed for Poppler test in QtWebEngine +installPackages+=(libpoppler-cpp-dev) # Needed for qtwebkit installPackages+=(ruby) installPackages+=(libxslt1-dev) diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-gcc.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-gcc.sh index 947583da..6c6a90c8 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-gcc.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-gcc.sh @@ -5,4 +5,4 @@ set -ex # shellcheck source=../common/linux/gcc.sh source "${BASH_SOURCE%/*}/../common/linux/gcc.sh" -InstallGCC 9.1.0 50 3953fa0d34a467630088d2a43603f74a36a80468 ded538076858926d361af790d59c1f8440dd29b2 +InstallGCC 9.2.0 50 2b3873263d4d6b09b37102078d80dcd7016b9392 44975966b15bca922ba64efa8ec3257726a79153 diff --git a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/01-install_telegraf.sh b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/01-install_telegraf.sh index 729f9003..729f9003 100755 --- a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/01-install_telegraf.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/01-install_telegraf.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/01-systemsetup.sh index d3724ceb..d3724ceb 100755 --- a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/01-systemsetup.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/01-systemsetup.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/02-disable-ntp.sh b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/02-disable-ntp.sh index 38707a8a..38707a8a 100755 --- a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/02-disable-ntp.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/02-disable-ntp.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/02-zypperpackages.sh b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/02-zypperpackages.sh index d1f3050f..d1f3050f 100755 --- a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/02-zypperpackages.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/02-zypperpackages.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/08-libclang.sh b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/08-libclang.sh index bbe2b4b4..bbe2b4b4 100755 --- a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/08-libclang.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/08-libclang.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/08-pythondev.sh b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/08-pythondev.sh index 12dabace..ab966a02 100755 --- a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/08-pythondev.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/08-pythondev.sh @@ -5,7 +5,7 @@ set -ex -sudo zypper -nq install python-devel python-virtualenv +sudo zypper -nq install python-devel python-xml # install python3 sudo zypper -nq install python3-base python3 python3-pip python3-devel python3-virtualenv python3-wheel diff --git a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/09-cmake.sh b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/09-cmake.sh index 5eb53566..5eb53566 100755 --- a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/09-cmake.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/09-cmake.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/09-install-openssl.sh b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/09-install-openssl.sh index 4f1d3768..4f1d3768 100755 --- a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/09-install-openssl.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/09-install-openssl.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/18-icc.sh b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/18-icc.sh index 7ab8528a..7ab8528a 100755 --- a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/18-icc.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/18-icc.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/22-mqtt_broker.sh b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/22-mqtt_broker.sh index e677427f..e677427f 100755 --- a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/22-mqtt_broker.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/22-mqtt_broker.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/55-emsdk.sh b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/55-emsdk.sh index 44cf1b80..44cf1b80 100755 --- a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/55-emsdk.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/55-emsdk.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/90-squish.sh b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/90-squish.sh index e4281588..e4281588 100755 --- a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/90-squish.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/90-squish.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/99-unset-proxy.sh b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/99-unset-proxy.sh index 5ff78055..5ff78055 100755 --- a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/99-unset-proxy.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/99-unset-proxy.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/99-version.sh b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/99-version.sh index 03565da2..03565da2 100755 --- a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/99-version.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/99-version.sh diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/26-pkgconfig.sh b/coin/provisioning/qtci-macos-10.13-x86_64/26-pkgconfig.sh new file mode 100755 index 00000000..9362a345 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.13-x86_64/26-pkgconfig.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash +# Install pkgconfig + +set -ex + +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/macos/pkgconfig.sh" diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/27-libusb.sh b/coin/provisioning/qtci-macos-10.13-x86_64/27-libusb.sh new file mode 100755 index 00000000..acc7ad4f --- /dev/null +++ b/coin/provisioning/qtci-macos-10.13-x86_64/27-libusb.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash +# Install libusb + +set -ex + +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/macos/libusb.sh" diff --git a/coin/provisioning/qtci-windows-10-x86_64/00-disable-clean-manager.ps1 b/coin/provisioning/qtci-windows-10-x86_64/00-disable-clean-manager.ps1 deleted file mode 100644 index 1dc08d21..00000000 --- a/coin/provisioning/qtci-windows-10-x86_64/00-disable-clean-manager.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\disable-clean-manager.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw810.ps1 b/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw810.ps1 new file mode 100644 index 00000000..fa8edb85 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw810.ps1 @@ -0,0 +1,11 @@ +. "$PSScriptRoot\..\common\windows\install-mingw.ps1" + +# This script will install MinGW 8.1.0 + +$release = "i686-8.1.0-release-posix-dwarf-rt_v6-rev0" +$sha1 = "dd4f34f473e84c79b6b446adb3a5fac7919ba9cb" +$suffix = "_i686" + +InstallMinGW $release $sha1 $suffix + + diff --git a/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw810_64.ps1 b/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw810_64.ps1 new file mode 100644 index 00000000..b712c2b3 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw810_64.ps1 @@ -0,0 +1,10 @@ +. "$PSScriptRoot\..\common\windows\install-mingw.ps1" + +# This script will install 64-bit MinGW 8.1.0 + +$release = "x86_64-8.1.0-release-posix-seh-rt_v6-rev0" + +$sha1 = "5aa456654a6ce77249c27888b5d0f856fc011b9c" + +InstallMinGW $release $sha1 + diff --git a/coin/provisioning/qtci-windows-7-x86/09-install-mingw810.ps1 b/coin/provisioning/qtci-windows-7-x86/09-install-mingw810.ps1 new file mode 100644 index 00000000..fa8edb85 --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86/09-install-mingw810.ps1 @@ -0,0 +1,11 @@ +. "$PSScriptRoot\..\common\windows\install-mingw.ps1" + +# This script will install MinGW 8.1.0 + +$release = "i686-8.1.0-release-posix-dwarf-rt_v6-rev0" +$sha1 = "dd4f34f473e84c79b6b446adb3a5fac7919ba9cb" +$suffix = "_i686" + +InstallMinGW $release $sha1 $suffix + + diff --git a/qt3d b/qt3d -Subproject dec1f5912acb991985e96ca2cb7e5c265c737a6 +Subproject 50390aefe6f990aa2b959efd2090b59fef09191 diff --git a/qtactiveqt b/qtactiveqt -Subproject 13bbc108561b985af5a8fc0b8d58654f9a4cfa8 +Subproject a0ddb6ace7a8cb9114d01d64e0722b0e00e5b0b diff --git a/qtandroidextras b/qtandroidextras -Subproject 6ffb02a7ea1d37ea99ded2c06802fd11cb10ef0 +Subproject aa346dcc8d8fbab9f5877d4822c06a92f521ce7 diff --git a/qtbase b/qtbase -Subproject e03a3882bea83d19879b30e312cc1d24520ed54 +Subproject e0a78bf4501c3102578d2de02c95418fa5bb461 diff --git a/qtcharts b/qtcharts -Subproject c9d0d5dbda60a6cf704a5e5c9af42083be7766b +Subproject 7cdded63b5d9d6b81c9d03a2f39d94d7b5230cc diff --git a/qtconnectivity b/qtconnectivity -Subproject 0de627e44fc74c6fbacf64b40a01408d1114907 +Subproject 35fe7d452d5b85eabe1c3ec9d09019fe4f3e2d2 diff --git a/qtdatavis3d b/qtdatavis3d -Subproject 1ae0fae9ed230ccb274513b86b89cbf4940e145 +Subproject 24c043fbffdbd7c0e060f05f67ad28824ac05e6 diff --git a/qtdeclarative b/qtdeclarative -Subproject 560bc348d86aba6cef5fdf88bc9d7304dd914bc +Subproject 7513e896726f0dfc6e290b638c83ae45e4deb88 diff --git a/qtdoc b/qtdoc -Subproject f696fd45621b21abf00ba2047ab2ee51fe509ae +Subproject 1c7c69619028bf5247309d49a8edd9359ef6649 diff --git a/qtgamepad b/qtgamepad -Subproject 042d2e9a4f7bb18fbbf7aa16583384eeda0c4b5 +Subproject 996ccf5bbacab0d16cbd961987c08385279ad6c diff --git a/qtgraphicaleffects b/qtgraphicaleffects -Subproject 399f29fb3bda74d0f0c500efafc0d988da0589d +Subproject 7665821bc4baed9c6595d22dcaf2857e2dda77f diff --git a/qtimageformats b/qtimageformats -Subproject 1eddf7d2c2e0e7c11c10e9f52a8e90c2f8dc4be +Subproject 26c548096b8f77b0e2f0cf0602a64d65e7958d6 diff --git a/qtlocation b/qtlocation -Subproject b36cd5690539d29c208afa03babf9eda7b30b10 +Subproject 36070d457cdcfc4d0a2629694bb0b34ae8a354b diff --git a/qtlottie b/qtlottie -Subproject 798be5abdb7d6e73288780c9ee03c10550dde07 +Subproject f5cc3184f30c9fa1b81d931430aaa4f6f23267a diff --git a/qtmacextras b/qtmacextras -Subproject d4728d6e95c5bb1662037b476a821eb5103018e +Subproject 66a5de12b601e3de8ec336ae42c795002f539a8 diff --git a/qtmultimedia b/qtmultimedia -Subproject c3b9a8a6bc2a3dc3907f1cc349a7279916b599a +Subproject f3c9161147134bcc848f662947c5a59f3b48e94 diff --git a/qtnetworkauth b/qtnetworkauth -Subproject a1508b27358e2fb5437358dd189ad0fc6401ad3 +Subproject 5f9fbc2a6e3f06ae388af259e074b00c491c163 diff --git a/qtpurchasing b/qtpurchasing -Subproject 9af9f425f8847ea605bded17a8aa55aca27a6a6 +Subproject c9a2a6dcb858d2de5c908914cfe6564fa074046 diff --git a/qtquick3d b/qtquick3d -Subproject ddf8ff446050cb0c4e5c01a2b59d57fe7fa5ca1 +Subproject b9f82c503a9fa5b861f683763f7c89952fc86c2 diff --git a/qtquickcontrols b/qtquickcontrols -Subproject 1b51ca3ce57a13990be2aeac910b2fab3e07351 +Subproject 44c239aa1b9ff3a349f9c88f8ad3abd16aa48f3 diff --git a/qtquickcontrols2 b/qtquickcontrols2 -Subproject 6d6919b6f09210dc7acf6b2ff4849c5e39b0895 +Subproject 7d4f8365c1e50759dd3942b006f2ee73ce9cb11 diff --git a/qtquicktimeline b/qtquicktimeline -Subproject 45232bb4ad302647c6bb01163d002384a7cc562 +Subproject 05c2a52042e8ac7f73da643bfa9107c10c34653 diff --git a/qtremoteobjects b/qtremoteobjects -Subproject 773dfaff3ea5518f142ab3b78493de3662380d2 +Subproject 0b98fb2b3f59143ff8f71f7f53309e153e5af81 diff --git a/qtscript b/qtscript -Subproject d51d7426c7cdafaf1a6d3273080dad239699486 +Subproject a5c819cef6efa06c8273c9b5e5e6406a0ae9c46 diff --git a/qtscxml b/qtscxml -Subproject bc5e5b8516b45afd9c4219ee3eb51cff4a922a8 +Subproject db8b84e117905b4792524aacddba314ae4a2f7b diff --git a/qtsensors b/qtsensors -Subproject c5f0a61fb2c1345f44c8f8fa76f78b34ed6e6ca +Subproject 5acdc122a455bae920e9054bec4f3d769cce105 diff --git a/qtserialbus b/qtserialbus -Subproject e006ff071d5f1609ca3d458b921814954322c24 +Subproject 1d5fa84ed9b450954a0d82e598570ec2107a595 diff --git a/qtserialport b/qtserialport -Subproject f7e5700d6a44482f264ef603e0bf99b89694e6e +Subproject c24fd46221b98eb2e9248765ae32c0fccbebcd3 diff --git a/qtspeech b/qtspeech -Subproject 362b559576c0a28876c6cdeb4796843e55afcff +Subproject 387f4b6b379ac82ff4625ced5a2f1af7c4ee865 diff --git a/qtsvg b/qtsvg -Subproject 09f83c7a86b90b613e253acfc2746cbddf31602 +Subproject a26b32e157e4e7cd8ce90b933c4c45ed5360b38 diff --git a/qttools b/qttools -Subproject 7ce13b57310c4a0e3d1a2dc008fb40fa307b2e4 +Subproject b3cdd63d4bdaea09222fb93ffcd5104a2dc0bf2 diff --git a/qttranslations b/qttranslations -Subproject 17dc9a39faea23696f978be1b3fcb0b71b92c4e +Subproject b0be8ca652f732439e562f75be372730e245204 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard -Subproject 92e7e8567d0a932b47353f59e4b62ea0d5c1aff +Subproject 70105b9b43fecff7cb0ce7a0c84b314e10e8143 diff --git a/qtwayland b/qtwayland -Subproject 2e9771ae81597d4c85d8dc103dbf55fe8870764 +Subproject 83fdd4018d05d658787c0cd49fdb766bff10123 diff --git a/qtwebchannel b/qtwebchannel -Subproject 682f50e5669b2e2eed69ec588017d6b7b8f2a67 +Subproject e38d01e78530048339722f711d58d1404b2484c diff --git a/qtwebengine b/qtwebengine -Subproject 9136c16ae640aec8ab393237ce1a1c7f89c8bb1 +Subproject 9e56f570e31a0ef18e544bb21dfddebfe43ec2d diff --git a/qtwebglplugin b/qtwebglplugin -Subproject 3b97ba6f80c83a9d3827b9dbf85466b84d5a650 +Subproject 219abce4c8fcfbbae13b66c142ee0fd1afd0431 diff --git a/qtwebsockets b/qtwebsockets -Subproject 66ea748c2ba1fa35c78c5d55742a982976b0743 +Subproject 593466b4b902536743050e088a0e4eee9f007c7 diff --git a/qtwebview b/qtwebview -Subproject 360dd0413632535bb984e6e6bcb22ede1b401ad +Subproject a15f2b83c42286ab7f4b4c406e4795b6a1a9a13 diff --git a/qtwinextras b/qtwinextras -Subproject 8d2de7d9ee734719b4943fa3ea40b8e53aaa380 +Subproject acb8cbb19c8cda386e02e1c898291cc95e1be03 diff --git a/qtx11extras b/qtx11extras -Subproject fae76c4ae15fdc282a2b0f17bd32f3fdb223d80 +Subproject e05196b4648e8ea28bbeea3491754c1c6db4a60 diff --git a/qtxmlpatterns b/qtxmlpatterns -Subproject a7ffa65d67f1f506043ae0faf914817328638e3 +Subproject 84b9bd01cbd7a066f3cb34cb7f6c1094aa2346b |