diff options
379 files changed, 3857 insertions, 2871 deletions
diff --git a/.gitmodules b/.gitmodules index acf62817..f9c11a36 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,60 +1,60 @@ [submodule "qtbase"] path = qtbase url = ../qtbase.git - branch = 5.12.8 + branch = 5.15.0 status = essential [submodule "qtsvg"] depends = qtbase path = qtsvg url = ../qtsvg.git - branch = 5.12.8 + branch = 5.15.0 status = addon [submodule "qtdeclarative"] depends = qtbase recommends = qtsvg path = qtdeclarative url = ../qtdeclarative.git - branch = 5.12.8 + branch = 5.15.0 status = essential [submodule "qtactiveqt"] depends = qtbase path = qtactiveqt url = ../qtactiveqt.git - branch = 5.12.8 + branch = 5.15.0 status = addon [submodule "qtscript"] depends = qtbase recommends = qttools path = qtscript url = ../qtscript.git - branch = 5.12.8 + branch = 5.15.0 status = deprecated [submodule "qtmultimedia"] depends = qtbase recommends = qtdeclarative path = qtmultimedia url = ../qtmultimedia.git - branch = 5.12.8 + branch = 5.15.0 status = essential [submodule "qttools"] depends = qtbase recommends = qtdeclarative qtactiveqt path = qttools url = ../qttools.git - branch = 5.12.8 + branch = 5.15.0 status = essential [submodule "qtxmlpatterns"] depends = qtbase recommends = qtdeclarative path = qtxmlpatterns url = ../qtxmlpatterns.git - branch = 5.12.8 - status = addon + branch = 5.15.0 + status = deprecated [submodule "qttranslations"] depends = qttools path = qttranslations url = ../qttranslations.git - branch = 5.12.8 + branch = 5.15.0 status = essential priority = 30 [submodule "qtdoc"] @@ -62,7 +62,7 @@ recommends = qtmultimedia qtquickcontrols qtquickcontrols2 path = qtdoc url = ../qtdoc.git - branch = 5.12.8 + branch = 5.15.0 status = essential priority = 40 [submodule "qtrepotools"] @@ -83,14 +83,14 @@ recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport path = qtlocation url = ../qtlocation.git - branch = 5.12.8 + branch = 5.15.0 status = addon [submodule "qtsensors"] depends = qtbase recommends = qtdeclarative path = qtsensors url = ../qtsensors.git - branch = 5.12.8 + branch = 5.15.0 status = addon [submodule "qtsystems"] depends = qtbase @@ -123,185 +123,204 @@ recommends = qtdeclarative qtandroidextras path = qtconnectivity url = ../qtconnectivity.git - branch = 5.12.8 + branch = 5.15.0 status = addon [submodule "qtwayland"] depends = qtbase recommends = qtdeclarative path = qtwayland url = ../qtwayland.git - branch = 5.12.8 + branch = 5.15.0 status = addon [submodule "qt3d"] depends = qtbase recommends = qtdeclarative qtimageformats qtgamepad path = qt3d url = ../qt3d.git - branch = 5.12.8 + branch = 5.15.0 status = addon [submodule "qtimageformats"] depends = qtbase path = qtimageformats url = ../qtimageformats.git - branch = 5.12.8 + branch = 5.15.0 status = addon [submodule "qtgraphicaleffects"] depends = qtdeclarative path = qtgraphicaleffects url = ../qtgraphicaleffects.git - branch = 5.12.8 - status = addon + branch = 5.15.0 + status = essential [submodule "qtquickcontrols"] depends = qtdeclarative recommends = qtgraphicaleffects path = qtquickcontrols url = ../qtquickcontrols.git - branch = 5.12.8 + branch = 5.15.0 status = addon [submodule "qtserialbus"] - depends = qtserialport + depends = qtbase + recommends = qtserialport path = qtserialbus url = ../qtserialbus.git - branch = 5.12.8 + branch = 5.15.0 status = addon [submodule "qtserialport"] depends = qtbase path = qtserialport url = ../qtserialport.git - branch = 5.12.8 + branch = 5.15.0 status = addon [submodule "qtx11extras"] depends = qtbase path = qtx11extras url = ../qtx11extras.git - branch = 5.12.8 + branch = 5.15.0 status = addon [submodule "qtmacextras"] depends = qtbase path = qtmacextras url = ../qtmacextras.git - branch = 5.12.8 + branch = 5.15.0 status = addon [submodule "qtwinextras"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtwinextras url = ../qtwinextras.git - branch = 5.12.8 + branch = 5.15.0 status = addon [submodule "qtandroidextras"] depends = qtbase path = qtandroidextras url = ../qtandroidextras.git - branch = 5.12.8 + branch = 5.15.0 status = addon [submodule "qtwebsockets"] depends = qtbase recommends = qtdeclarative path = qtwebsockets url = ../qtwebsockets.git - branch = 5.12.8 + branch = 5.15.0 status = addon [submodule "qtwebchannel"] depends = qtbase recommends = qtdeclarative qtwebsockets path = qtwebchannel url = ../qtwebchannel.git - branch = 5.12.8 + branch = 5.15.0 status = addon [submodule "qtwebengine"] depends = qtdeclarative recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel qttools path = qtwebengine url = ../qtwebengine.git - branch = 5.12.8 + branch = 5.15.0 status = addon priority = 10 [submodule "qtcanvas3d"] depends = qtdeclarative path = qtcanvas3d url = ../qtcanvas3d.git - branch = 5.12.8 - status = addon + branch = dev + status = ignore [submodule "qtwebview"] depends = qtdeclarative recommends = qtwebengine path = qtwebview url = ../qtwebview.git - branch = 5.12.8 + branch = 5.15.0 status = addon [submodule "qtquickcontrols2"] depends = qtgraphicaleffects recommends = qtimageformats path = qtquickcontrols2 url = ../qtquickcontrols2.git - branch = 5.12.8 + branch = 5.15.0 status = essential [submodule "qtpurchasing"] depends = qtbase recommends = qtdeclarative qtandroidextras path = qtpurchasing url = ../qtpurchasing.git - branch = 5.12.8 + branch = 5.15.0 status = addon [submodule "qtcharts"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtcharts url = ../qtcharts.git - branch = 5.12.8 + branch = 5.15.0 status = addon [submodule "qtdatavis3d"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtdatavis3d url = ../qtdatavis3d.git - branch = 5.12.8 + branch = 5.15.0 status = addon [submodule "qtvirtualkeyboard"] depends = qtbase qtdeclarative qtsvg recommends = qtmultimedia qtquickcontrols path = qtvirtualkeyboard url = ../qtvirtualkeyboard.git - branch = 5.12.8 + branch = 5.15.0 status = addon [submodule "qtgamepad"] depends = qtbase recommends = qtdeclarative path = qtgamepad url = ../qtgamepad.git - branch = 5.12.8 + branch = 5.15.0 status = addon [submodule "qtscxml"] depends = qtbase qtdeclarative path = qtscxml url = ../qtscxml.git - branch = 5.12.8 + branch = 5.15.0 status = addon [submodule "qtspeech"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtspeech url = ../qtspeech.git - branch = 5.12.8 + branch = 5.15.0 status = addon [submodule "qtnetworkauth"] depends = qtbase path = qtnetworkauth url = ../qtnetworkauth.git - branch = 5.12.8 + branch = 5.15.0 status = addon [submodule "qtremoteobjects"] depends = qtbase recommends = qtdeclarative path = qtremoteobjects url = ../qtremoteobjects.git - branch = 5.12.8 + branch = 5.15.0 status = addon [submodule "qtwebglplugin"] depends = qtbase qtwebsockets recommends = qtdeclarative path = qtwebglplugin url = ../qtwebglplugin.git - branch = 5.12.8 + branch = 5.15.0 + status = addon +[submodule "qtlottie"] + depends = qtbase qtdeclarative + path = qtlottie + url = ../qtlottie.git + branch = 5.15.0 + status = addon +[submodule "qtquicktimeline"] + depends = qtbase qtdeclarative + path = qtquicktimeline + url = ../qtquicktimeline + branch = 5.15.0 + status = addon +[submodule "qtquick3d"] + depends = qtbase qtdeclarative + path = qtquick3d + url = ../qtquick3d.git + branch = 5.15.0 status = addon diff --git a/_clang-format b/_clang-format index c64ae331..589baff3 100644 --- a/_clang-format +++ b/_clang-format @@ -42,7 +42,7 @@ BraceWrapping: AfterFunction: true AfterNamespace: false AfterObjCDeclaration: false - AfterStruct: false + AfterStruct: true AfterUnion: false BeforeCatch: false BeforeElse: false diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index 9bb0d12f..553232bd 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -1,181 +1,149 @@ +Version: 2 +Configurations: - - Template: 'qtci-windows-10-x86_64-10' + Template: 'qtci-windows-10-x86_64-17' Compiler: 'MSVC2015' - 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%' + 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' - 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++' + 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-10' + Template: 'qtci-windows-10-x86_64-17' Target arch: 'x86' - Compiler: 'MSVC2017' + 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_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%' + 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-10' + Template: 'qtci-windows-10-x86_64-17' Compiler: 'MSVC2015' - 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_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64%' + Features: ['Packaging', '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-10' + 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-10' + 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-10' - 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%' + 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-10' - Target os: 'Android_ANY' - Target arch: 'x86' - Compiler: 'Mingw73' - Target compiler: 'Clang' - Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -opengl es2 -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r19c -android-arch x86' -- - Template: 'qtci-linux-Ubuntu-16.04-x86_64-2' + Template: 'qtci-linux-Ubuntu-18.04-x86_64' Compiler: 'GCC' Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -R . -qtlibinfix TestInfix -qtnamespace TestNamespace -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib' - Template: 'qtci-linux-Ubuntu-18.04-x86_64' Compiler: 'GCC' - 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' Features: ['OutOfSourceBuild', 'Documentation'] Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -R . -qtlibinfix TestInfix -qtnamespace TestNamespace -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib' -- - Template: 'qtci-linux-Ubuntu-18.04-x86_64' - Compiler: 'GCC' - Features: ['DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -no-gui -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib' -- - Template: 'qtci-linux-Ubuntu-18.04-x86_64' - Compiler: 'GCC' - Features: ['DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -no-opengl -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib' - - Template: 'qtci-linux-openSUSE-42.3-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-42.3-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-42.3-x86_64' + Template: 'qtci-linux-openSUSE-15.1-x86_64' Target os: 'WebAssembly' Compiler: 'GCC' Features: ['Packaging', 'DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -release -static -nomake tests -nomake examples -no-sql-mysql -no-pch -no-dbus -no-headersclean -no-ssl -no-warnings-are-errors -no-feature-thread -xplatform wasm-emscripten' - - Template: 'qtci-linux-SLES-12-x86_64' - Compiler: 'GCC' - Features: ['DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -no-sql-mysql -no-pch -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib' -- Template: 'qtci-linux-SLES-15-x86_64' Compiler: 'GCC' Features: ['DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -no-sql-mysql -no-pch -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib' - - Template: 'qtci-linux-RHEL-7.4-x86_64' + 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' Features: ['Packaging'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -release -separate-debug-info -nomake tests -nomake examples -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include' + Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -force-debug-info -separate-debug-info -nomake tests -nomake examples -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include' - Template: 'qtci-macos-10.14-x86_64' Compiler: 'Clang' - Features: ['DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -release -separate-debug-info -nomake tests -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include' + Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -release -nomake tests -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include' - - Template: 'qtci-macos-10.12-x86_64-9' + Template: 'qtci-macos-10.14-x86_64' Compiler: 'Clang' + Features: ['DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -developer-build -release -no-pch -no-framework -qtnamespace TestNamespace -nomake tests -nomake examples -I/usr/local/opt/openssl/include' - - Template: 'qtci-macos-10.13-x86_64-2' + Template: 'qtci-macos-10.14-x86_64' Target os: 'IOS_ANY' Target arch: 'multi' Compiler: 'Clang' Features: ['Packaging', 'DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -nomake tests -no-icu -nomake examples -no-sql-mysql -no-sql-psql -plugin-sql-sqlite -static -xplatform macx-ios-clang' - - Template: 'qtci-macos-10.13-x86_64-2' - Target os: 'TvOS_ANY' - Target arch: 'multi' - Compiler: 'Clang' - Features: ['DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -nomake tests -nomake examples -no-sql-mysql -no-sql-psql -plugin-sql-sqlite -xplatform macx-tvos-clang' -- - Template: 'qtci-macos-10.13-x86_64-2' - Target os: 'WatchOS_ANY' - Target arch: 'multi' - 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-macos-10.13-x86_64-2' + Template: 'qtci-linux-RHEL-7.6-x86_64' Target os: 'Android_ANY' - Target arch: 'x86' + Target arch: 'multi' Compiler: 'Clang' Target compiler: 'Clang' Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host darwin-x86_64 -android-arch x86' -- - Template: 'qtci-linux-RHEL-7.4-x86_64' - Target os: 'Android_ANY' - Target arch: 'x86' - Compiler: 'GCC' - Target compiler: 'Clang' - Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-use-gold-linker -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host linux-x86_64 -android-arch x86' + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-use-gold-linker -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r20 -android-ndk-host linux-x86_64' - Template: 'qtci-linux-Ubuntu-18.04-x86_64' Target os: 'QEMU' Target arch: 'armv7' Compiler: 'GCC' - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-imx7-g++ -device-option CROSS_COMPILE=/opt/yocto-armv7/sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi- -device-option DISTRO_OPTS="hard-float boot2qt" -sysroot /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi -extprefix /home/qt/work/install -mysql_config /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi/usr/bin/mysql_config -psql_config /dev/null -tslib' + Environment variables: ['GST_PLUGIN_SCANNER=/opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi/usr/libexec/gstreamer-1.0/gst-plugin-scanner'] + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-imx7-g++ -device-option CROSS_COMPILE=/opt/yocto-armv7/sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi- -device-option DISTRO_OPTS="hard-float boot2qt" -sysroot /opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi -extprefix /home/qt/work/install -mysql_config /opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi/usr/bin/mysql_config -psql_config /dev/null -tslib' - Template: 'qtci-linux-Ubuntu-18.04-x86_64' Target os: 'QEMU' Target arch: 'arm64' Compiler: 'GCC' + Environment variables: ['GST_PLUGIN_SCANNER=/opt/yocto-arm64/sysroots/aarch64-poky-linux/usr/libexec/gstreamer-1.0/gst-plugin-scanner'] Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-generic-g++ -device-option CROSS_COMPILE=/opt/yocto-arm64/sysroots/x86_64-pokysdk-linux/usr/bin/aarch64-poky-linux/aarch64-poky-linux- -device-option DISTRO_OPTS=boot2qt -sysroot /opt/yocto-arm64/sysroots/aarch64-poky-linux -extprefix /home/qt/work/install -mysql_config /opt/yocto-arm64/sysroots/aarch64-poky-linux/usr/bin/mysql_config -psql_config /dev/null -tslib' - Template: 'qtci-linux-Ubuntu-18.04-x86_64' + Target os: 'QEMU' + Target arch: 'mips64' + Compiler: 'GCC' + Features: ['DisableTests'] + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-generic-g++ -device-option CROSS_COMPILE=/opt/yocto-mips64/sysroots/x86_64-pokysdk-linux/usr/bin/mips64-poky-linux/mips64-poky-linux- -device-option DISTRO_OPTS=boot2qt -sysroot /opt/yocto-mips64/sysroots/mips64-poky-linux -extprefix /home/qt/work/install -mysql_config /opt/yocto-mips64/sysroots/mips64-poky-linux/usr/bin/mysql_config -psql_config /dev/null -tslib' +- + Template: 'qtci-linux-Ubuntu-18.04-x86_64' Compiler: 'GCC' Features: ['TestOnly', 'LicenseCheck'] - - Template: 'qtci-linux-RHEL-7.4-x86_64' + Template: 'qtci-linux-RHEL-7.6-x86_64' Target os: 'INTEGRITY_11_04' Target arch: 'armv7' Compiler: 'GCC' Features: ['DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-use-gold-linker -opengl es2 -xplatform integrity-armv7-imx6' - - Template: 'qtci-linux-RHEL-7.4-x86_64' + Template: 'qtci-linux-RHEL-7.6-x86_64' Target os: 'QNX_700' Target arch: 'armv7' Compiler: 'GCC' Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-use-gold-linker -opengl es2 -no-sql-mysql -qpa qnx -xplatform qnx-armle-v7-qcc' + Configure arguments: '-opensource -confirm-license -verbose -extprefix /home/qt/work/install -release -nomake tests -nomake examples -no-use-gold-linker -opengl es2 -no-sql-mysql -qpa qnx -xplatform qnx-armle-v7-qcc' diff --git a/coin/platform_configs/flashing-wizard.yaml b/coin/platform_configs/flashing-wizard.yaml new file mode 100644 index 00000000..eff6e9f6 --- /dev/null +++ b/coin/platform_configs/flashing-wizard.yaml @@ -0,0 +1,23 @@ +Version: 2 +Module only: True +Configurations: + - + 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-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' + - + 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 -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-linux-Ubuntu-18.04-x86_64' + Compiler: 'GCC' + Features: ['TestOnly', 'LicenseCheck'] diff --git a/coin/platform_configs/installer-framework.yaml b/coin/platform_configs/installer-framework.yaml deleted file mode 100644 index 6f844c75..00000000 --- a/coin/platform_configs/installer-framework.yaml +++ /dev/null @@ -1,30 +0,0 @@ -Version: 2 -Module only: True -Configurations: -- - Template: 'qtci-windows-10-x86_64-10' - Compiler: 'MSVC2015' - Target arch: 'x86' - Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -nomake examples -nomake tests -accessibility -static -no-sql-sqlite -no-icu -mp -openssl-linked OPENSSL_LIBS="-llibssl_static -llibcrypto_static -lUser32 -lWs2_32 -lAdvapi32 -lCrypt32" -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -prefix c:\Users\qt\work\install' - Environment variables: ['TARGET_ARCHITECTURE=amd64_x86', 'PATH=%PATH%;%CI_JOM_PATH%;C:\Utils\gnuwin32\bin;'] - Environment script: ['%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat', 'amd64_x86'] -- - Template: 'qtci-macos-10.13-x86_64-2' - Compiler: 'Clang' - Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -nomake examples -nomake tests -accessibility -static -no-sql-sqlite -qt-zlib -qt-libpng -qt-libjpeg -no-cups -no-freetype -prefix /Users/qt/work/install' -- - Template: 'qtci-linux-RHEL-7.4-x86_64' - Compiler: 'GCC' - Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -nomake examples -nomake tests -accessibility -static -no-sql-sqlite -qt-zlib -qt-libpng -qt-libjpeg -no-cups -openssl-linked -qt-xcb -no-icu -no-libudev -qt-pcre -no-glib -no-egl -no-sm -qt-harfbuzz -prefix /home/qt/work/install OPENSSL_LIBS="{{.Env.OPENSSL_HOME}}/lib/libssl.a {{.Env.OPENSSL_HOME}}/lib/libcrypto.a -ldl -lpthread" -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/libs' -- - Template: 'qtci-linux-RHEL-7.4-x86_64' - Compiler: 'GCC' - Features: ['Documentation', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -nomake tests -qt-zlib -qt-libpng -qt-libjpeg -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib' -- - Template: 'qtci-linux-Ubuntu-18.04-x86_64' - Compiler: 'GCC' - Features: ['TestOnly', 'LicenseCheck'] diff --git a/coin/platform_configs/meta-boot2qt.yaml b/coin/platform_configs/meta-boot2qt.yaml new file mode 100644 index 00000000..95cc79c4 --- /dev/null +++ b/coin/platform_configs/meta-boot2qt.yaml @@ -0,0 +1,40 @@ +- + Template: 'qtci-linux-Ubuntu-18.04-x86_64' + Compiler: 'Yocto' + Target arch: 'TARGET1' +- + Template: 'qtci-linux-Ubuntu-18.04-x86_64' + Compiler: 'Yocto' + Target arch: 'TARGET2' +- + Template: 'qtci-linux-Ubuntu-18.04-x86_64' + Compiler: 'Yocto' + Target arch: 'TARGET3' +- + Template: 'qtci-linux-Ubuntu-18.04-x86_64' + Compiler: 'Yocto' + Target arch: 'TARGET4' +- + Template: 'qtci-linux-Ubuntu-18.04-x86_64' + Compiler: 'Yocto' + Target arch: 'TARGET5' +- + Template: 'qtci-linux-Ubuntu-18.04-x86_64' + Compiler: 'Yocto' + Target arch: 'TARGET6' +- + Template: 'qtci-linux-Ubuntu-18.04-x86_64' + Compiler: 'Yocto' + Target arch: 'TARGET7' +- + Template: 'qtci-linux-Ubuntu-18.04-x86_64' + Compiler: 'Yocto' + Target arch: 'TARGET8' +- + Template: 'qtci-linux-Ubuntu-18.04-x86_64' + Compiler: 'Yocto' + Target arch: 'TARGET9' +- + Template: 'qtci-linux-Ubuntu-18.04-x86_64' + Compiler: 'Yocto' + Target arch: 'TARGET10' diff --git a/coin/platform_configs/qdb.yaml b/coin/platform_configs/qdb.yaml new file mode 100644 index 00000000..544a1b90 --- /dev/null +++ b/coin/platform_configs/qdb.yaml @@ -0,0 +1,28 @@ +Version: 2 +Module only: True +Configurations: + - + 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-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%' + - + 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 -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 f93deed7..a0b69657 100644 --- a/coin/platform_configs/qt5.yaml +++ b/coin/platform_configs/qt5.yaml @@ -1,126 +1,115 @@ +Version: 2 +Configurations: - - Template: 'qtci-windows-10-x86_64-10' + 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-10' + 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 -debug-and-release -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -platform win32-g++' + Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -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-10' - 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 -debug-and-release -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -platform win32-g++' + Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -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-10' + 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-10' + 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-linux-RHEL-7.4-x86_64' + Template: 'qtci-windows-10-x86_64-17' Target os: 'Android_ANY' - Target arch: 'armv7' - Compiler: 'Clang' - Target compiler: 'Clang' - Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -no-use-gold-linker -sysconfdir /etc/xdg -opengl es2 -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host linux-x86_64 -android-arch armeabi-v7a -xplatform android-clang' -- - Template: 'qtci-linux-RHEL-7.4-x86_64' - Target os: 'Android_ANY' - Target arch: 'arm64' - Compiler: 'Clang' + Target arch: 'multi' + Compiler: 'Mingw' + Environment variables: ['PATH=C:\MINGW810\mingw64\bin;$PATH'] Target compiler: 'Clang' Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -no-use-gold-linker -sysconfdir /etc/xdg -opengl es2 -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host linux-x86_64 -android-arch arm64-v8a -xplatform android-clang' -- - Template: 'qtci-windows-10-x86_64-10' - Target os: 'Android_ANY' - Target arch: 'armv7' - Compiler: 'Mingw73' - Target compiler: 'Clang' - Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -opengl es2 -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r19c -android-arch armeabi-v7a' -- - Template: 'qtci-windows-10-x86_64-10' - Target os: 'Android_ANY' - Target arch: 'arm64' - Compiler: 'Mingw73' - Target compiler: 'Clang' - Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -opengl es2 -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r19c -android-arch arm64-v8a' -- - Template: 'qtci-macos-10.13-x86_64-2' - Target os: 'Android_ANY' - Target arch: 'armv7' - Compiler: 'Clang' - Target compiler: 'Clang' - Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host darwin-x86_64 -android-arch armeabi-v7a' + Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -opengl es2 -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r20' - Template: 'qtci-macos-10.13-x86_64-2' Target os: 'Android_ANY' - Target arch: 'arm64' + Target arch: 'multi' Compiler: 'Clang' Target compiler: 'Clang' Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host darwin-x86_64 -android-arch arm64-v8a' + Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r20 -android-ndk-host darwin-x86_64' - Template: 'qtci-macos-10.13-x86_64-2' Target os: 'QNX_700' Target arch: 'x86' Compiler: 'GCC' Features: ['DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake tests -nomake examples -no-use-gold-linker -opengl es2 -qpa qnx -xplatform qnx-x86-qcc' + 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-10' + 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 -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -opengl es2 -xplatform qnx-armle-v7-qcc' + 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-10' + 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 -prefix c:\Users\qt\work\install -release -opengl es2 -nomake tests -nomake examples -no-sql-mysql -xplatform qnx-aarch64le-qcc' + 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-10' + 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 -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -opengl es2 -xplatform qnx-x86-64-qcc' + 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' - - Template: 'qtci-linux-RHEL-7.4-x86_64' + Template: 'qtci-linux-RHEL-7.6-x86_64' Target os: 'QNX_700' Target arch: 'armv8' Compiler: 'GCC' Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-use-gold-linker -opengl es2 -qpa qnx -xplatform qnx-aarch64le-qcc' + 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-aarch64le-qcc' - - Template: 'qtci-linux-RHEL-7.4-x86_64' + Template: 'qtci-linux-RHEL-7.6-x86_64' Target os: 'QNX_700' Target arch: 'x86_64' Compiler: 'GCC' Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-use-gold-linker -opengl es2 -qpa qnx -xplatform qnx-x86-64-qcc' + 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-17' + Target os: 'WebAssembly' + 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' +- + Template: 'qtci-macos-10.13-x86_64-2' + Target os: 'WebAssembly' + Compiler: 'Clang' + Features: ['Packaging', 'DisableTests'] + Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake examples -nomake tests -no-feature-thread -static -no-dbus -no-headersclean -no-ssl -no-warnings-are-errors -no-pch -xplatform wasm-emscripten' diff --git a/coin/platform_configs/qtbase.yaml b/coin/platform_configs/qtbase.yaml index af68635a..a520e6ca 100644 --- a/coin/platform_configs/qtbase.yaml +++ b/coin/platform_configs/qtbase.yaml @@ -4,7 +4,7 @@ Target arch: 'armv7' Compiler: 'GCC' Features: ['DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-imx7-g++ -device-option CROSS_COMPILE=/opt/yocto-armv7/sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi- -device-option DISTRO_OPTS="hard-float boot2qt" -sysroot /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi -extprefix /home/qt/work/install -mysql_config /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi/usr/bin/mysql_config -psql_config /dev/null -tslib' + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-imx7-g++ -device-option CROSS_COMPILE=/opt/yocto-armv7/sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi- -device-option DISTRO_OPTS="hard-float boot2qt" -sysroot /opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi -extprefix /home/qt/work/install -mysql_config /opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi/usr/bin/mysql_config -psql_config /dev/null -tslib' - Template: 'qtci-linux-Ubuntu-18.04-x86_64' Target os: 'QEMU' @@ -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-10' + 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-42.3-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 e46597cd..6c232f2a 100644 --- a/coin/platform_configs/qtconnectivity.yaml +++ b/coin/platform_configs/qtconnectivity.yaml @@ -1,5 +1,5 @@ - - Template: 'qtci-windows-10-x86_64-10' + Template: 'qtci-windows-10-x86_64-17' Target os: 'WinRT_10' Target arch: 'x86_64' Compiler: 'MSVC2015' diff --git a/coin/platform_configs/qtdeclarative.yaml b/coin/platform_configs/qtdeclarative.yaml index 9327b92e..161875d8 100644 --- a/coin/platform_configs/qtdeclarative.yaml +++ b/coin/platform_configs/qtdeclarative.yaml @@ -3,7 +3,7 @@ Target os: 'QEMU' Target arch: 'armv7' Compiler: 'GCC' - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-imx7-g++ -device-option CROSS_COMPILE=/opt/yocto-armv7/sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi- -device-option DISTRO_OPTS="hard-float boot2qt" -sysroot /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi -extprefix /home/qt/work/install -mysql_config /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi/usr/bin/mysql_config -psql_config /dev/null -tslib' + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-imx7-g++ -device-option CROSS_COMPILE=/opt/yocto-armv7/sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi- -device-option DISTRO_OPTS="hard-float boot2qt" -sysroot /opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi -extprefix /home/qt/work/install -mysql_config /opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi/usr/bin/mysql_config -psql_config /dev/null -tslib' - Template: 'qtci-linux-Ubuntu-18.04-x86_64' Target os: 'QEMU' @@ -15,7 +15,7 @@ Target os: 'QEMU' Target arch: 'armv7' Compiler: 'GCC' - Configure arguments: '-opensource -confirm-license -R . -developer-build -device linux-imx7-g++ -device-option CROSS_COMPILE=/opt/yocto-armv7/sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi- -device-option DISTRO_OPTS="hard-float boot2qt" -extprefix /home/qt/work/install -mysql_config /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi/usr/bin/mysql_config -no-xcb -nomake examples -nomake tests -openssl -prefix /home/qt/work/install -psql_config /dev/null -sysroot /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi -tslib -verbose' + Configure arguments: '-opensource -confirm-license -R . -developer-build -device linux-imx7-g++ -device-option CROSS_COMPILE=/opt/yocto-armv7/sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi- -device-option DISTRO_OPTS="hard-float boot2qt" -extprefix /home/qt/work/install -mysql_config /opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi/usr/bin/mysql_config -no-xcb -nomake examples -nomake tests -openssl -prefix /home/qt/work/install -psql_config /dev/null -sysroot /opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi -tslib -verbose' - Template: 'qtci-linux-Ubuntu-18.04-x86_64' Target os: 'QEMU' diff --git a/coin/platform_configs/qtsaferenderer.yaml b/coin/platform_configs/qtsaferenderer.yaml index 14e0e953..246925fb 100644 --- a/coin/platform_configs/qtsaferenderer.yaml +++ b/coin/platform_configs/qtsaferenderer.yaml @@ -1,14 +1,18 @@ +Version: 2 +Configurations: - - Template: 'qtci-windows-10-x86_64-10' - 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-10' - 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++' - - Template: 'qtci-linux-RHEL-7.4-x86_64' + Template: 'qtci-linux-RHEL-7.6-x86_64' Compiler: 'GCC' Features: ['Packaging', 'DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -static -nomake tests -nomake examples -no-use-gold-linker -no-icu -no-fontconfig -qt-freetype -no-opengl -qpa offscreen -no-xcb -qt-libpng -no-vulkan' diff --git a/coin/platform_configs/qtsdk.yaml b/coin/platform_configs/qtsdk.yaml index 2c001058..2dc7f0bc 100644 --- a/coin/platform_configs/qtsdk.yaml +++ b/coin/platform_configs/qtsdk.yaml @@ -1,8 +1,13 @@ - - Template: 'qtci-windows-10-x86-3' - Compiler: 'MSVC2017' + Template: 'qtci-windows-10-x86-4' + 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' Compiler: 'GCC' Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -force-debug-info -nomake examples -nomake tests' +- + Template: 'qtci-windows-8.1-x86' + Compiler: 'MSVC2015' + Features: ['DisableTests'] + 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/platform_configs/qtwebkit.yaml b/coin/platform_configs/qtwebkit.yaml index 49426405..900793c2 100644 --- a/coin/platform_configs/qtwebkit.yaml +++ b/coin/platform_configs/qtwebkit.yaml @@ -1,5 +1,13 @@ +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 -debug-and-release -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -platform win32-g++' + Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -platform win32-g++ QMAKE_LFLAGS_APP+=-s' +- + Template: 'qtci-windows-10-x86_64-16' + Compiler: 'Mingw73' + Features: ['Packaging'] + Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -platform win32-g++ QMAKE_LFLAGS_APP+=-s' diff --git a/coin/platform_configs/tqtc-qt-config-gui.yaml b/coin/platform_configs/tqtc-qt-config-gui.yaml new file mode 100644 index 00000000..ad35fc2c --- /dev/null +++ b/coin/platform_configs/tqtc-qt-config-gui.yaml @@ -0,0 +1,28 @@ +Version: 2 +Module only: True +Configurations: + - + 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-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' + - + 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 -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/tqtc-qt-rta.yaml b/coin/platform_configs/tqtc-qt-rta.yaml index 76664d06..a8586ddf 100644 --- a/coin/platform_configs/tqtc-qt-rta.yaml +++ b/coin/platform_configs/tqtc-qt-rta.yaml @@ -9,6 +9,6 @@ Features: ['DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -opengl dynamic -nomake examples -nomake tests' - - Template: 'qtci-windows-10-x86-3' - Compiler: 'MSVC2017' + Template: 'qtci-windows-10-x86-4' + 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/06-msvc_2017_build_tools.ps1 b/coin/pre-provisioning/qtci-windows-10-x86/06-msvc_2017_build_tools.ps1 deleted file mode 100644 index 0c00ba71..00000000 --- a/coin/pre-provisioning/qtci-windows-10-x86/06-msvc_2017_build_tools.ps1 +++ /dev/null @@ -1,48 +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\..\common\helpers.ps1" - -# This script will install Visual Studio 2017 Build Tools -# https://www.visualstudio.com/downloads/#build-tools-for-visual-studio-2017 - -$version = "2017_version_15.0" -$url_cache = "http://ci-files01-hki.intra.qt.io/input/windows/mu_build_tools_for_visual_studio_" + $version + "_x86_x64_10254482.exe" -$sha1 = "a31e099e5114fef80a21654689e6864afc544a16" -$msvcPackage = "C:\Windows\Temp\$version.exe" - -Download $url_cache $url_cache $msvcPackage -Verify-Checksum $msvcPackage $sha1 -cmd /c "$msvcPackage --all --passive --wait" -echo "Cleaning $msvcPackage.." -Remove-Item -Recurse -Force "$msvcPackage" -echo "Visual Studio Build Tools = $version" >> ~\versions.txt diff --git a/coin/pre-provisioning/qtci-windows-10-x86/README_MANUAL_INSTALLATIONS b/coin/pre-provisioning/qtci-windows-10-x86/README_MANUAL_INSTALLATIONS new file mode 100644 index 00000000..0099b600 --- /dev/null +++ b/coin/pre-provisioning/qtci-windows-10-x86/README_MANUAL_INSTALLATIONS @@ -0,0 +1,47 @@ +CPU 4G +Memory: 4G +Hard disk: 250G +Network: CI_NW +Video Card - total memory: 32MB + +VM Options: +Boot options/Firmware: BIOS + +Language: English US +Time and currency format: Finnish (Finland) +Keyboard: Finnish +Windows 10 Enterprise +Region: Finland +Default keyboard layout: English (United States) + +* 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 +* Enable 'Allow remote connections to this computer' +* 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' * Background defrag disabled: 'defragment and optimize drives' - 'change settings' - unchecked "run on a schedule" * Background defrag disabled: 'defragment + NOTE! Without this step windows defender can't be disabled! +* 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. Without this step windows defender can't be disabled! + - 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' +* REBOOT the VM diff --git a/coin/pre-provisioning/qtci-windows-10-x86/disable-defragment.ps1 b/coin/pre-provisioning/qtci-windows-10-x86/disable-defragment.ps1 new file mode 100644 index 00000000..e76f0649 --- /dev/null +++ b/coin/pre-provisioning/qtci-windows-10-x86/disable-defragment.ps1 @@ -0,0 +1,72 @@ +############################################################################# +## +## 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$ +## +############################################################################# + +# Windows 7 does not have Get-ScheduledTask and Unregister-ScheduledTask +# thus needing its own version. +Write-Host "Disabling defragmentation" +$version = Get-CimInstance Win32_OperatingSystem | Select-Object -ExpandProperty Caption +if ($version -like '*Windows 7*'){ + $pi = New-Object System.Diagnostics.ProcessStartInfo + $pi.FileName = "C:\Windows\System32\schtasks.exe" + $pi.RedirectStandardError = $true + $pi.UseShellExecute = $false + $pi.Arguments = "/Delete /TN `"\Microsoft\Windows\Defrag\ScheduledDefrag`" /F" + $prog = New-Object System.Diagnostics.Process + $prog.StartInfo = $pi + $prog.Start() | Out-Null + $err = $prog.StandardError.ReadToEnd() + $prog.WaitForExit() + if ($prog.ExitCode -eq 0){ + Write-Host "Scheduled defragmentation removed" + } else { + if ($err -like '*cannot find the file*'){ + Write-Host "No scheduled defragmentation task found" + exit 0 + } else { + Write-Host "Error while deleting scheduled defragmentation task: $err" + } + } +} +else { + try { + $state = (Get-ScheduledTask -ErrorAction Stop -TaskName "ScheduledDefrag").State + Write-Host "Scheduled defragmentation task found in state: $state" + } + catch { + Write-Host "No scheduled defragmentation task found" + exit 0 + } + Write-Host "Unregistering scheduled defragmentation task" + Unregister-ScheduledTask -ErrorAction Stop -Confirm:$false -TaskName ScheduledDefrag + Write-Host "Scheduled Defragmentation task was cancelled" +} diff --git a/coin/pre-provisioning/qtci-windows-10-x86/disable-ntp.ps1 b/coin/pre-provisioning/qtci-windows-10-x86/disable-ntp.ps1 new file mode 100644 index 00000000..22651763 --- /dev/null +++ b/coin/pre-provisioning/qtci-windows-10-x86/disable-ntp.ps1 @@ -0,0 +1,4 @@ +. "$PSScriptRoot\..\..\provisioning\common\windows\helpers.ps1" + +# Disable the NTP from syncing +Run-Executable "w32tm.exe" "/config /syncfromflags:NO" diff --git a/coin/provisioning/common/windows/disable-schedule-tasks.ps1 b/coin/pre-provisioning/qtci-windows-10-x86/disable-schedule-tasks.ps1 index 86c08e01..1febd88c 100644 --- a/coin/provisioning/common/windows/disable-schedule-tasks.ps1 +++ b/coin/pre-provisioning/qtci-windows-10-x86/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 @@ -82,3 +82,7 @@ DisableSchedulerTask "SoftwareProtectionPlatform\SvcRestartTaskNetwork" # UNP 'RunUpdateNotificationMgr' DeleteSchedulerTask "UNP\RunUpdateNotificationMgr" + + + + diff --git a/coin/provisioning/common/windows/disable-update-orchestrator.ps1 b/coin/pre-provisioning/qtci-windows-10-x86/disable-update-orchestrator.ps1 index 95922d47..5ae8fb0d 100644 --- a/coin/provisioning/common/windows/disable-update-orchestrator.ps1 +++ b/coin/pre-provisioning/qtci-windows-10-x86/disable-update-orchestrator.ps1 @@ -6,14 +6,11 @@ $path = "C:\Windows\System32\Tasks\Microsoft\Windows\$name" takeown /F $path /A /R icacls $path /grant Administrators:F /T SCHTASKS /Change /TN "Microsoft\Windows\$name\Reboot" /DISABLE -del "$path\Combined Scan Download Install" -del "$path\Maintenance Install" -del "$path\Reboot" -del "$path\Policy Install" -del "$path\Refresh Settings" -del "$path\Resume On Boot" -del "$path\USO_UxBroker_Display" -del "$path\USO_UxBroker_ReadyToReboot" +del "$path\Schedule Scan" +del "$path\Schedule Scan Static Task" +del "$path\Backup Scan" +del "$path\UpdateModelTask" +del "$path\USO_UxBroker" # Disable Update orchestrator service reg.exe ADD "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\UsoSvc" /V Start /T REG_dWORD /D 4 /F diff --git a/coin/provisioning/qtci-linux-SLES-12-x86_64/01-systemsetup.sh b/coin/pre-provisioning/qtci-windows-10-x86/disable-windefender.ps1 index 0bf3ce24..47e913d5 100755..100644 --- a/coin/provisioning/qtci-linux-SLES-12-x86_64/01-systemsetup.sh +++ b/coin/pre-provisioning/qtci-windows-10-x86/disable-windefender.ps1 @@ -1,6 +1,4 @@ -#!/usr/bin/env bash - -############################################################################# +########################################################################### ## ## Copyright (C) 2019 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ @@ -33,37 +31,33 @@ ## ############################################################################# -set -ex +# Turning off win defender. +# +# 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\..\..\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" -BASEDIR=$(dirname "$0") -# shellcheck source=../common/shared/network_test_server_ip.txt -source "$BASEDIR/../common/shared/network_test_server_ip.txt" -# shellcheck source=../common/unix/check_and_set_proxy.sh -source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh" +# 'Windows Defender Cache Maintenance' - "Periodic maintenance task." +DisableSchedulerTask "Windows Defender\Windows Defender Cache Maintenance" -echo "Set timezone to UTC." -sudo timedatectl set-timezone Etc/UTC -echo "Timeout for blanking the screen (0 = never)" -gsettings set org.gnome.desktop.session idle-delay 0 -echo "Prevents screen lock when screesaver goes active." -gsettings set org.gnome.desktop.screensaver lock-enabled false -gsettings set org.gnome.desktop.lockdown disable-lock-screen 'true' +# 'Windows Defender Cleanup' - "Periodic cleanup task." +DisableSchedulerTask "Windows Defender\Windows Defender Cleanup" -sudo sed -i 's|GRUB_TIMEOUT=8|GRUB_TIMEOUT=0|g' /etc/default/grub -sudo grub2-mkconfig -o /boot/grub2/grub.cfg +# 'Windows Defender Scheduled Scan' - "Periodic scan task." +DisableSchedulerTask "Windows Defender\Windows Defender Scheduled Scan" -echo "Set Network Test Server address to $network_test_server_ip in /etc/hosts" -echo "$network_test_server_ip qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts -echo "Set DISPLAY" -echo 'export DISPLAY=":0"' >> ~/.bashrc +# 'Windows Defender Verification' - "Periodic verification task." +DisableSchedulerTask "Windows Defender\Windows Defender Verification" -while sudo fuser /usr/lib/packagekitd >/dev/null 2>&1 ; do - echo "Waiting for PackageKit to finish..." - sleep 0.5 -done +# Disable 'QueueReporting' - "Windows Error Reporting task to process queued reports." +DisableSchedulerTask "Windows Error Reporting\QueueReporting" -# shellcheck disable=SC2031 -if [ "$http_proxy" != "" ]; then - sudo sed -i 's/PROXY_ENABLED=\"no\"/PROXY_ENABLED=\"yes\"/' /etc/sysconfig/proxy - sudo sed -i "s|HTTP_PROXY=\".*\"|HTTP_PROXY=\"$proxy\"|" /etc/sysconfig/proxy -fi +# Disable WindowsUpdate from Task Scheduler +DisableSchedulerTask "WindowsUpdate\Scheduled Start" diff --git a/coin/provisioning/common/windows/disable-windows-file-protector.ps1 b/coin/pre-provisioning/qtci-windows-10-x86/disable-windows-file-protector.ps1 index f1d09fb5..f1d09fb5 100644 --- a/coin/provisioning/common/windows/disable-windows-file-protector.ps1 +++ b/coin/pre-provisioning/qtci-windows-10-x86/disable-windows-file-protector.ps1 diff --git a/coin/pre-provisioning/qtci-windows-10-x86/disable-windows-update-medic.ps1 b/coin/pre-provisioning/qtci-windows-10-x86/disable-windows-update-medic.ps1 new file mode 100644 index 00000000..6accbd3b --- /dev/null +++ b/coin/pre-provisioning/qtci-windows-10-x86/disable-windows-update-medic.ps1 @@ -0,0 +1,25 @@ +# Windows Update Medic Service (WaaSMedicSvc)'PerformRemediation' helps recover update-related services to the supported configuration. +# WaasMedicSvc keeps re-starting Windows Update, even if it disabled manually. +# Even Admin user don't have privileged to disable PerformRemediation from Task Scheduler which means that WaaSMedicSvc.dll need's to be removed from the system + +$limit = (Get-Date).AddMinutes(20) +$path = "C:\Windows\System32\WaaSMedicSvc.dll" + +DO { + takeown /F $path + icacls $path /grant Administrators:f + Write-host "Deleting $path" + + Try { + del $path + } + Catch [System.UnauthorizedAccessException] { + Write-host "Access to the path '$path' is denied." + Continue + } + + if ((Get-Date) -gt $limit) { + exit 1 + } + +}while (Test-Path -Path "$path") diff --git a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2017.ps1 b/coin/pre-provisioning/qtci-windows-10-x86/disable-windows-updates.ps1 index cf00ee88..87414f03 100644 --- a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2017.ps1 +++ b/coin/pre-provisioning/qtci-windows-10-x86/disable-windows-updates.ps1 @@ -31,19 +31,24 @@ ## ############################################################################# -. "$PSScriptRoot\..\common\helpers.ps1" +# This script disables the automatic Windows updates -# This script will install Visual Studio 2017 +$service = get-service wuauserv +if (-not $service) { + Write-Host "Windows Update service not found." + exit 0 +} -$version = "2017" -$url_cache = "http://ci-files01-hki.intra.qt.io/input/windows/mu_visual_studio_professional_" + $version + "_x86_x64_10049787.exe" -$sha1 = "8d678d27735018a99dc22ddb5412e4e6868991ae" -$msvcPackage = "C:\Windows\Temp\$version.exe" +if ($service.Status -eq "Stopped") { + Write-Host "Windows Update service already stopped." +} else { + Write-Host "Stopping Windows Update service." + Stop-Service -Name "wuauserv" -Force +} - -Download $url_cache $url_cache $msvcPackage -Verify-Checksum $msvcPackage $sha1 -cmd /c "$msvcPackage --all --norestart --quiet --wait --add Microsoft.VisualStudio.Component.VC.Tools.ARM" -echo "Cleaning $msvcPackage.." -Remove-Item -Recurse -Force "$msvcPackage" -echo "Visual Studio = $version" >> ~\versions.txt +$startup = Get-WmiObject Win32_Service | Where-Object {$_.Name -eq "wuauserv"} | Select -ExpandProperty "StartMode" +if ($startup -ne "Disabled") { + set-service wuauserv -startup disabled +} else { + Write-Host "Windows Update service startup already disabled." +} diff --git a/coin/pre-provisioning/qtci-windows-10-x86/msvc2015.txt b/coin/pre-provisioning/qtci-windows-10-x86/msvc2015.txt new file mode 100644 index 00000000..cfd6a4c4 --- /dev/null +++ b/coin/pre-provisioning/qtci-windows-10-x86/msvc2015.txt @@ -0,0 +1,14 @@ +# Install visual studio 2015 + +version = "2015 update 3" +installer = "http://ci-files01-hki.intra.qt.io/input/windows/en_visual_studio_professional_2015_x86_x64_web_installer_6846650.exe" +# Select default values +# Make sure these are selected: + * All values from 'Universal Windows App Development Tools' + * 'Visual C++' + * 'Common Tools for Visual C++ 2015' + * 'Windows XP Support for C++' + * 'Common Tools and Software Development Kits' + * 'Android Native Development Kit (R11C, 32 bits) + * 'Apache Ant (1.9.3) + diff --git a/coin/pre-provisioning/qtci-windows-10-x86/msvc2015_update.ps1 b/coin/pre-provisioning/qtci-windows-10-x86/msvc2015_update.ps1 deleted file mode 100644 index 2ad479c8..00000000 --- a/coin/pre-provisioning/qtci-windows-10-x86/msvc2015_update.ps1 +++ /dev/null @@ -1,58 +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\..\..\provisioning\common\helpers.ps1" - -# Install Visual Studio $version with $update_version -# Original download page: https://www.visualstudio.com/en-us/news/releasenotes/vs2015-update3-vs -$version = "2015" -$update_version = "3" - -# Only way to install specific Visual studio release is to use feed.xml. -# Visual Studio $version setup will use the feed.xml that was available when $update_version released -> 'https://msdn.microsoft.com/en-us/library/mt653628.aspx' -# These parameters will install Visual Studio Enterprise Update $update_version (the original Update $update_version without any further Update $update_version-era updates) -$parameters = "/OverrideFeedURI http://download.microsoft.com/download/6/B/B/6BBD3561-D764-4F39-AB8E-05356A122545/20160628.2/enu/feed.xml" - -$msvc_web_installer = "vs" + $version + "_" + $update_version -$package = "C:\Windows\temp\$msvc_web_installer.exe" -$url_cache = "http://ci-files01-hki.intra.qt.io/input/windows/$msvc_web_installer.exe" -$url_official = "https://go.microsoft.com/fwlink/?LinkId=691129" -$sha1 = "68abf90424aff604a04d6c61fb52adcd2cab2266" - -echo "Fetching Visual Studio $version update $update_version..." -Download $url_official $url_cache $package -Verify-Checksum $package $sha1 -echo "Installing Visual studio $version update $update_version..." -cmd /c "$package $parameters /norestart /Quiet" -remove-item $package - -echo "Visual Studio = $version update $update_version" >> ~\versions.txt diff --git a/coin/pre-provisioning/qtci-windows-10-x86/msvc2017.txt b/coin/pre-provisioning/qtci-windows-10-x86/msvc2017.txt new file mode 100644 index 00000000..7b834a4c --- /dev/null +++ b/coin/pre-provisioning/qtci-windows-10-x86/msvc2017.txt @@ -0,0 +1,91 @@ +############################################################################ +## +## 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$ +## +############################################################################# + +# 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.21" +$installer = "http://ci-files01-hki.intra.qt.io/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.9 v14.16 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.TypeScript.3.0 (TypeScript 3.1 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)) + +# 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/06-msvc_2017_build_tools.ps1 b/coin/pre-provisioning/qtci-windows-10-x86/msvc2017_build_tools.txt index 0c00ba71..42cbb707 100644 --- a/coin/pre-provisioning/qtci-windows-10-x86_64/06-msvc_2017_build_tools.ps1 +++ b/coin/pre-provisioning/qtci-windows-10-x86/msvc2017_build_tools.txt @@ -1,6 +1,6 @@ ############################################################################ ## -## Copyright (C) 2017 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. @@ -32,17 +32,9 @@ ############################################################################# . "$PSScriptRoot\..\common\helpers.ps1" -# This script will install Visual Studio 2017 Build Tools +# Install Visual Studio 2017 Build Tools +# Install both build tools: Visual C++ and Web development # https://www.visualstudio.com/downloads/#build-tools-for-visual-studio-2017 -$version = "2017_version_15.0" -$url_cache = "http://ci-files01-hki.intra.qt.io/input/windows/mu_build_tools_for_visual_studio_" + $version + "_x86_x64_10254482.exe" -$sha1 = "a31e099e5114fef80a21654689e6864afc544a16" -$msvcPackage = "C:\Windows\Temp\$version.exe" - -Download $url_cache $url_cache $msvcPackage -Verify-Checksum $msvcPackage $sha1 -cmd /c "$msvcPackage --all --passive --wait" -echo "Cleaning $msvcPackage.." -Remove-Item -Recurse -Force "$msvcPackage" -echo "Visual Studio Build Tools = $version" >> ~\versions.txt +$url_internal = https://www.visualstudio.com/downloads/#build-tools-for-visual-studio-2017 +$url_cache = "http://ci-files01-hki.intra.qt.io/input/windows/mu_build_tools_for_visual_studio_2017_version_15.0_x86_x64_10254482.exe" diff --git a/coin/pre-provisioning/qtci-windows-10-x86/msvc2019.txt b/coin/pre-provisioning/qtci-windows-10-x86/msvc2019.txt new file mode 100644 index 00000000..d8767a96 --- /dev/null +++ b/coin/pre-provisioning/qtci-windows-10-x86/msvc2019.txt @@ -0,0 +1,69 @@ +# 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.6" +$installer = "http://ci-files01-hki.intra.qt.io/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.6 + +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 Framework 4.8 SDK +.NET Framework 4.8 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/provisioning/qtci-windows-10-x86_64/02-enable-dotnet-framework.ps1 b/coin/pre-provisioning/qtci-windows-10-x86_64/01-enable-dotnet-framework.ps1 index e7f4c248..e7f4c248 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/02-enable-dotnet-framework.ps1 +++ b/coin/pre-provisioning/qtci-windows-10-x86_64/01-enable-dotnet-framework.ps1 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 new file mode 100644 index 00000000..fd646cbf --- /dev/null +++ b/coin/pre-provisioning/qtci-windows-10-x86_64/README_MANUAL_INSTALLATIONS @@ -0,0 +1,50 @@ +# List about manual pre-installations to Tier1 image: + +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-defragment.ps1 b/coin/pre-provisioning/qtci-windows-10-x86_64/disable-defragment.ps1 new file mode 100644 index 00000000..e76f0649 --- /dev/null +++ b/coin/pre-provisioning/qtci-windows-10-x86_64/disable-defragment.ps1 @@ -0,0 +1,72 @@ +############################################################################# +## +## 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$ +## +############################################################################# + +# Windows 7 does not have Get-ScheduledTask and Unregister-ScheduledTask +# thus needing its own version. +Write-Host "Disabling defragmentation" +$version = Get-CimInstance Win32_OperatingSystem | Select-Object -ExpandProperty Caption +if ($version -like '*Windows 7*'){ + $pi = New-Object System.Diagnostics.ProcessStartInfo + $pi.FileName = "C:\Windows\System32\schtasks.exe" + $pi.RedirectStandardError = $true + $pi.UseShellExecute = $false + $pi.Arguments = "/Delete /TN `"\Microsoft\Windows\Defrag\ScheduledDefrag`" /F" + $prog = New-Object System.Diagnostics.Process + $prog.StartInfo = $pi + $prog.Start() | Out-Null + $err = $prog.StandardError.ReadToEnd() + $prog.WaitForExit() + if ($prog.ExitCode -eq 0){ + Write-Host "Scheduled defragmentation removed" + } else { + if ($err -like '*cannot find the file*'){ + Write-Host "No scheduled defragmentation task found" + exit 0 + } else { + Write-Host "Error while deleting scheduled defragmentation task: $err" + } + } +} +else { + try { + $state = (Get-ScheduledTask -ErrorAction Stop -TaskName "ScheduledDefrag").State + Write-Host "Scheduled defragmentation task found in state: $state" + } + catch { + Write-Host "No scheduled defragmentation task found" + exit 0 + } + Write-Host "Unregistering scheduled defragmentation task" + Unregister-ScheduledTask -ErrorAction Stop -Confirm:$false -TaskName ScheduledDefrag + Write-Host "Scheduled Defragmentation task was cancelled" +} 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 new file mode 100644 index 00000000..22651763 --- /dev/null +++ b/coin/pre-provisioning/qtci-windows-10-x86_64/disable-ntp.ps1 @@ -0,0 +1,4 @@ +. "$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 new file mode 100644 index 00000000..1febd88c --- /dev/null +++ b/coin/pre-provisioning/qtci-windows-10-x86_64/disable-schedule-tasks.ps1 @@ -0,0 +1,88 @@ +. "$PSScriptRoot\..\..\provisioning\common\windows\helpers.ps1" + +# This script will remove unneeded Tasks from Task Scheduler + +# Application Experience 'Microsoft Compatibility Appraiser' - "Collects program telemetry information if opted-in to the Microsoft Customer Experience Improvement Program." +DisableSchedulerTask "Application Experience\Microsoft Compatibility Appraiser" + +# Application Experience 'ProgramDataUpdater' - "Collects program telemetry information if opted-in to the Microsoft Customer Experience Improvement Program" +DisableSchedulerTask "Application Experience\ProgramDataUpdater" + +# Autochk 'Proxy' - "This task collects and uploads autochk SQM data if opted-in to the Microsoft Customer Experience Improvement Program." +DisableSchedulerTask "Autochk\Proxy" + +# Chkdsk 'ProactiveScan' - "NTFS Volume Health Scan" +DisableSchedulerTask "Chkdsk\ProactiveScan" + +# Chkdsk 'SyspartRepair' +DeleteSchedulerTask "Chkdsk\SyspartRepair" + +# Customer Experience Improvement Program 'Consolidator' - "If the user has consented to participate in the Windows Customer Experience Improvement Program, this job collects and sends usage data to Microsoft." +DisableSchedulerTask "Customer Experience Improvement Program\Consolidator" + +# Customer Experience Improvement Program 'sbCeip' - "The USB CEIP (Customer Experience Improvement Program) task collects Universal Serial Bus related statistics and information about your machine and sends it to the Windows Device Connectivity engineering group at Microsoft. The information received is used to help improve the reliability, stability, and overall functionality of USB in Windows. If the user has not consented to participate in Windows CEIP, this task does not do anything." +DisableSchedulerTask "Customer Experience Improvement Program\UsbCeip" + +# Device Information 'Device' +DisableSchedulerTask "Device Information\Device" + +# Diagnosis 'Scheduled' - "The Windows Scheduled Maintenance Task performs periodic maintenance of the computer system by fixing problems automatically or reporting them through Security and Maintenance." +DisableSchedulerTask "Diagnosis\Scheduled" + +# DiskDiagnostic 'Microsoft-Windows-DiskDiagnosticDataCollector' - "The Windows Disk Diagnostic reports general disk and system information to Microsoft for users participating in the Customer Experience Program." +DisableSchedulerTask "DiskDiagnostic\Microsoft-Windows-DiskDiagnosticDataCollector" + +# ExploitGuard 'ExploitGuard MDM policy Refresh' - "Task for applying changes to the machine's Exploit Protection settings." +DisableSchedulerTask "ExploitGuard\ExploitGuard MDM policy Refresh" + +# Feedback/Siuf 'DmClient' +DisableSchedulerTask "Feedback\Siuf\DmClient" + +# Feedback/Siuf 'DmClient'OnScenarioDownload' +DisableSchedulerTask "Feedback\Siuf\DmClientOnScenarioDownload" + +# File Classification Infrastructure 'Property Definition Sync' +DisableSchedulerTask "File Classification Infrastructure\Property Definition Sync" + +# InstallService 'ScanForUpdates' +DisableSchedulerTask "InstallService\ScanForUpdates" + +# InstallService 'ScanForUpdatesAsUser' +DisableSchedulerTask "InstallService\ScanForUpdatesAsUser" + +# LanguageComponentsInstaller 'Installation' - "Install language components that match the user's language list." +DisableSchedulerTask "LanguageComponentsInstaller\Installation" + +# LanguageComponentsInstaller 'ReconcileLanguageResources' - "Install language components that match the user's language list." +DisableSchedulerTask "LanguageComponentsInstaller\ReconcileLanguageResources" + +# PI 'Secure-Boot-Update' - "This task updates the Secure Boot variables." +DisableSchedulerTask "PI\Secure-Boot-Update" + +# PI 'Sqm-Tasks' - "This task gathers information about the Trusted Platform Module (TPM), Secure Boot, and Measured Boot." +DisableSchedulerTask "PI\Sqm-Tasks" + +# Power Efficiency Diagnotics 'AnalyzeSystem' - "This task analyzes the system looking for conditions that may cause high energy use." +DisableSchedulerTask "PushToInstall\Registration" + +# Servicing 'StartComponentCleanup' +DisableSchedulerTask "Servicing\StartComponentCleanup" + +# SettingSync 'BackgroundUploadTask' +DeleteSchedulerTask "SettingSync\BackgroundUploadTask" + +# SoftwareProtectionPlatform 'SvcRestartTask' - "This task restarts the Software Protection Platform service at the specified time" +DeleteSchedulerTask "SoftwareProtectionPlatform\SvcRestartTask" + +# SoftwareProtectionPlatform 'SvcRestartTaskLogon' - "This task restarts the Software Protection Platform service at the specified time" +DisableSchedulerTask "SoftwareProtectionPlatform\SvcRestartTaskLogon" + +# SoftwareProtectionPlatform 'SvcRestartTaskNetwork' - "This task restarts the Software Protection Platform service when a new network is detected" +DisableSchedulerTask "SoftwareProtectionPlatform\SvcRestartTaskNetwork" + +# UNP 'RunUpdateNotificationMgr' +DeleteSchedulerTask "UNP\RunUpdateNotificationMgr" + + + + 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 new file mode 100644 index 00000000..c7f23470 --- /dev/null +++ b/coin/pre-provisioning/qtci-windows-10-x86_64/disable-update-orchestrator.ps1 @@ -0,0 +1,15 @@ +# Disable UpdateOrchestrator + +$name = "UpdateOrchestrator" +$path = "C:\Windows\System32\Tasks\Microsoft\Windows\$name" + +takeown /F $path /A /R +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\UpdateModelTask" +del "$path\USO_UxBroker" + +# Disable Update orchestrator service +reg.exe ADD "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\UsoSvc" /V Start /T REG_dWORD /D 4 /F 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 new file mode 100644 index 00000000..21938f7f --- /dev/null +++ b/coin/pre-provisioning/qtci-windows-10-x86_64/disable-windefender.ps1 @@ -0,0 +1,63 @@ +########################################################################### +## +## 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$ +## +############################################################################# + +# Turning off win defender. +# +# 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\..\..\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" + +# 'Windows Defender Cleanup' - "Periodic cleanup task." +DisableSchedulerTask "Windows Defender\Windows Defender Cleanup" + +# 'Windows Defender Scheduled Scan' - "Periodic scan task." +DisableSchedulerTask "Windows Defender\Windows Defender Scheduled Scan" + +# 'Windows Defender Verification' - "Periodic verification task." +DisableSchedulerTask "Windows Defender\Windows Defender Verification" + +# Disable 'QueueReporting' - "Windows Error Reporting task to process queued reports." +DisableSchedulerTask "Windows Error Reporting\QueueReporting" + +# Disable WindowsUpdate from Task Scheduler +DisableSchedulerTask "WindowsUpdate\Scheduled Start" diff --git a/coin/pre-provisioning/qtci-windows-10-x86_64/disable-windows-file-protector.ps1 b/coin/pre-provisioning/qtci-windows-10-x86_64/disable-windows-file-protector.ps1 new file mode 100644 index 00000000..f1d09fb5 --- /dev/null +++ b/coin/pre-provisioning/qtci-windows-10-x86_64/disable-windows-file-protector.ps1 @@ -0,0 +1,4 @@ +# Disable Windows File Protection +# Windows File Protection feature in Microsoft Windows prevents programs from replacing critical Windows system files. + +reg.exe ADD "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon" /V SFCDisable /T REG_dWORD /D 0xffffff9d /F diff --git a/coin/pre-provisioning/qtci-windows-10-x86_64/disable-windows-update-medic.ps1 b/coin/pre-provisioning/qtci-windows-10-x86_64/disable-windows-update-medic.ps1 new file mode 100644 index 00000000..6accbd3b --- /dev/null +++ b/coin/pre-provisioning/qtci-windows-10-x86_64/disable-windows-update-medic.ps1 @@ -0,0 +1,25 @@ +# Windows Update Medic Service (WaaSMedicSvc)'PerformRemediation' helps recover update-related services to the supported configuration. +# WaasMedicSvc keeps re-starting Windows Update, even if it disabled manually. +# Even Admin user don't have privileged to disable PerformRemediation from Task Scheduler which means that WaaSMedicSvc.dll need's to be removed from the system + +$limit = (Get-Date).AddMinutes(20) +$path = "C:\Windows\System32\WaaSMedicSvc.dll" + +DO { + takeown /F $path + icacls $path /grant Administrators:f + Write-host "Deleting $path" + + Try { + del $path + } + Catch [System.UnauthorizedAccessException] { + Write-host "Access to the path '$path' is denied." + Continue + } + + if ((Get-Date) -gt $limit) { + exit 1 + } + +}while (Test-Path -Path "$path") diff --git a/coin/pre-provisioning/qtci-windows-10-x86/msvc2017.ps1 b/coin/pre-provisioning/qtci-windows-10-x86_64/disable-windows-updates.ps1 index cf00ee88..87414f03 100644 --- a/coin/pre-provisioning/qtci-windows-10-x86/msvc2017.ps1 +++ b/coin/pre-provisioning/qtci-windows-10-x86_64/disable-windows-updates.ps1 @@ -31,19 +31,24 @@ ## ############################################################################# -. "$PSScriptRoot\..\common\helpers.ps1" +# This script disables the automatic Windows updates -# This script will install Visual Studio 2017 +$service = get-service wuauserv +if (-not $service) { + Write-Host "Windows Update service not found." + exit 0 +} -$version = "2017" -$url_cache = "http://ci-files01-hki.intra.qt.io/input/windows/mu_visual_studio_professional_" + $version + "_x86_x64_10049787.exe" -$sha1 = "8d678d27735018a99dc22ddb5412e4e6868991ae" -$msvcPackage = "C:\Windows\Temp\$version.exe" +if ($service.Status -eq "Stopped") { + Write-Host "Windows Update service already stopped." +} else { + Write-Host "Stopping Windows Update service." + Stop-Service -Name "wuauserv" -Force +} - -Download $url_cache $url_cache $msvcPackage -Verify-Checksum $msvcPackage $sha1 -cmd /c "$msvcPackage --all --norestart --quiet --wait --add Microsoft.VisualStudio.Component.VC.Tools.ARM" -echo "Cleaning $msvcPackage.." -Remove-Item -Recurse -Force "$msvcPackage" -echo "Visual Studio = $version" >> ~\versions.txt +$startup = Get-WmiObject Win32_Service | Where-Object {$_.Name -eq "wuauserv"} | Select -ExpandProperty "StartMode" +if ($startup -ne "Disabled") { + set-service wuauserv -startup disabled +} else { + Write-Host "Windows Update service startup already disabled." +} 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 2ad479c8..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 @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2017 The Qt Company Ltd. +## 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. @@ -30,29 +30,22 @@ ## $QT_END_LICENSE$ ## ############################################################################# -. "$PSScriptRoot\..\..\provisioning\common\helpers.ps1" -# Install Visual Studio $version with $update_version -# Original download page: https://www.visualstudio.com/en-us/news/releasenotes/vs2015-update3-vs -$version = "2015" -$update_version = "3" +# Visual Studio $version was installed manually using $installer. +$version = "2015 update 3" +$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" -# Only way to install specific Visual studio release is to use feed.xml. -# Visual Studio $version setup will use the feed.xml that was available when $update_version released -> 'https://msdn.microsoft.com/en-us/library/mt653628.aspx' -# These parameters will install Visual Studio Enterprise Update $update_version (the original Update $update_version without any further Update $update_version-era updates) -$parameters = "/OverrideFeedURI http://download.microsoft.com/download/6/B/B/6BBD3561-D764-4F39-AB8E-05356A122545/20160628.2/enu/feed.xml" +# default plus following components were selected: +# * Visual C++ +# * Universal Windows App Development Tools +# - Tools (1.4.1) and Windows SDK (10.0.14393) +# - Windows 10 SDK (10.0.10586) +# - Windows 10 SDK (10.0.10240) +# * Common Tools +# -Visual Studio Extensibility Tools Update 3 -$msvc_web_installer = "vs" + $version + "_" + $update_version -$package = "C:\Windows\temp\$msvc_web_installer.exe" -$url_cache = "http://ci-files01-hki.intra.qt.io/input/windows/$msvc_web_installer.exe" -$url_official = "https://go.microsoft.com/fwlink/?LinkId=691129" -$sha1 = "68abf90424aff604a04d6c61fb52adcd2cab2266" +# NOTE! Windows SDK 10.0.14393 installation failed through visual studio installer so it was installed using $sdk_installer +$sdk_installer = "http://ci-files01-hki.intra.qt.io/input/windows/sdksetup.exe" -echo "Fetching Visual Studio $version update $update_version..." -Download $url_official $url_cache $package -Verify-Checksum $package $sha1 -echo "Installing Visual studio $version update $update_version..." -cmd /c "$package $parameters /norestart /Quiet" -remove-item $package - -echo "Visual Studio = $version update $update_version" >> ~\versions.txt +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/provisioning/common/linux/android_linux.sh b/coin/provisioning/common/linux/android_linux.sh index 5840d4b4..ca9110b8 100755 --- a/coin/provisioning/common/linux/android_linux.sh +++ b/coin/provisioning/common/linux/android_linux.sh @@ -37,6 +37,8 @@ # It also runs update for SDK API, latest SDK tools, latest platform-tools and build-tools version +set -e + # shellcheck source=../unix/DownloadURL.sh source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh" # shellcheck source=../unix/check_and_set_proxy.sh @@ -51,13 +53,13 @@ basePath="http://ci-files01-hki.intra.qt.io/input/android" toolsVersion="r26.1.1" toolsFile="sdk-tools-linux-4333796.zip" -ndkVersion="r19c" +ndkVersion="r20" ndkFile="android-ndk-$ndkVersion-linux-x86_64.zip" sdkBuildToolsVersion="28.0.3" sdkApiLevel="android-28" toolsSha1="8c7c28554a32318461802c1291d76fccfafde054" -ndkSha1="fd94d0be6017c6acbd193eb95e09cf4b6f61b834" +ndkSha1="8665fc84a1b1f0d6ab3b5fdd1e30200cc7b9adff" toolsTargetFile="/tmp/$toolsFile" toolsSourceFile="$basePath/$toolsFile" @@ -80,14 +82,25 @@ else sudo chown -R qt:users "$targetFolder" fi +# Stop the sdkmanager from printing thousands of lines of #hashmarks. +# Run the following command under `eval` or `sh -c` so that the shell properly splits it. +sdkmanager_no_progress_bar_cmd="tr '\r' '\n' | grep -v '^\[[ =]*\]'" +# But don't let the pipeline hide sdkmanager failures. +set -o pipefail + echo "Running SDK manager for platforms;$sdkApiLevel, platform-tools and build-tools;$sdkBuildToolsVersion." # shellcheck disable=SC2031 if [ "$http_proxy" != "" ]; then proxy_host=$(echo "$proxy" | cut -d'/' -f3 | cut -d':' -f1) proxy_port=$(echo "$proxy" | cut -d':' -f3) - echo "y" |"$sdkTargetFolder/tools/bin/sdkmanager" --no_https --proxy=http --proxy_host="$proxy_host" --proxy_port="$proxy_port" "platforms;$sdkApiLevel" "platform-tools" "build-tools;$sdkBuildToolsVersion" + echo "y" | "$sdkTargetFolder/tools/bin/sdkmanager" \ + --no_https --proxy=http --proxy_host="$proxy_host" --proxy_port="$proxy_port" \ + "platforms;$sdkApiLevel" "platform-tools" "build-tools;$sdkBuildToolsVersion" \ + | eval $sdkmanager_no_progress_bar_cmd else - echo "y" |"$sdkTargetFolder/tools/bin/sdkmanager" "platforms;$sdkApiLevel" "platform-tools" "build-tools;$sdkBuildToolsVersion" + echo "y" | "$sdkTargetFolder/tools/bin/sdkmanager" \ + "platforms;$sdkApiLevel" "platform-tools" "build-tools;$sdkBuildToolsVersion" \ + | eval $sdkmanager_no_progress_bar_cmd fi echo "Checking the contents of Android SDK..." @@ -106,8 +119,11 @@ echo "Android SDK API level = $sdkApiLevel" >> ~/versions.txt echo "Android NDK = $ndkVersion" >> ~/versions.txt cd "$sdkTargetFolder/tools/bin" -./sdkmanager --install "emulator" -echo "y" | ./sdkmanager --install "system-images;android-21;google_apis;x86" +./sdkmanager --install "emulator" \ + | eval $sdkmanager_no_progress_bar_cmd +echo "y" | ./sdkmanager --install "system-images;android-21;google_apis;x86" \ + | eval $sdkmanager_no_progress_bar_cmd + echo "Checking the contents of Android SDK again..." ls -l "$sdkTargetFolder" diff --git a/coin/provisioning/common/linux/devel_languages_go.SUSE_repo_key.pub b/coin/provisioning/common/linux/devel_languages_go.SUSE_repo_key.pub new file mode 100644 index 00000000..48162c56 --- /dev/null +++ b/coin/provisioning/common/linux/devel_languages_go.SUSE_repo_key.pub @@ -0,0 +1,19 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.4.5 (GNU/Linux) + +mQGiBEyvJq8RBAD64FtKbU3VFsZ4PAzcSi9rETc1qXZLVQYtrE38niriIJUuT/tC +kxGjkduD7ozP6rxL+M8fk9UdbbmzhHhXzQT2blyYy2iwpZP5+AFeQawz+oyMRVze +x6IY5qO31TiRu+aEBptk6nco4DULlKABlvtjKI+gJ4buJm+TumyrPaxe9wCgpFwl +O0fEjpOfQd+6Du0sCnPX7+8D/3xYVj9q5ILmrJ9zehBKjRYEcaP0rZVqudH51FUS +I0LQNHsJdzKLzhT+Zj7TJU4KnCN4sX7amfYL3GT9qyZEBDx2alubvEsI36wtNq0i +ewU4XmyZ+Rd7Q4mAPNoBGe5DsUA8wn/7iHGg9aJHu+GXvH7T3DVoUxW5W2KqPw+h +jzqGBACWGuuCefa683uf6aKqpTS3JB+01BDPf+sG9qJ+k7xcJOsEiXIe1X5vH9ov +kEvTM12kzY7SGwlsFsTDT1xioDl62g5nPlZMXErUBVnjoMtjl9bDwUPJY/vP1S9M +VaONBMoJEON3HRui9jhdEK25LTdrcFlFpRzJI3AgdXwy8aQyiLRGZGV2ZWw6bGFu +Z3VhZ2VzOmdvIE9CUyBQcm9qZWN0IDxkZXZlbDpsYW5ndWFnZXM6Z29AYnVpbGQu +b3BlbnN1c2Uub3JnPohmBBMRAgAmBQJc9DoCAhsDBQkUY8NTBgsJCAcDAgQVAggD +BBYCAwECHgECF4AACgkQr0z+TTB9e/lQZgCfXIjj30HyCPvUbSbSd6zOS0seAegA +n3DXayMpRphNmyJgLvl5qKfsX7f6iEYEExECAAYFAkyvJq8ACgkQOzARt2udZSOg +qQCeOba7kjk7CI+64GOkhhTGSdjnjdQAn2IC5tx+PW38XKwl3Jr5YVp0RyR0 +=AOj6 +-----END PGP PUBLIC KEY BLOCK----- diff --git a/coin/provisioning/common/linux/disable-ntp_linux.sh b/coin/provisioning/common/linux/disable-ntp_linux.sh index 4ded6042..dc592553 100755 --- a/coin/provisioning/common/linux/disable-ntp_linux.sh +++ b/coin/provisioning/common/linux/disable-ntp_linux.sh @@ -39,8 +39,10 @@ echo "Disable Network Time Protocol (NTP)" if uname -a |grep -q "Ubuntu"; then sudo timedatectl set-ntp false +elif cat /etc/os-release | grep "PRETTY_NAME" | grep -q "Leap 15"; then + (sudo systemctl stop chronyd && sudo systemctl disable chronyd) elif cat /etc/os-release |grep "SUSE Linux Enterprise Server 15"; then sudo timedatectl set-ntp false else - (systemctl &>/dev/null && sudo systemctl disable ntpd) || sudo /sbin/chkconfig ntpd off + sudo systemctl disable ntpd || sudo /sbin/chkconfig ntpd off fi diff --git a/coin/provisioning/common/linux/docker.sh b/coin/provisioning/common/linux/docker.sh index 466cb7b8..cf2ff717 100755 --- a/coin/provisioning/common/linux/docker.sh +++ b/coin/provisioning/common/linux/docker.sh @@ -2,7 +2,7 @@ ############################################################################# ## -## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2019 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -33,10 +33,12 @@ ## ############################################################################# -set -ex +set -e -. $(dirname "$0")/../../common/unix/DownloadURL.sh +PROVISIONING_DIR="$(dirname "$0")/../../" +. "$PROVISIONING_DIR"/common/unix/common.sourced.sh +. "$PROVISIONING_DIR"/common/unix/DownloadURL.sh localRepo=http://ci-files01-hki.intra.qt.io/input/docker @@ -52,20 +54,24 @@ do DownloadURL $localRepo/$f $upstreamRepo/$f $sha done -sudo apt-get -y install ./containerd.io*.deb ./docker-ce*.deb ./docker-ce-cli*.deb -rm -f ./containerd.io*.deb ./docker-ce*.deb ./docker-ce-cli*.deb +sudo apt-get -y install ./containerd.io_*.deb ./docker-ce_*.deb ./docker-ce-cli_*.deb +rm -f ./containerd.io_*.deb ./docker-ce_*.deb ./docker-ce-cli_*.deb sudo usermod -a -G docker $USER -sudo docker info +sudo docker --version # Download and install the docker-compose extension from https://github.com/docker/compose/releases f=docker-compose-$(uname -s)-$(uname -m) DownloadURL \ - $localRepo/$f \ + $localRepo/$f-1.24.1 \ https://github.com/docker/compose/releases/download/1.24.1/$f \ cfb3439956216b1248308141f7193776fcf4b9c9b49cbbe2fb07885678e2bb8a sudo install -m 755 ./docker-compose* /usr/local/bin/docker-compose +sudo docker-compose --version rm ./docker-compose* +# Install Avahi to discover Docker containers in the test network +sudo apt-get install avahi-daemon -y + # Start testserver provisioning -source "${BASH_SOURCE%/*}/testserver/docker_testserver.sh" +sudo "$(readlink -f $(dirname ${BASH_SOURCE[0]}))/../shared/testserver/docker_testserver.sh" diff --git a/coin/provisioning/common/linux/emsdk.sh b/coin/provisioning/common/linux/emsdk.sh deleted file mode 100755 index 55f5a8c9..00000000 --- a/coin/provisioning/common/linux/emsdk.sh +++ /dev/null @@ -1,81 +0,0 @@ -#!/usr/bin/env bash -############################################################################# -## -## 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$ -## -############################################################################# - -# shellcheck source=../unix/InstallFromCompressedFileFromURL.sh -source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh" -# shellcheck source=../unix/SetEnvVar.sh -source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" -# shellcheck source=../unix/DownloadURL.sh -source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh" - -version="1.38.16" -version_node="8.9.1" -urlEmscriptenCache="http://ci-files01-hki.intra.qt.io/input/emsdk/emscripten-$version.tar.gz" -urlEmscriptenExternal="https://github.com/kripken/emscripten/archive/$version.tar.gz" -urlEmscriptenLlvmCache="http://ci-files01-hki.intra.qt.io/input/emsdk/emscripten-llvm-e$version.tar.gz" -urlEmscriptenLlvmExternal="https://s3.amazonaws.com/mozilla-games/emscripten/packages/llvm/tag/linux_64bit/emscripten-llvm-e$version.tar.gz" -urlNodeCache="http://ci-files01-hki.intra.qt.io/input/emsdk/node-v$version_node-linux-x64.tar.xz" -urlNodeExternal="https://s3.amazonaws.com/mozilla-games/emscripten/packages/node-v$version_node-linux-x64.tar.xz" -sha1Emscripten="353ad7bf614f73b73ed1d05aedd66321d679e03d" -sha1EmscriptenLlvm="e132c26ad657c07f88cc550fd23f1d6f1b6c0673" -sha1Node="eaec5de2af934f7ebc7f9597983e71c5d5a9a726" -targetFolder="/opt/emsdk" -sudo mkdir "$targetFolder" - -InstallFromCompressedFileFromURL "$urlEmscriptenCache" "$urlEmscriptenExternal" "$sha1Emscripten" "$targetFolder" "" -InstallFromCompressedFileFromURL "$urlEmscriptenLlvmCache" "$urlEmscriptenLlvmExternal" "$sha1EmscriptenLlvm" "$targetFolder" "" -InstallFromCompressedFileFromURL "$urlNodeCache" "$urlNodeExternal" "$sha1Node" "$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='$targetFolder/node-v$version_node-linux-x64/bin/node' -EMSCRIPTEN_ROOT='$targetFolder/emscripten-$version' -SPIDERMONKEY_ENGINE = '' -V8_ENGINE = '' -TEMP_DIR = '/tmp' -COMPILER_ENGINE = NODE_JS -JS_ENGINES = [NODE_JS] -EOM - -SetEnvVar "PATH" "\"$targetFolder/emscripten-llvm-e$version/:$targetFolder/node-v$version_node-linux-x64/bin:$targetFolder/emscripten-$version:\$PATH\"" -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/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/linux/install_dwz.sh b/coin/provisioning/common/linux/install_dwz.sh new file mode 100755 index 00000000..1df959e2 --- /dev/null +++ b/coin/provisioning/common/linux/install_dwz.sh @@ -0,0 +1,71 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2018 The Qt Company Ltd. +## Copyright (C) 2020 Konstantin Tokarev <annulen@yandex.ru> +## 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$ +## +############################################################################# + +# shellcheck source=../unix/DownloadURL.sh +source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh" +# shellcheck source=../unix/SetEnvVar.sh +source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" + +# This script will install dwz 0.13 - optimization tool for DWARF debug info + +version="0.13" +sha1="21e6d5878bb84ac6c9ad07b00ed248d8c547bc7d" +internalUrl="http://ci-files01-hki.intra.qt.io/input/rhel7/dwz-$version.tar.xz" +externalUrl="https://www.sourceware.org/ftp/dwz/releases/dwz-$version.tar.xz" + +targetDir="$HOME/dwz" +targetFile="$HOME/dwz-$version.zip" +DownloadURL "$internalUrl" "$externalUrl" "$sha1" "$targetFile" +tar -xJf "$targetFile" -C "$HOME" +sudo rm "$targetFile" + +# devtoolset is needed when running configuration +export PATH="/opt/rh/devtoolset-4/root/usr/bin:$PATH" + +installPrefix="/opt/dwz-$version" + +echo "Configuring and building dwz" +cd "$targetDir" +# dwz uses plain makefile instead of autotools, so it works a bit unconventionally +./configure +make -j5 +sudo make install prefix=$installPrefix + +sudo rm -r "$targetDir" + +SetEnvVar "PATH" "$installPrefix/bin:\$PATH" + +echo "dwz = $version" >> ~/versions.txt diff --git a/coin/provisioning/common/linux/qnx_660.sh b/coin/provisioning/common/linux/qnx_660.sh index 2add6901..eb6fd5f0 100755 --- a/coin/provisioning/common/linux/qnx_660.sh +++ b/coin/provisioning/common/linux/qnx_660.sh @@ -49,7 +49,7 @@ echo "$sha1 $targetFile" | sha1sum --check if [ ! -d "$targetFolder" ]; then mkdir -p $targetFolder fi -sudo tar -C $targetFolder -xvzf $targetFile +sudo tar -C $targetFolder -xzf $targetFile sudo chown -R qt:users "$targetFolder"/"$folderName" # Verify that we have last file in tar diff --git a/coin/provisioning/common/linux/qnx_700.sh b/coin/provisioning/common/linux/qnx_700.sh index 3c821fec..f344c275 100755 --- a/coin/provisioning/common/linux/qnx_700.sh +++ b/coin/provisioning/common/linux/qnx_700.sh @@ -41,8 +41,8 @@ set -ex source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" targetFolder="/opt/" -sourceFile="http://ci-files01-hki.intra.qt.io/input/qnx/qnx700-20180801-linux.tar.xz" -sha1="5d2c8f531823b1f7a2e20968dc698c187c7de94c" +sourceFile="http://ci-files01-hki.intra.qt.io/input/qnx/qnx700-20190325-2-linux.tar.xz" +sha1="9fb115b2c84b8e7b6016a51cc421a763bda298a1" folderName="qnx700" targetFile="qnx700.tar.xz" wget --tries=5 --waitretry=5 --progress=dot:giga --output-document="$targetFile" "$sourceFile" diff --git a/coin/provisioning/common/linux/remove_update-manager.sh b/coin/provisioning/common/linux/remove_update-manager.sh deleted file mode 100755 index d5dc1ca4..00000000 --- a/coin/provisioning/common/linux/remove_update-manager.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -sudo apt-get remove update-manager diff --git a/coin/provisioning/common/linux/telegraf-coin.conf b/coin/provisioning/common/linux/telegraf-coin.conf new file mode 100644 index 00000000..33a9c6de --- /dev/null +++ b/coin/provisioning/common/linux/telegraf-coin.conf @@ -0,0 +1,47 @@ +[global_tags] +[agent] + interval = "10s" + round_interval = true + metric_batch_size = 100 + metric_buffer_limit = 10000 + collection_jitter = "0s" + flush_interval = "10s" + flush_jitter = "5s" + precision = "" + logfile = "/var/log/telegraf-coin.log" + hostname = "$COIN_UNIQUE_JOB_ID" + omit_hostname = false +[[outputs.influxdb]] + urls= ["https://qtinfluxdb01.intra.qt.io:8086"] + insecure_skip_verify = true + database = "coin_vms" + skip_database_creation = true + username = "coin_vms_writer" + password = "COIN_VMS_WRITER_PASS" +[[inputs.cpu]] + percpu = true + totalcpu = true + collect_cpu_time = false + report_active = false +[[inputs.disk]] + ignore_fs = ["tmpfs", "devtmpfs", "devfs", "iso9660", "overlay", "aufs", "squashfs"] +[[inputs.diskio]] +[[inputs.kernel]] +[[inputs.mem]] +[[inputs.processes]] +[[inputs.swap]] +[[inputs.system]] +[[inputs.kernel_vmstat]] # linux-only +[[inputs.netstat]] + + +# Monitor Coin process +[[inputs.procstat]] + exe = "coin-" + pid_finder = "native" + + +# Monitor I/O latency +[[inputs.exec]] + data_format = "influx" + commands = [ "/usr/bin/telegraf-ioping.sh /" ] diff --git a/coin/provisioning/common/linux/testserver/apache2/Dockerfile b/coin/provisioning/common/linux/testserver/apache2/Dockerfile deleted file mode 100644 index b39eb21e..00000000 --- a/coin/provisioning/common/linux/testserver/apache2/Dockerfile +++ /dev/null @@ -1,7 +0,0 @@ -FROM ubuntu:16.04 -ARG packages="apache2 libcgi-session-perl wget avahi-daemon" -RUN apt-get update && apt-get install -y $packages && dpkg -l $packages -EXPOSE 80 443 - -# install configurations and test data -RUN wget https://tools.ietf.org/rfc/rfc3252.txt diff --git a/coin/provisioning/common/linux/testserver/danted/Dockerfile b/coin/provisioning/common/linux/testserver/danted/Dockerfile deleted file mode 100644 index 67c1159b..00000000 --- a/coin/provisioning/common/linux/testserver/danted/Dockerfile +++ /dev/null @@ -1,10 +0,0 @@ -FROM ubuntu:16.04 -ARG packages="gdebi-core wget avahi-daemon" -RUN apt-get update && apt-get install -y $packages && dpkg -l $packages -RUN wget http://ppa.launchpad.net/dajhorn/dante/ubuntu/pool/main/d/dante/dante-server_1.4.1-1_amd64.deb -RUN gdebi -n dante-server_1.4.1-1_amd64.deb -EXPOSE 1080-1081 - -# install configurations and test data -COPY danted /etc/init.d/ -COPY danted-authenticating /etc/init.d/ diff --git a/coin/provisioning/common/linux/testserver/docker_testserver.sh b/coin/provisioning/common/linux/testserver/docker_testserver.sh deleted file mode 100755 index 2534c416..00000000 --- a/coin/provisioning/common/linux/testserver/docker_testserver.sh +++ /dev/null @@ -1,69 +0,0 @@ -#!/usr/bin/env bash - -############################################################################# -## -## 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$ -## -############################################################################# - -set -ex - -# Using SHA-1 of each server context as the tag of docker images. A tag labels a -# specific image version. It is used by docker compose file (docker-compose.yml) -# to launch the corresponding docker containers. If one of the server contexts -# (./apache2, ./danted, ...) gets changes, all the related compose files in -# qtbase should be updated as well. -# -# For example, here's how to get the SHA-1 of apache test server. -# find ./apache2 -type f -print0 | sort -z | xargs -r0 sha1sum | \ -# awk '{ print $1 }' | sha1sum | awk '{ print $1 }' - -testserver='apache2 squid vsftpd ftp-proxy danted' - -for server in $testserver -do - context="${BASH_SOURCE%/*}/$server" - sha1=$(find $context -type f -print0 | sort -z | xargs -r0 sha1sum | awk '{ print $1 }' | \ - sha1sum | awk '{ print $1 }') - sudo docker build -t qt-test-server-$server:$sha1 $context - - # transition - The fixed tag is temporarily used by CI to pass the qtbase testing. - case $server in - apache2) fixed_tag="cc9ea678b92bdda33acb9fa0159bb4ad0f3cd947" ;; - squid) fixed_tag="577d99307eea9a8cccfec944d25be2bce2fe99cc" ;; - vsftpd) fixed_tag="18896604c7e90b543e56d80c8a8aabdb65a590d0" ;; - ftp-proxy) fixed_tag="2c6c8f1ab6a364b540c43d705fb6f15a585cb2af" ;; - danted) fixed_tag="327dd56c3c35db85b26fac93213a5a1918475bc7" ;; - esac - [ -z "$fixed_tag" ] || \ - sudo docker tag qt-test-server-$server:$sha1 qt-test-server-$server:$fixed_tag -done - -sudo docker images diff --git a/coin/provisioning/common/linux/version.sh b/coin/provisioning/common/linux/version.sh index 3e2a7f19..9e23a77e 100755 --- a/coin/provisioning/common/linux/version.sh +++ b/coin/provisioning/common/linux/version.sh @@ -41,3 +41,9 @@ echo "*********************************************" echo "***** SW VERSIONS *****" cat ~/versions.txt echo "*********************************************" +echo "*************** mount ***********************" +mount +echo "*********************************************" +echo "*************** df **************************" +df -hT +echo "*********************************************" diff --git a/coin/provisioning/common/macos/InstallPKGFromURL.sh b/coin/provisioning/common/macos/InstallPKGFromURL.sh index 77ef128a..d9b55d3b 100755 --- a/coin/provisioning/common/macos/InstallPKGFromURL.sh +++ b/coin/provisioning/common/macos/InstallPKGFromURL.sh @@ -42,7 +42,9 @@ function InstallPKGFromURL { targetDirectory=$4 echo "Creating temporary file" - targetFile=$(mktemp "$TMPDIR$(uuidgen).pkg") + package_basename=$(echo "$url" | sed 's|^.*/||') + tmpdir=$(mktemp -d) + targetFile="$tmpdir/$package_basename" echo "Downloading PKG from primary URL '$url'" curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$url" || ( echo "Failed to download '$url' multiple times" @@ -50,10 +52,12 @@ function InstallPKGFromURL { curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$url_alt" ) echo "Checking SHA1 on PKG '$targetFile'" - echo "$expectedSha1 *$targetFile" > "$targetFile.sha1" - /usr/bin/shasum --check "$targetFile.sha1" + echo "$expectedSha1 *$targetFile" > "$targetFile".sha1 + /usr/bin/shasum --check "$targetFile".sha1 echo "Run installer on PKG" sudo installer -package "$targetFile" -target "$targetDirectory" - echo "Removing file '$targetFile'" - rm "$targetFile" + + rm -f "$targetFile".sha1 + rm -f "$targetFile" + rmdir "$tmpdir" } diff --git a/coin/provisioning/common/macos/disable-notifications_and_warnings.sh b/coin/provisioning/common/macos/disable-notifications_and_warnings.sh new file mode 100755 index 00000000..c40a4f65 --- /dev/null +++ b/coin/provisioning/common/macos/disable-notifications_and_warnings.sh @@ -0,0 +1,7 @@ +#!/bin/sh + +echo "Unload notificationcenterui.plist" +launchctl unload -w /System/Library/LaunchAgents/com.apple.notificationcenterui.plist + +echo "Remove 32-bit warnings" +rm ~/Library/Preferences/com.apple.coreservices.uiagent.plist diff --git a/coin/provisioning/common/macos/homebrew.sh b/coin/provisioning/common/macos/homebrew.sh index a6efe123..66463c44 100755 --- a/coin/provisioning/common/macos/homebrew.sh +++ b/coin/provisioning/common/macos/homebrew.sh @@ -1,3 +1,21 @@ -#!/usr/bin/env bash -# Will install homebrew package manager for macOS -/usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)" </dev/null +#!/bin/sh + + +# Will install homebrew package manager for macOS. +# WARNING: Requires commandlinetools + + +set -e + +. "$(dirname "$0")"/../../common/unix/DownloadURL.sh + + +DownloadURL \ + http://ci-files01-hki.intra.qt.io/input/mac/homebrew-install.c744a716f9845988d01e6e238eee7117b8c366c9.rb \ + https://raw.githubusercontent.com/Homebrew/install/c744a716f9845988d01e6e238eee7117b8c366c9/install \ + b9782cc0b550229de77b429b56ffce04157e60486ab9df00461ccf3dad565b0a \ + /tmp/homebrew_install +/usr/bin/ruby /tmp/homebrew_install </dev/null + +# No need to manually do `brew update`, the homebrew installer script does it. +### brew update diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/25-mysql.sh b/coin/provisioning/common/macos/increase_limits.sh index a28e306f..040c55e8 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/25-mysql.sh +++ b/coin/provisioning/common/macos/increase_limits.sh @@ -1,8 +1,8 @@ -#!/usr/bin/env bash +#!/bin/sh ############################################################################# ## -## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2019 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -33,26 +33,38 @@ ## ############################################################################# -# This script installs MySQL -# MySQL is needed for Qt to be able to support MySQL +# Increase the soft and hard RLIMIT_NOFILE and RLIMIT_NPROC limits. +# By default they are 256/unlimited and 709/1064 +# and they sometimes create problems to the build process and telegraf. -set -ex -# shellcheck source=../common/macos/InstallAppFromCompressedFileFromURL.sh -source "${BASH_SOURCE%/*}/../common/macos/InstallAppFromCompressedFileFromURL.sh" -# shellcheck source=../common/unix/SetEnvVar.sh -source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" +set -e -PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/macos_10.12_sierra/mysql-5.7.15-osx10.11-x86_64.tar.gz" -AltUrl="https://dev.mysql.com/get/Downloads/MySQL-5.7/mysql-5.7.15-osx10.11-x86_64.tar.gz" -SHA1="07949bd42f350b0504a1536b8830b809b4a34fca" -appPrefix="" -targetDir="/opt/mysql57/" +PROVISIONING_DIR="$(dirname "$0")/../../" +. "$PROVISIONING_DIR"/common/unix/common.sourced.sh -sudo mkdir -p "/opt" -InstallAppFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$appPrefix" "$targetDir" +echo "Current limits are:" +ulimit -a +launchctl limit -SetEnvVar "MYSQLBINPATH" "/opt/mysql57/bin" -echo "MySQL = 5.7.15" >> ~/versions.txt +$CMD_INSTALL -m 644 -o root -g wheel \ + $PROVISIONING_DIR/common/macos/limit.maxfiles.plist \ + $PROVISIONING_DIR/common/macos/limit.maxproc.plist \ + /Library/LaunchDaemons/ + +# Activate the new limits immediately (not for the current session though) +sudo launchctl load -w /Library/LaunchDaemons/limit.maxfiles.plist +sudo launchctl load -w /Library/LaunchDaemons/limit.maxproc.plist + +echo "After adjusting, limits are:" +ulimit -a +launchctl limit + + +# NOTE: If the limits are not increased enough, it might be because of +# restrictions set by the kernel. They can be temporarily altered with: + +# sudo sysctl -w kern.maxproc=xxxx +# sudo sysctl -w kern.maxprocperuid=xxx diff --git a/coin/provisioning/common/macos/libiodbc.sh b/coin/provisioning/common/macos/libiodbc.sh index 4ba0bbc3..d620c71d 100755 --- a/coin/provisioning/common/macos/libiodbc.sh +++ b/coin/provisioning/common/macos/libiodbc.sh @@ -40,7 +40,6 @@ set -ex # shellcheck source=../unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" -brew update brew install ${BASH_SOURCE%/*}/libiodbc.rb # CPLUS_INCLUDE_PATH is set so clang and configure can find libiodbc diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-refresh-subscription-manager.sh b/coin/provisioning/common/macos/libusb.sh index 84238ebf..cf9e7150 100755 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-refresh-subscription-manager.sh +++ b/coin/provisioning/common/macos/libusb.sh @@ -2,7 +2,7 @@ ############################################################################# ## -## Copyright (C) 2018 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. @@ -33,11 +33,11 @@ ## ############################################################################# +# Install libusb set -ex -# refresh local certificates -sudo subscription-manager refresh - -# Attach available subscriptions to system. This is needed when subscriptions are renewed. -sudo subscription-manager attach --auto - +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/limit.maxfiles.plist b/coin/provisioning/common/macos/limit.maxfiles.plist new file mode 100644 index 00000000..1bf85214 --- /dev/null +++ b/coin/provisioning/common/macos/limit.maxfiles.plist @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> + <dict> + <key>Label</key> + <string>limit.maxfiles</string> + <key>ProgramArguments</key> + <array> + <string>launchctl</string> + <string>limit</string> + <string>maxfiles</string> + <string>65536</string> + <string>524288</string> + </array> + <key>RunAtLoad</key> + <true/> + <key>ServiceIPC</key> + <false/> + </dict> +</plist> diff --git a/coin/provisioning/common/macos/limit.maxproc.plist b/coin/provisioning/common/macos/limit.maxproc.plist new file mode 100644 index 00000000..0c2cc0e9 --- /dev/null +++ b/coin/provisioning/common/macos/limit.maxproc.plist @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> + <dict> + <key>Label</key> + <string>limit.maxproc</string> + <key>ProgramArguments</key> + <array> + <string>launchctl</string> + <string>limit</string> + <string>maxproc</string> + <string>8192</string> + <string>32768</string> + </array> + <key>RunAtLoad</key> + <true/> + <key>ServiceIPC</key> + <false/> + </dict> +</plist> diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-refresh-subscription-manager.sh b/coin/provisioning/common/macos/pkgconfig.sh index 84238ebf..9fad4912 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-refresh-subscription-manager.sh +++ b/coin/provisioning/common/macos/pkgconfig.sh @@ -2,7 +2,7 @@ ############################################################################# ## -## Copyright (C) 2018 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. @@ -33,11 +33,11 @@ ## ############################################################################# +# Install pkgconfig set -ex -# refresh local certificates -sudo subscription-manager refresh - -# Attach available subscriptions to system. This is needed when subscriptions are renewed. -sudo subscription-manager attach --auto - +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/macos/python2.sh b/coin/provisioning/common/macos/python2.sh index f4016f8d..4ab914de 100755 --- a/coin/provisioning/common/macos/python2.sh +++ b/coin/provisioning/common/macos/python2.sh @@ -42,9 +42,9 @@ source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" # shellcheck source=./pip.sh source "${BASH_SOURCE%/*}/pip.sh" -PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/python-2.7.14-macosx10.6.pkg" -AltUrl="https://www.python.org/ftp/python/2.7.14/python-2.7.14-macosx10.6.pkg" -SHA1="fa2bb77243ad0cb611aa3295204fab403bb0fa09" +PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/python-2.7.16-macosx10.6.pkg" +AltUrl="https://www.python.org/ftp/python/2.7.16/python-2.7.16-macosx10.6.pkg" +SHA1="895a8327a58e7c0e58852638ab3d84843643535b" DestDir="/" InstallPKGFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$DestDir" @@ -55,5 +55,5 @@ InstallPip python2.7 SetEnvVar "PATH" "/Library/Frameworks/Python.framework/Versions/2.7/bin/:\$PATH" -echo "python2 = 2.7.14" >> ~/versions.txt +echo "python2 = 2.7.16" >> ~/versions.txt diff --git a/coin/provisioning/common/macos/telegraf-coin.conf b/coin/provisioning/common/macos/telegraf-coin.conf new file mode 100644 index 00000000..006de88c --- /dev/null +++ b/coin/provisioning/common/macos/telegraf-coin.conf @@ -0,0 +1,57 @@ +[global_tags] +[agent] + interval = "10s" + round_interval = true + metric_batch_size = 100 + metric_buffer_limit = 10000 + collection_jitter = "0s" + flush_interval = "10s" + flush_jitter = "5s" + precision = "" + logfile = "/var/log/telegraf-coin.log" + hostname = "$COIN_UNIQUE_JOB_ID" + omit_hostname = false +[[outputs.influxdb]] + urls= ["https://qtinfluxdb01.intra.qt.io:8086"] + insecure_skip_verify = true + database = "coin_vms" + skip_database_creation = true + username = "coin_vms_writer" + password = "COIN_VMS_WRITER_PASS" +#[[inputs.cpu]] # linux-only +# percpu = true +# totalcpu = true +# collect_cpu_time = false +# report_active = false +[[inputs.disk]] + # macOS needs two extra filesystem exceptions: + # + cd9660: This is a read-only filesystem, and always 100% full + # + msdos: Sometimes at boot a short-lived unique mount of type "msdos" + # is performed, at the random directory + # /Volumes/firmwaresyncd.XXXXXX. + # The uniqueness of the path bloats the cardinality of InfluxDB. + ignore_fs = ["tmpfs", "devtmpfs", "devfs", "iso9660", "overlay", "aufs", "squashfs", "cd9660", "msdos"] +#[[inputs.diskio]] # linux-only +[[inputs.kernel]] +[[inputs.mem]] +[[inputs.processes]] +[[inputs.swap]] +[[inputs.system]] +#[[inputs.kernel_vmstat]] # linux-only +[[inputs.netstat]] + + +# Monitor Coin process +[[inputs.procstat]] + exe = "coin-" + # Buggy on macOS if using the "native" pid_finder, see: + # https://github.com/influxdata/telegraf/issues/6265 + # Tested 1.12.1 version that "native" pid_finder has been fixed, + # but it is slow and times out frequently + pid_finder = "pgrep" + + +# Monitor I/O latency +[[inputs.exec]] + data_format = "influx" + commands = [ "/usr/bin/telegraf-ioping.sh /" ] diff --git a/coin/provisioning/common/macos/version.sh b/coin/provisioning/common/macos/version.sh index 3e2a7f19..e57fb60b 100755 --- a/coin/provisioning/common/macos/version.sh +++ b/coin/provisioning/common/macos/version.sh @@ -41,3 +41,9 @@ echo "*********************************************" echo "***** SW VERSIONS *****" cat ~/versions.txt echo "*********************************************" +echo "*************** mount ***********************" +mount +echo "*********************************************" +echo "*************** df **************************" +df -h +echo "*********************************************" diff --git a/coin/provisioning/common/shared/telegraf/influxdb.repo_key.pub b/coin/provisioning/common/shared/telegraf/influxdb.repo_key.pub new file mode 100644 index 00000000..c97d5933 --- /dev/null +++ b/coin/provisioning/common/shared/telegraf/influxdb.repo_key.pub @@ -0,0 +1,52 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1 + +mQINBFYJmwQBEADCw7mob8Vzk+DmkYyiv0dTU/xgoSlp4SQwrTzat8MB8jxmx60l +QjmhqEyuB8ho4zzZF9KV+gJWrG6Rj4t69JMTJWM7jFz+0B1PC7kJfNM+VcBmkTnj +fP+KJjqz50ETnsF0kQTG++UJeRYjG1dDK0JQNQJAM6NQpIWJI339lcDf15vzrMnb +OgIlNxV6j1ZZqkle4fvScF1NQxYScRiL+sRgVx92SI4SyD/xZnVGD/szB+4OCzah ++0Q/MnNGV6TtN0RiCDZjIUYiHoeT9iQXEONKf7T62T4zUafO734HyqGvht93MLVU +GQAeuyx0ikGsULfOsJfBmb3XJS9u+16v7oPFt5WIbeyyNuhUu0ocK/PKt5sPYR4u +ouPq6Ls3RY3BGCH9DpokcYsdalo51NMrMdnYwdkeq9MEpsEKrKIN5ke7fk4weamJ +BiLI/bTcfM7Fy5r4ghdI9Ksw/ULXLm4GNabkIOSfT7UjTzcBDOvWfKRBLX4qvsx4 +YzA5kR+nX85u6I7W10aSqBiaLqk6vCj0QmBmCjlSeYqNQqSzH/6OoL6FZ7lP6AiG +F2NyGveJKjugoXlreLEhOYp20F81PNwlRBCAlMC2Q9mpcFu0dtAriVoG4gVDdYn5 +t+BiGfD2rJlCinYLgYBDpTPcdRT3VKHWqL9fcC4HKmic0mwWg9homx550wARAQAB +tDFJbmZsdXhEQiBQYWNrYWdpbmcgU2VydmljZSA8c3VwcG9ydEBpbmZsdXhkYi5j +b20+iQI3BBMBCgAhBQJWCZsEAhsDBQsJCAcDBRUKCQgLBRYDAgEAAh4BAheAAAoJ +EGhKFM8lguDF9XEQAK9rREnZt6ujh7GXfeNki35bkn39q8GYh0mouShFbFY9o0i3 +UJVChsxokJSRPgFh9GOhOPTupl3rzfdpD+IlWI2Myt6han2HOjZKNZ4RGNrYJ5UR +uxt4dKMWlMbpkzL56bhHlx97RoXKv2d2zRQfw9nyZb6t3lw2k2kKXsMxjGa0agM+ +2SropwYOXdtkz8UWaGd3LYxwEvW3AuhI8EEEHdLetQaYe9sANDvUEofgFbdsuICH +9QLmbYavk7wyGTPBKfPBbeyTxwW2rMUnFCNccMKLm1i5NpZYineBtQbX2cfx9Xsk +1JLOzEBmNal53H2ob0kjev6ufzOD3s8hLu4KMCivbIz4YT3fZyeExn0/0lUtsQ56 +5fCxE983+ygDzKsCnfdXqm3GgjaI90OkNr1y4gWbcd5hicVDv5fD3TD9f0GbpDVw +yDz8YmvNzxMILt5Glisr6aH7gLG/u8jxy0D8YcBiyv5kfY4vMI2yXHpGg1cn/sVu +ZB01sU09VVIM2BznnimyAayI430wquxkZCyMx//BqFM1qetIgk1wDZTlFd0n6qtA +fDmXAC4s5pM5rfM5V57WmPaIqnRIaESJ35tFUFlCHfkfl/N/ribGVDg1z2KDW08r +96oEiIIiV4GfXl+NprJqpNS3Cn+aCXtd7/TsDScDEgs4sMaR29Lsf26cuWk8uQIN +BFYJmwQBEADDPi3fmwn6iwkiDcH2E2V31cHlBw9OdJfxKVUdyAQEhTtqmG9P8XFZ +ERRQF155XLQPLvRlUlq7vEYSROn5J6BAnsjdjsH9LmFMOEV8CIRCRIDePG/Mez2d +nIK5yiU6GkS3IFaQg2T9/tOBKxm0ZJPfqTXbT4jFSfvYJ3oUqc+AyYxtb8gj1GRk +X283/86/bA3C98u7re1vPtiDRyM8r0+lhEc59Yx/EAOL+X2gZyTgyUoH+LLuOWQK +s1egI8y80R8NZfM1nMiQk2ywMsTFwQjSVimScvzqv5Nt8k8CvHUQ3a6R+6doXGNX +5RnUqn9Qvmh0JY5sNgFsoaGbuk2PJrVaGBRnfnjaDqAlZpDhwkWhcCcguNhRbRHp +N7/a0pQr70bAG9VikzLyGC17EU0sxney/hyNHkr4Uyy2OXHpuJvRjVKy/BwZ3fxA +AYX2oZIOxQB3/OulzO/DppaCVhRtp1bt+Z5f+fpisiVb5DvZcMdeyAoQ4+oOr7v3 +EasIs2XYcQ+kOE3Y2kdlHWBeuXzxgWgJZ1OOpwGMjR3Uy6IwhuSWtreJBA4er+Df +vgSPwKBsRLNLbPe3ftjArnC5GfMiGgikVdAUdN4OkEqvUbkRoAVGKTOMLUKm+ZkG +OskJOVYS+JAina0qkYEFF7haycMjf9olhqLmTIC+6X7Ox9R2plaOhQARAQABiQIf +BBgBCgAJBQJWCZsEAhsMAAoJEGhKFM8lguDF8ZIP/1q9Sdz8oMvf9AJXZ7AYxm77 +V+kJzJqi62nZLWJnrFXDZJpU+LkYlb3fstsZ1rvBhnrEPSmFxoj72CP0RtcyX7wJ +dA7K1Fl9LpJi5H8300cC7UyG94MUYbrXijbLTbnFTfNr1tGx4a1T/7Yyxx/wZGrT +H/X8cvNybkl33SxDdlQQ9kx3lFOwC41e3TkGsUWxn3TCfvDh8VdA6Py6JeSPFGOb +MEO2/q7oUgvjfV+ivN5ayZi9bWgeqm1sgtmTHHQ4RqwwKrAb5ynXpn1b9QrkevgT +b91uzMA22Prl4DuzKiaMYDcZOQ3vtf0eFBP0GOSSgUKS4bQ3dGgi1JmQ7VuAM4uj ++Ug5TnGoLwclTwLksc7v89C5MMPgm2vVXvCUDzyzQA7bIHFeX+Rziby4nymec4Nr +eeXYNBJWrEp8XR7UNWmEgroXRoN1x9/6esh5pnoUXGAIWuKzSLQM70/wWxS67+v2 +aC1GNb+pXXAzYeIIiyLWaZwCSr8sWMvshFT9REk2+lnb6sAeJswQtfTUWI00mVqZ +dvI3Wys2h0IyIejuwetTUvGhr9VgpqiLLfGzGlt/y2sg27wdHzSJbMh0VrVAK26/ +BlvEwWDCFT0ZJUMG9Lvre25DD0ycbougLsRYjzmGb/3k3UktS3XTCxyBa/k3TPw3 +vqIHrEqk446nGPDqJPS5 +=9iF7 +-----END PGP PUBLIC KEY BLOCK----- diff --git a/coin/provisioning/common/shared/telegraf/telegraf-ioping.sh b/coin/provisioning/common/shared/telegraf/telegraf-ioping.sh new file mode 100644 index 00000000..ad95eadc --- /dev/null +++ b/coin/provisioning/common/shared/telegraf/telegraf-ioping.sh @@ -0,0 +1,26 @@ +#!/bin/sh + +# Measure I/O latency once, return data in InfluxDB format +# +# Run one ioping command for read, and one for write. +# Each one sends 3 requests and reports the minimum time, in nanoseconds. +# (Because of limitations of ioping, we can't just send one request and get +# the number back in the batch format. Additionally, the number seems to be +# fluctuating quite a bit so taking the smallest number out of 3 requests is +# stabilising it a bit.) + + +set -e + +[ x"$1" = x ] && echo "$0 takes a path as a first argument" && exit 1 + +# Try to run in high priority to avoid slow-downs because of +# factors other than I/O. +renice -n -10 -p $$ >/dev/null 2>&1 || true + + +rlatency="$(ioping -B -k -c 3 -i 0.1 "$1" | cut -d " " -f 5)" +wlatency="$(ioping -B -k -c 3 -i 0.1 -W "$1" | cut -d " " -f 5)" + +printf "ioping,path=$1 read_latency_ns=%u,write_latency_ns=%u\n" \ + $rlatency $wlatency diff --git a/coin/provisioning/common/shared/telegraf/telegraf_packages.sha256.txt b/coin/provisioning/common/shared/telegraf/telegraf_packages.sha256.txt new file mode 100644 index 00000000..28304114 --- /dev/null +++ b/coin/provisioning/common/shared/telegraf/telegraf_packages.sha256.txt @@ -0,0 +1,4 @@ +https://dl.influxdata.com/telegraf/releases/telegraf-1.12.6_darwin_amd64.tar.gz 2bc056e1ad38af2ba95d2cb1d43b513cc611fdd3b851b2ff5e09991d52b01253 +https://dl.influxdata.com/telegraf/releases/telegraf-1.12.6_linux_amd64.tar.gz b33cf0f5935a5c225ab0de69db1e6b249d581f3213313de62a8de928aedadbec +https://dl.influxdata.com/telegraf/releases/telegraf-1.12.6_windows_amd64.zip 5d025d85070e8c180c443580afa8a27421a7bbcf14b5044894e9f3298d0ce97a +https://dl.influxdata.com/telegraf/releases/telegraf-1.12.6_windows_i386.zip 5178a0bdaab448c2ef965b0e36f835849cea731ccd87c4a4527f0f05fbbdf271 diff --git a/coin/provisioning/common/shared/testserver/.gitattributes b/coin/provisioning/common/shared/testserver/.gitattributes new file mode 100644 index 00000000..fcadb2cf --- /dev/null +++ b/coin/provisioning/common/shared/testserver/.gitattributes @@ -0,0 +1 @@ +* text eol=lf diff --git a/coin/provisioning/common/shared/testserver/apache2/Dockerfile b/coin/provisioning/common/shared/testserver/apache2/Dockerfile new file mode 100644 index 00000000..c3dc5d59 --- /dev/null +++ b/coin/provisioning/common/shared/testserver/apache2/Dockerfile @@ -0,0 +1,8 @@ +FROM qt_ubuntu_16.04 +ARG packages="avahi-daemon apache2 libcgi-session-perl" +RUN apt-get update && apt-get install -y $packages && dpkg -l $packages +EXPOSE 80 443 + +# install configurations and test data + +COPY rfc3252.txt . diff --git a/coin/provisioning/common/shared/testserver/apache2_18.04/Dockerfile b/coin/provisioning/common/shared/testserver/apache2_18.04/Dockerfile new file mode 100644 index 00000000..1a629c47 --- /dev/null +++ b/coin/provisioning/common/shared/testserver/apache2_18.04/Dockerfile @@ -0,0 +1,4 @@ +FROM qt_ubuntu_18.04 +ARG packages="avahi-daemon apache2 libcgi-session-perl" +RUN apt-get update && apt-get install -y $packages && dpkg -l $packages +EXPOSE 80 443 diff --git a/coin/provisioning/common/shared/testserver/californium/Dockerfile b/coin/provisioning/common/shared/testserver/californium/Dockerfile new file mode 100644 index 00000000..041c3ef4 --- /dev/null +++ b/coin/provisioning/common/shared/testserver/californium/Dockerfile @@ -0,0 +1,13 @@ +FROM qt_ubuntu_18.04 +ARG packages="avahi-daemon maven default-jdk" +RUN apt-get update && apt-get -y install $packages + +# Get californium-based CoAP test server +WORKDIR /root/src +ADD californium-*.tar.gz . +RUN mv californium-* californium +WORKDIR /root/src/californium +RUN mvn clean install -q -DskipTests +WORKDIR / + +EXPOSE 5683/udp 5684/udp diff --git a/coin/provisioning/common/shared/testserver/cyrus/Dockerfile b/coin/provisioning/common/shared/testserver/cyrus/Dockerfile new file mode 100644 index 00000000..4708ef5b --- /dev/null +++ b/coin/provisioning/common/shared/testserver/cyrus/Dockerfile @@ -0,0 +1,4 @@ +FROM qt_ubuntu_16.04 +ARG packages="avahi-daemon cyrus-imapd" +RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y $packages && dpkg -l $packages +EXPOSE 143 993 diff --git a/coin/provisioning/common/shared/testserver/cyrus_18.04/Dockerfile b/coin/provisioning/common/shared/testserver/cyrus_18.04/Dockerfile new file mode 100644 index 00000000..c20ed4f9 --- /dev/null +++ b/coin/provisioning/common/shared/testserver/cyrus_18.04/Dockerfile @@ -0,0 +1,4 @@ +FROM qt_ubuntu_18.04 +ARG packages="avahi-daemon cyrus-imapd" +RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y $packages && dpkg -l $packages +EXPOSE 143 993 diff --git a/coin/provisioning/common/shared/testserver/danted/Dockerfile b/coin/provisioning/common/shared/testserver/danted/Dockerfile new file mode 100644 index 00000000..0d3ca461 --- /dev/null +++ b/coin/provisioning/common/shared/testserver/danted/Dockerfile @@ -0,0 +1,11 @@ +FROM qt_ubuntu_16.04 +ARG packages="avahi-daemon" +RUN apt-get update && apt-get install -y $packages && dpkg -l $packages +COPY dante-server_1.4.1-1_amd64.deb . +RUN apt -y install ./dante-server_1.4.1-1_amd64.deb \ + && rm -f ./dante-server_1.4.1-1_amd64.deb +EXPOSE 1080-1081 + +# install configurations and test data +COPY danted /etc/init.d/ +COPY danted-authenticating /etc/init.d/ diff --git a/coin/provisioning/common/linux/testserver/danted/danted b/coin/provisioning/common/shared/testserver/danted/danted index 1da8203e..1da8203e 100755 --- a/coin/provisioning/common/linux/testserver/danted/danted +++ b/coin/provisioning/common/shared/testserver/danted/danted diff --git a/coin/provisioning/common/linux/testserver/danted/danted-authenticating b/coin/provisioning/common/shared/testserver/danted/danted-authenticating index 7aa35db6..7aa35db6 100755 --- a/coin/provisioning/common/linux/testserver/danted/danted-authenticating +++ b/coin/provisioning/common/shared/testserver/danted/danted-authenticating diff --git a/coin/provisioning/common/shared/testserver/danted_18.04/Dockerfile b/coin/provisioning/common/shared/testserver/danted_18.04/Dockerfile new file mode 100644 index 00000000..ba732bff --- /dev/null +++ b/coin/provisioning/common/shared/testserver/danted_18.04/Dockerfile @@ -0,0 +1,4 @@ +FROM qt_ubuntu_18.04 +ARG packages="avahi-daemon dante-server" +RUN apt-get update && apt-get install -y $packages && dpkg -l $packages +EXPOSE 1080-1081 diff --git a/coin/provisioning/common/shared/testserver/docker_images.sh b/coin/provisioning/common/shared/testserver/docker_images.sh new file mode 100755 index 00000000..406a5b5d --- /dev/null +++ b/coin/provisioning/common/shared/testserver/docker_images.sh @@ -0,0 +1,126 @@ +#!/usr/bin/env bash + +############################################################################# +## +## 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$ +## +############################################################################# + +set -e + + +PROVISIONING_DIR="$(dirname "$0")/../../../" +. "$PROVISIONING_DIR"/common/unix/common.sourced.sh +. "$PROVISIONING_DIR"/common/unix/DownloadURL.sh + + +# Sort files by their SHA-1, and then return the accumulated result +sha1tree () { + # For example, macOS doesn't install sha1sum by default. In such case, it uses shasum instead. + [ -x "$(command -v sha1sum)" ] || SHASUM=shasum + + find "$@" -type f -print0 | \ + xargs -0 ${SHASUM-sha1sum} | cut -d ' ' -f 1 | \ + sort | ${SHASUM-sha1sum} | cut -d ' ' -f 1 +} + + +SERVER_PATH="$PROVISIONING_DIR/common/shared/testserver" + +. "$SERVER_PATH/settings.sh" + + +# Download all necessary dependencies outside of the dockerfiles, so that we +# can use provisioning functionality for cached and verified downloads. In the +# dockerfiles we just do COPY to put them where needed. + +echo 'Downloading support files for the docker images' + +DownloadURL \ + http://ci-files01-hki.intra.qt.io/input/docker/rfc3252.txt \ + https://tools.ietf.org/rfc/rfc3252.txt \ + 50c323dedce95e4fdc2db35cd1b8ebf9d74711bf5296ef438b88d186d7dd082d +cp rfc3252.txt "$SERVER_PATH/vsftpd/" +cp rfc3252.txt "$SERVER_PATH/apache2/" + +DownloadURL \ + http://ci-files01-hki.intra.qt.io/input/docker/dante-server_1.4.1-1_amd64.deb \ + http://ppa.launchpad.net/dajhorn/dante/ubuntu/pool/main/d/dante/dante-server_1.4.1-1_amd64.deb \ + 674a06f356cebd92c64920cec38a6687650a6f880198fbbad05aaaccca5c0a21 +mv dante-server_1.4.1-1_amd64.deb "$SERVER_PATH/danted/" + +DownloadURL \ + http://ci-files01-hki.intra.qt.io/input/docker/FreeCoAP-0.7.tar.gz \ + https://github.com/keith-cullen/FreeCoAP/archive/v0.7.tar.gz \ + fa6602e27dc8eaee6e34ff53400c0519da0c5c7cd47bf6f13acb564f52a693ee \ + FreeCoAP-0.7.tar.gz +mv FreeCoAP-0.7.tar.gz "$SERVER_PATH/freecoap/" + +# Custom fork of Eclipse Californium with changes not upstream +DownloadURL \ + http://ci-files01-hki.intra.qt.io/input/docker/californium-secure-test-server.tar.gz \ + https://github.com/sonakur/californium/archive/secure-test-server.tar.gz \ + 0ee7f5d4366b9e31f6d2d42e389cb7a66d2db54987b700a38a3a31e8f38a7a19 \ + californium-secure-test-server.tar.gz +mv californium-secure-test-server.tar.gz "$SERVER_PATH/californium/" + + +echo 'Building the docker images...' + +# Build the 2 base layers: qt_ubuntu_1604, qt_ubuntu_1804. +# These are the base for all other docker images. +for image in qt_ubuntu_16.04 qt_ubuntu_18.04 +do + docker build -t $image \ + --build-arg COIN_RUNS_IN_QT_COMPANY="$COIN_RUNS_IN_QT_COMPANY" \ + "$SERVER_PATH/$image" +done + + +for server in $testserver +do + + # We label each docker image with `-t name:tag`. + # A tag labels a specific image version. In the docker compose file + # (docker-compose.yml) that launches the containers, the tag used is + # "latest". Here the images are additionally tagged with the SHA1 of each + # image directory (context), so that if needed we can modify + # docker-compose.yml and modify "latest" to a SHA in order to launch a + # very specific image, thus providing a way to stage + # backwards-incompatible changes across repositories. + + context="$SERVER_PATH/$server" + tag=$(sha1tree $context) + docker build -t qt-test-server-$server:latest \ + -t qt-test-server-$server:$tag \ + $context +done + +docker images diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/04-install-packages.sh b/coin/provisioning/common/shared/testserver/docker_machine.sh index c1189a94..8d791074 100755 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/04-install-packages.sh +++ b/coin/provisioning/common/shared/testserver/docker_machine.sh @@ -2,7 +2,7 @@ ############################################################################# ## -## Copyright (C) 2018 The Qt Company Ltd. +## Copyright (C) 2019 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -35,12 +35,19 @@ set -ex -installPackages=() +TestMachine='qt-test-server' -# For Jenkins -installPackages+=(java-1.8.0-openjdk-devel) -# For Qt Creator -installPackages+=(openssl-devel) +# Deploy docker virtual machine (Boot2Docker) into VirtualBox only if it doesn't exist +if [ -z $(docker-machine ls -q --filter "name=$TestMachine") ] +then + docker-machine create $@ $TestMachine + docker-machine ip $TestMachine +else + # Otherwise, start the docker machine and update with new TLS certificates. + docker-machine start $TestMachine && docker-machine regenerate-certs -f $TestMachine +fi -sudo yum -y install "${installPackages[@]}" +# Switch the docker engine to $TestMachine +eval $(docker-machine env $TestMachine) +docker-machine ls diff --git a/coin/provisioning/common/shared/testserver/docker_testserver.sh b/coin/provisioning/common/shared/testserver/docker_testserver.sh new file mode 100755 index 00000000..3a7c87e8 --- /dev/null +++ b/coin/provisioning/common/shared/testserver/docker_testserver.sh @@ -0,0 +1,57 @@ +#!/usr/bin/env bash + +############################################################################# +## +## 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$ +## +############################################################################# + +set -ex + +[ -x "$(command -v realpath)" ] && FILE=$(realpath ${BASH_SOURCE[0]}) || FILE=${BASH_SOURCE[0]} +case $FILE in + */*) SERVER_PATH="${FILE%/*}" ;; + *) SERVER_PATH="." ;; +esac + +# Create docker virtual machine (Boot2docker) +case $1 in + VMX) source "$SERVER_PATH/docker_machine.sh" "-d virtualbox" ;; + Hyper-V) + # The Hyper-v has been enabled in Windows 10. Disable checking the hardware virtualization. + source "$SERVER_PATH/docker_machine.sh" "-d virtualbox --virtualbox-no-vtx-check" ;; + *) ;; +esac + +# Display system-wide information of docker-engine +docker info + +# Create images +$SERVER_PATH/docker_images.sh diff --git a/coin/provisioning/common/shared/testserver/echo/Dockerfile b/coin/provisioning/common/shared/testserver/echo/Dockerfile new file mode 100644 index 00000000..a20419c6 --- /dev/null +++ b/coin/provisioning/common/shared/testserver/echo/Dockerfile @@ -0,0 +1,4 @@ +FROM qt_ubuntu_16.04 +ARG packages="avahi-daemon xinetd" +RUN apt-get update && apt-get install -y $packages && dpkg -l $packages +EXPOSE 7 7/UDP 13 diff --git a/coin/provisioning/common/shared/testserver/echo_18.04/Dockerfile b/coin/provisioning/common/shared/testserver/echo_18.04/Dockerfile new file mode 100644 index 00000000..e86357a2 --- /dev/null +++ b/coin/provisioning/common/shared/testserver/echo_18.04/Dockerfile @@ -0,0 +1,4 @@ +FROM qt_ubuntu_18.04 +ARG packages="avahi-daemon xinetd" +RUN apt-get update && apt-get install -y $packages && dpkg -l $packages +EXPOSE 7 7/UDP 13 diff --git a/coin/provisioning/common/shared/testserver/freecoap/Dockerfile b/coin/provisioning/common/shared/testserver/freecoap/Dockerfile new file mode 100644 index 00000000..7b2a27a7 --- /dev/null +++ b/coin/provisioning/common/shared/testserver/freecoap/Dockerfile @@ -0,0 +1,14 @@ +FROM qt_ubuntu_18.04 +ARG packages="avahi-daemon autoconf automake libtool make libgnutls28-dev" +RUN apt-get update && apt-get -y install $packages + +WORKDIR /root/src +ADD FreeCoAP-*.tar.gz . +RUN mv FreeCoAP-* FreeCoAP +WORKDIR /root/src/FreeCoAP +RUN autoreconf --install && ./configure && make && make install +WORKDIR sample/time_server +RUN make +WORKDIR / + +EXPOSE 5685/udp diff --git a/coin/provisioning/common/linux/testserver/ftp-proxy/Dockerfile b/coin/provisioning/common/shared/testserver/ftp-proxy/Dockerfile index c719c1eb..de3e5b86 100644 --- a/coin/provisioning/common/linux/testserver/ftp-proxy/Dockerfile +++ b/coin/provisioning/common/shared/testserver/ftp-proxy/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:16.04 -ARG packages="ftp-proxy avahi-daemon" +FROM qt_ubuntu_16.04 +ARG packages="avahi-daemon ftp-proxy" RUN apt-get update && apt-get install -y $packages && dpkg -l $packages EXPOSE 2121 diff --git a/coin/provisioning/common/shared/testserver/ftp-proxy_18.04/Dockerfile b/coin/provisioning/common/shared/testserver/ftp-proxy_18.04/Dockerfile new file mode 100644 index 00000000..383ba140 --- /dev/null +++ b/coin/provisioning/common/shared/testserver/ftp-proxy_18.04/Dockerfile @@ -0,0 +1,4 @@ +FROM qt_ubuntu_18.04 +ARG packages="avahi-daemon ftp-proxy" +RUN apt-get update && apt-get install -y $packages && dpkg -l $packages +EXPOSE 2121 diff --git a/coin/provisioning/common/shared/testserver/iptables/Dockerfile b/coin/provisioning/common/shared/testserver/iptables/Dockerfile new file mode 100644 index 00000000..1c2a4b4d --- /dev/null +++ b/coin/provisioning/common/shared/testserver/iptables/Dockerfile @@ -0,0 +1,4 @@ +FROM qt_ubuntu_16.04 +ARG packages="avahi-daemon iptables" +RUN apt-get update && apt-get install -y $packages && dpkg -l $packages +EXPOSE 1357 diff --git a/coin/provisioning/common/shared/testserver/iptables_18.04/Dockerfile b/coin/provisioning/common/shared/testserver/iptables_18.04/Dockerfile new file mode 100644 index 00000000..49b277c7 --- /dev/null +++ b/coin/provisioning/common/shared/testserver/iptables_18.04/Dockerfile @@ -0,0 +1,4 @@ +FROM qt_ubuntu_18.04 +ARG packages="avahi-daemon iptables" +RUN apt-get update && apt-get install -y $packages && dpkg -l $packages +EXPOSE 1357 diff --git a/coin/provisioning/common/shared/testserver/qt_ubuntu_16.04/Dockerfile b/coin/provisioning/common/shared/testserver/qt_ubuntu_16.04/Dockerfile new file mode 100644 index 00000000..a9c8b9ef --- /dev/null +++ b/coin/provisioning/common/shared/testserver/qt_ubuntu_16.04/Dockerfile @@ -0,0 +1,5 @@ +FROM ubuntu:16.04 +ARG COIN_RUNS_IN_QT_COMPANY +RUN test x"$COIN_RUNS_IN_QT_COMPANY" = xtrue \ + && sed -i 's;\(archive\|security\)\.ubuntu\.com;repo-clones.ci.qt.io/apt-mirror/mirror;' /etc/apt/sources.list \ + || echo "Internal package repository not found. Using public repositories." diff --git a/coin/provisioning/common/shared/testserver/qt_ubuntu_18.04/Dockerfile b/coin/provisioning/common/shared/testserver/qt_ubuntu_18.04/Dockerfile new file mode 100644 index 00000000..f62a29c6 --- /dev/null +++ b/coin/provisioning/common/shared/testserver/qt_ubuntu_18.04/Dockerfile @@ -0,0 +1,5 @@ +FROM ubuntu:18.04 +ARG COIN_RUNS_IN_QT_COMPANY +RUN test x"$COIN_RUNS_IN_QT_COMPANY" = xtrue \ + && sed -i 's;\(archive\|security\)\.ubuntu\.com;repo-clones.ci.qt.io/apt-mirror/mirror;' /etc/apt/sources.list \ + || echo "Internal package repository not found. Using public repositories." diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-pythondev.sh b/coin/provisioning/common/shared/testserver/settings.sh index fc1055d2..27832773 100755..100644 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-pythondev.sh +++ b/coin/provisioning/common/shared/testserver/settings.sh @@ -1,8 +1,6 @@ -#!/usr/bin/env bash - ############################################################################# ## -## Copyright (C) 2018 The Qt Company Ltd. +## Copyright (C) 2019 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -33,13 +31,8 @@ ## ############################################################################# -# provides: python development libraries -# version: provided by default Linux distribution repository -# needed to build pyside - set -ex -sudo yum install -y python-devel python-virtualenv - -# install python3 -sudo yum install -y python34-devel +# A list of test servers to be provisioned +testserver='apache2 squid vsftpd ftp-proxy danted echo cyrus iptables californium freecoap' +testserver="$testserver apache2_18.04 squid_18.04 vsftpd_18.04 ftp-proxy_18.04 danted_18.04 echo_18.04 cyrus_18.04 iptables_18.04" diff --git a/coin/provisioning/common/linux/testserver/squid/Dockerfile b/coin/provisioning/common/shared/testserver/squid/Dockerfile index f0ed68b3..330d3929 100644 --- a/coin/provisioning/common/linux/testserver/squid/Dockerfile +++ b/coin/provisioning/common/shared/testserver/squid/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:16.04 -ARG packages="squid avahi-daemon" +FROM qt_ubuntu_16.04 +ARG packages="avahi-daemon squid" RUN apt-get update && apt-get install -y $packages && dpkg -l $packages EXPOSE 3128-3130 diff --git a/coin/provisioning/common/shared/testserver/squid_18.04/Dockerfile b/coin/provisioning/common/shared/testserver/squid_18.04/Dockerfile new file mode 100644 index 00000000..239ea4c8 --- /dev/null +++ b/coin/provisioning/common/shared/testserver/squid_18.04/Dockerfile @@ -0,0 +1,4 @@ +FROM qt_ubuntu_18.04 +ARG packages="avahi-daemon squid" +RUN apt-get update && apt-get install -y $packages && dpkg -l $packages +EXPOSE 3128-3130 diff --git a/coin/provisioning/common/linux/testserver/vsftpd/Dockerfile b/coin/provisioning/common/shared/testserver/vsftpd/Dockerfile index af6cd7c7..4c2e00e4 100644 --- a/coin/provisioning/common/linux/testserver/vsftpd/Dockerfile +++ b/coin/provisioning/common/shared/testserver/vsftpd/Dockerfile @@ -1,7 +1,7 @@ -FROM ubuntu:16.04 -ARG packages="vsftpd ftp wget avahi-daemon" +FROM qt_ubuntu_16.04 +ARG packages="avahi-daemon vsftpd ftp" RUN apt-get update && apt-get install -y $packages && dpkg -l $packages EXPOSE 20-21 # install configurations and test data -RUN wget https://tools.ietf.org/rfc/rfc3252.txt +COPY rfc3252.txt . diff --git a/coin/provisioning/common/shared/testserver/vsftpd_18.04/Dockerfile b/coin/provisioning/common/shared/testserver/vsftpd_18.04/Dockerfile new file mode 100644 index 00000000..8886308c --- /dev/null +++ b/coin/provisioning/common/shared/testserver/vsftpd_18.04/Dockerfile @@ -0,0 +1,4 @@ +FROM qt_ubuntu_18.04 +ARG packages="avahi-daemon vsftpd" +RUN apt-get update && apt-get install -y $packages && dpkg -l $packages +EXPOSE 20-21 diff --git a/coin/provisioning/common/unix/DownloadURL.sh b/coin/provisioning/common/unix/DownloadURL.sh index 5bafc33d..1d48a565 100755 --- a/coin/provisioning/common/unix/DownloadURL.sh +++ b/coin/provisioning/common/unix/DownloadURL.sh @@ -39,10 +39,12 @@ # based on the SHA length). Target filename should also be given. ############################ BOILERPLATE ############################### -command -v sha1sum >/dev/null || alias sha1sum='shasum -a 1' -command -v sha256sum >/dev/null || alias sha256sum='shasum -a 256' -command -v sha384sum >/dev/null || alias sha384sum='shasum -a 384' -command -v sha512sum >/dev/null || alias sha512sum='shasum -a 512' + +command -v sha1sum >/dev/null || sha1sum () { shasum -a 1 "$@" ; } +command -v sha256sum >/dev/null || sha256sum () { shasum -a 256 "$@" ; } +command -v sha384sum >/dev/null || sha384sum () { shasum -a 384 "$@" ; } +command -v sha512sum >/dev/null || sha512sum () { shasum -a 512 "$@" ; } + ######################################################################## @@ -98,20 +100,27 @@ DownloadURL () { targetFile=$4 fi - if VerifyHash "$targetFile" "$expectedHash" + # If a non-empty file already exists + if [ -s "$targetFile" ] then - echo "Skipping download, found and validated existing file: $targetFile" - else - echo "Downloading from primary URL: $url" - if ! Download "$url" "$targetFile" + if VerifyHash "$targetFile" "$expectedHash" + then + echo "Skipping download, found and validated existing file: $targetFile" + return + else + echo "WARNING: Non-empty but different file found at destination; will re-download and overwrite file: $targetFile" + fi + fi + + echo "Downloading from primary URL: $url" + if ! Download "$url" "$targetFile" + then + echo "FAIL! to download, trying alternative URL: $url2" 1>&2 + if ! Download "$url2" "$targetFile" then - echo "FAIL! to download, trying alternative URL: $url2" 1>&2 - if ! Download "$url2" "$targetFile" - then - echo 'FAIL! to download even from alternative URL' 1>&2 - return 1 - fi + echo 'FAIL! to download even from alternative URL' 1>&2 + return 1 fi - VerifyHash "$targetFile" "$expectedHash" fi + VerifyHash "$targetFile" "$expectedHash" } 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/common.sourced.sh b/coin/provisioning/common/unix/common.sourced.sh new file mode 100644 index 00000000..9f74b32e --- /dev/null +++ b/coin/provisioning/common/unix/common.sourced.sh @@ -0,0 +1,167 @@ +#!/bin/sh + + +############################################################################# +## +## 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$ +## +############################################################################# + + +# Script to be sourced from everywhere you need a common environment. Defines: +export PROVISIONING_DIR +export PROVISIONING_OS +export PROVISIONING_OS_ID +export PROVISIONING_ARCH +export CMD_PKG_INSTALL +export CMD_PKG_LOCALINSTALL +export CMD_INSTALL +export COIN_RUNS_IN_QT_COMPANY + + + +if [ x"$IS_PROVISIONING_COMMON_SOURCED" != x ] +then + echo "common.sourced.sh has already been sourced, re-sourcing skipped" + return +fi + +# Do not export; you want children to re-source, because they only inherit the +# variables but not the functions +IS_PROVISIONING_COMMON_SOURCED=1 + + +fatal () { + echo "$1" 1>&2 + if [ x"$2" != x ] + then exit "$2" + else exit + fi +} + +# Takes one argument which should be the filename of this script. Returns true +# if the script is being sourced, false if the script is being executed. +is_script_executed () { + [ x"$(basename $(echo "$0" | sed s/^-//))" = x"$1" ] +} + + +is_script_executed common.sourced.sh \ + && fatal "Script common.sourced.sh should always be sourced, not executed" + + +_detect_linux_OS_ID () { + if [ -f /etc/os-release ] + then + . /etc/os-release + PROVISIONING_OS_ID="$ID" + elif [ -f /etc/redhat-release ] + then + case "$(cat /etc/redhat-release)" in + "Red Hat Enterprise Linux"*) + PROVISIONING_OS_ID="rhel" + ;; + "CentOS Linux"*) + PROVISIONING_OS_ID="centos" + ;; + *) fatal "Unknown string in /etc/redhat-release" ;; + esac + fi +} + +set_common_environment () { + # Unfortunately we can't find the provisioning directory from a sourced + # script in a portable way + # PROVISIONING_DIR="$(dirname "$0")/../../" + + [ x"$PROVISIONING_DIR" = x ] \ + && fatal "PROVISIONING_DIR variable needs to be set before calling set_common_environment" + + uname_s="$(uname -s)" + case "$uname_s" in + Linux) + PROVISIONING_OS=linux + _detect_linux_OS_ID + case "$PROVISIONING_OS_ID" in + suse|sles|opensuse*) + CMD_PKG_INSTALL="sudo zypper -nq install" + CMD_PKG_LOCALINSTALL="sudo zypper --no-gpg-checks -nq install" + ;; + debian|ubuntu) + CMD_PKG_INSTALL="sudo apt -y install" + CMD_PKG_LOCALINSTALL="sudo apt -y install" + ;; + rhel|centos|fedora) + CMD_PKG_INSTALL="sudo yum -y install" + CMD_PKG_LOCALINSTALL="sudo yum -y --nogpgcheck localinstall" + ;; + *) fatal "Unknown ID in /etc/os-release: $PROVISIONING_OS_ID" ;; + esac + ;; + Darwin) + PROVISIONING_OS=macos + PROVISIONING_OS_ID=macos + CMD_PKG_INSTALL="brew install" + CMD_PKG_LOCALINSTALL="echo 'TODO how to install a package file on macOS'" + ;; + *) + fatal "Unknown system in uname: $uname_s" 42 + ;; + esac + + uname_m="$(uname -m)" + case "$uname_m" in + x86_64|amd64) PROVISIONING_ARCH=amd64 ;; + i[3456]86) PROVISIONING_ARCH=x86 ;; + *) fatal "Unknown architecture in uname: $uname_m" 43 ;; + esac + + CMD_INSTALL="sudo install" + + COIN_RUNS_IN_QT_COMPANY=false + if ping -c1 repo-clones.ci.qt.io >/dev/null 2>&1 + then + COIN_RUNS_IN_QT_COMPANY=true + fi + +} + +set_common_environment + +set_dry_run () { + if [ x"$PROVISIONING_DRY_RUN" != x ] + then + CMD_PKG_INSTALL="echo DRYRUN: $CMD_PKG_INSTALL" + CMD_PKG_LOCALINSTALL="echo DRYRUN: $CMD_PKG_LOCALINSTALL" + CMD_INSTALL="echo DRYRUN: $CMD_INSTALL" + fi +} + +set_dry_run diff --git a/coin/provisioning/common/unix/emsdk.sh b/coin/provisioning/common/unix/emsdk.sh new file mode 100755 index 00000000..a2fda735 --- /dev/null +++ b/coin/provisioning/common/unix/emsdk.sh @@ -0,0 +1,93 @@ +#!/usr/bin/env bash +############################################################################# +## +## 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$ +## +############################################################################# + +# shellcheck source=./InstallFromCompressedFileFromURL.sh +source "${BASH_SOURCE%/*}/InstallFromCompressedFileFromURL.sh" +# shellcheck source=./SetEnvVar.sh +source "${BASH_SOURCE%/*}/SetEnvVar.sh" +# shellcheck source=./DownloadURL.sh +source "${BASH_SOURCE%/*}/DownloadURL.sh" + +version="1.39.8" +urlCache="http://ci-files01-hki.intra.qt.io/input/emsdk" +targetFolder="/opt/emsdk" + +# 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 + 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 + 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 "$urlWasmBinariesCache" "$urlWasmBinariesExternal" "$sha1WasmBinaries" "$targetFolder" "" +InstallFromCompressedFileFromURL "$urlNodeBinariesCache" "$urlNodeBinariesExternal" "$sha1NodeBinaries" "$targetFolder" "" + +sudo chmod -R a+rwx "$targetFolder" + +echo "Writing $targetFolder/.emscripten" +cat <<EOM >"$targetFolder/.emscripten" +EMSCRIPTEN_ROOT='$targetFolder/emscripten-$version' +LLVM_ROOT='$targetFolder/install/bin' +BINARYEN_ROOT='$targetFolder/install' +NODE_JS='$targetFolder/$pathNodeExecutable' +TEMP_DIR = '/tmp' +EOM + +SetEnvVar "PATH" "\"\$PATH:$targetFolder/emscripten-$version/\"" +SetEnvVar "EMSCRIPTEN" "$targetFolder/emscripten-$version" +SetEnvVar "EM_CONFIG" "$targetFolder/.emscripten" + +echo "Emsdk = $version" >> ~/versions.txt diff --git a/coin/provisioning/common/unix/install_protobuff.sh b/coin/provisioning/common/unix/install_protobuff.sh index 59e9b699..a9b2cfd0 100755 --- a/coin/provisioning/common/unix/install_protobuff.sh +++ b/coin/provisioning/common/unix/install_protobuff.sh @@ -64,7 +64,7 @@ if uname -a |grep -q Darwin; then else ./configure fi -make +make -j5 sudo make install # Refresh shared library cache if OS isn't macOS diff --git a/coin/provisioning/common/unix/libclang.sh b/coin/provisioning/common/unix/libclang.sh index a9d1cc49..6fa6c040 100755 --- a/coin/provisioning/common/unix/libclang.sh +++ b/coin/provisioning/common/unix/libclang.sh @@ -65,10 +65,10 @@ zip="/tmp/libclang.7z" destination="/usr/local/libclang-$version" DownloadURL $url_cached $url $sha1 $zip -7z x $zip -o/tmp/ +sudo 7z x $zip -o/usr/local/ +sudo mv /usr/local/libclang "$destination" rm -rf $zip -sudo mv /tmp/libclang "$destination" echo "export LLVM_INSTALL_DIR=$destination" >> ~/.bash_profile echo "libClang = $version" >> ~/versions.txt diff --git a/coin/provisioning/qtci-windows-10-x86_64/10-msvc_2015_update3_patch.ps1 b/coin/provisioning/common/unix/python_modules.sh index fe1aec7d..89adbd5c 100644..100755 --- a/coin/provisioning/qtci-windows-10-x86_64/10-msvc_2015_update3_patch.ps1 +++ b/coin/provisioning/common/unix/python_modules.sh @@ -1,6 +1,8 @@ +#!/usr/bin/env bash + ############################################################################# ## -## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2019 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -30,5 +32,7 @@ ## $QT_END_LICENSE$ ## ############################################################################# -. "$PSScriptRoot\..\common\windows\msvc_2015_update3_patch.ps1" +# needed by packaging scripts +pip3 install bs4 +pip3 install sh diff --git a/coin/provisioning/common/unix/squishInstall.sh b/coin/provisioning/common/unix/squishInstall.sh index b40c1922..24a4d507 100755 --- a/coin/provisioning/common/unix/squishInstall.sh +++ b/coin/provisioning/common/unix/squishInstall.sh @@ -38,14 +38,14 @@ set -ex # This script will install squish package for Linux and Mac. # Squish is need by Release Test Automation (RTA) -version="6.4.3" +version="6.5" # Branch version without dot -qtBranch="512x" +qtBranch="513x" squishFolder="/opt/squish" squishUrl="ci-files01-hki.intra.qt.io:/hdd/www/input/squish/coin/$qtBranch/" -squishFile="squish-$version-qt$qtBranch-linux64.run" +squishFile="squish-nosignalhandler-$version-qt$qtBranch-linux64.run" if uname -a |grep -q Darwin; then - squishFile="squish-$version-qt$qtBranch-macx86_64.dmg" + squishFile="squish-nosignalhandler-$version-qt$qtBranch-macx86_64.dmg" fi squishLicenseUrl="ci-files01-hki.intra.qt.io:/hdd/www/input/squish/coin/" @@ -122,7 +122,7 @@ function MountAndInstall { sudo cp $targetFileMount /tmp UnMount sudo hdiutil attach "/tmp/$targetFile" - sudo /Volumes/froglogic\ Squish/Install\ Squish.app/Contents/MacOS/Squish unattended=1 targetdir="$targetDirectory/package" qtpath="$targetDirectory" > /dev/null 2>&1 + sudo /Volumes/froglogic\ Squish/Install\ Squish.app/Contents/MacOS/Squish unattended=1 targetdir="$targetDirectory/package" qtpath="$targetDirectory" > /dev/null mountFolder="/Volumes/froglogic Squish" UnMount elif [[ $targetFile == *.run ]]; then @@ -130,7 +130,7 @@ function MountAndInstall { sudo cp $targetFileMount $targetDirectory UnMount sudo chmod +x $targetDirectory/$targetFile - sudo $targetDirectory/$targetFile unattended=1 targetdir="$targetDirectory/package" qtpath="$targetDirectory" > /dev/null 2>&1 + sudo $targetDirectory/$targetFile unattended=1 targetdir="$targetDirectory/package" qtpath="$targetDirectory" > /dev/null sudo rm -fr "$targetDirectory/$targetFile" if uname -a |grep -q "Ubuntu"; then sudo mkdir /usr/lib/tcl8.6 diff --git a/coin/provisioning/common/unix/telegraf_install.sh b/coin/provisioning/common/unix/telegraf_install.sh new file mode 100755 index 00000000..b2dd244e --- /dev/null +++ b/coin/provisioning/common/unix/telegraf_install.sh @@ -0,0 +1,98 @@ +#!/bin/sh + +############################################################################# +## +## 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$ +## +############################################################################# + + +# This script installs telegraf and ioping and our script telegraf-ioping.sh +# to the /usr/bin directory. +# +# The reasons we don't install to /usr/local/bin are: +# 1. On SLES and RHEL, the PATH of sudo (secure_path setting in /etc/sudoers) +# does not include /usr/local/bin. +# 2. On macOS /usr/local/bin does not even exist early in provisioning. + + +######################## BOILERPLATE ########################### +set -e + + +PROVISIONING_DIR="$(dirname "$0")/../../" +. "$PROVISIONING_DIR"/common/unix/common.sourced.sh + +. "$PROVISIONING_DIR"/common/unix/DownloadURL.sh + +is_script_executed telegraf_install.sh \ + || fatal "Script telegraf_install.sh should be executed, not sourced" + +################################################################ + + +[ "$PROVISIONING_OS" = linux ] \ + && ioping_sha256=259abf04bcb84f4126ff97c04b6651e1cf5ea6d8a9ff364c769a26c95b6eeb44 \ + || ioping_sha256=55de6a2f1a5343e0ce8df31d82d47a9e79c7e612edbc6dfb39b5fc6fb358b2e3 +DownloadURL "http://ci-files01-hki.intra.qt.io/input/ioping/ioping.${PROVISIONING_OS}-${PROVISIONING_ARCH}" \ + '' "$ioping_sha256" ioping +$CMD_INSTALL -m 755 ./ioping /usr/bin/ +rm -f ioping + +# 2. Install custom ioping monitoring script +$CMD_INSTALL -m 755 "$PROVISIONING_DIR"/common/shared/telegraf/telegraf-ioping.sh /usr/bin/ + +# 3. Download and install telegraf + +[ x"$PROVISIONING_OS" = xmacos ] && os=darwin || os=linux +[ x"$PROVISIONING_ARCH" = xx86 ] && arch=i386 || arch=amd64 +package_filename=telegraf-1.12.6_${os}_${arch}.tar.gz +package_sha256_list="$PROVISIONING_DIR"/common/shared/telegraf/telegraf_packages.sha256.txt +package_sha256=$(sed -n "s/.*$package_filename *//p" "$package_sha256_list") + +DownloadURL \ + http://ci-files01-hki.intra.qt.io/input/telegraf/"$package_filename" \ + https://dl.influxdata.com/telegraf/releases/"$package_filename" \ + "$package_sha256" \ + telegraf.tar.gz + +tar -xzf ./telegraf.tar.gz -C /tmp +telegraf_binary=$(find /tmp/telegraf* -name telegraf -type f | grep /bin/ | head -1) +$CMD_INSTALL -m 755 "$telegraf_binary" /usr/bin/ +rm -rf /tmp/telegraf* + +# 4. Edit config file with passwords +"$PROVISIONING_DIR"/common/unix/telegraf_password.sh + +# 5. Start telegraf in background (-b) and with retaining the environment (-E) +# in order to report as hostname = $COIN_UNIQUE_JOB_ID. +/usr/bin/sudo -b -E telegraf --config /etc/telegraf-coin.conf >/dev/null 2>&1 + +echo DONE: "Installed and started telegraf: $package_filename" diff --git a/coin/provisioning/qtci-linux-SLES-12-x86_64/08-pythondev.sh b/coin/provisioning/common/unix/telegraf_password.sh index cc9385e9..efbed142 100755 --- a/coin/provisioning/qtci-linux-SLES-12-x86_64/08-pythondev.sh +++ b/coin/provisioning/common/unix/telegraf_password.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/sh ############################################################################# ## @@ -33,27 +33,28 @@ ## ############################################################################# -# provides: python development libraries -# version: provided by default Linux distribution repository -# needed to build pyside -set -ex +######################## BOILERPLATE ########################### +set -e -sudo zypper -nq install python-devel -wget -q https://raw.githubusercontent.com/linux-on-ibm-z/scripts/master/Python3/build_python3.sh -sed -i 's/12.3/12.4/g' build_python3.sh -bash build_python3.sh +PROVISIONING_DIR="$(dirname "$0")/../../" +. "$PROVISIONING_DIR"/common/unix/common.sourced.sh -export -python3 --version +is_script_executed telegraf_password.sh \ + || fatal "Script telegraf_password.sh should be executed, not sourced, to avoid leaking secrets in the logs" +# Avoid leaking secrets in the logs +set +x +################################################################ -pip3 install --user wheel -pip3 install --user virtualenv -# Install all needed packages in a special wheel cache directory -pip3 wheel --wheel-dir "$HOME/python3-wheels" -r "${BASH_SOURCE%/*}/../common/shared/requirements.txt" +# Provisioning should run even without the secrets repository +influxdb_password=$(cut -d : -f 2 ~qt/work/influxdb/coin_vms_writer.auth) \ + || influxdb_password=no_password_provided -# shellcheck source=../common/unix/SetEnvVar.sh -source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" -SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels" +rm -f ~qt/work/influxdb/coin_vms_writer.auth +sed "s|COIN_VMS_WRITER_PASS|$influxdb_password|" \ + "$PROVISIONING_DIR"/common/"$PROVISIONING_OS"/telegraf-coin.conf \ + > .telegraf-coin.conf.final +$CMD_INSTALL -m 600 .telegraf-coin.conf.final /etc/telegraf-coin.conf +rm -f .telegraf-coin.conf.final diff --git a/coin/provisioning/common/windows/android-openssl.ps1 b/coin/provisioning/common/windows/android-openssl.ps1 index 35e49423..d1877b64 100644 --- a/coin/provisioning/common/windows/android-openssl.ps1 +++ b/coin/provisioning/common/windows/android-openssl.ps1 @@ -1,6 +1,6 @@ ############################################################################ ## -## Copyright (C) 2018 The Qt Company Ltd. +## Copyright (C) 2019 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -51,7 +51,7 @@ $sha1 = "056057782325134b76d1931c48f2c7e6595d7ef4" $destination = "C:\Utils\openssl-android-master" # msys unix style paths -$ndkPath = "/c/Utils/Android/android-ndk-r19c" +$ndkPath = "/c/Utils/Android/android-ndk-r20" $openssl_path = "/c/Utils/openssl-android-master" $cc_path = "$ndkPath/toolchains/llvm/prebuilt/windows-x86_64/bin" Download https://www.openssl.org/source/openssl-$version.tar.gz \\ci-files01-hki.intra.qt.io\provisioning\openssl\openssl-$version.tar.gz $zip @@ -65,8 +65,25 @@ Remove-Item -Path $zip Write-Host "Configuring OpenSSL $version for Android..." Push-Location $destination # $ must be escaped in powershell... -Start-Process -NoNewWindow -Wait -ErrorAction Stop -FilePath "$msys_bash" -ArgumentList ("-lc", "`"pushd $openssl_path; ANDROID_NDK_HOME=$ndkPath PATH=${cc_path}:`$PATH CC=clang $openssl_path/Configure shared android-arm`"") -Start-Process -NoNewWindow -Wait -ErrorAction Stop -FilePath "$msys_bash" -ArgumentList ("-lc", "`"pushd $openssl_path; ANDROID_NDK_HOME=$ndkPath PATH=${cc_path}:`$PATH CC=clang make -f $openssl_path/Makefile build_generated`"") + +function CheckExitCode { + + param ( + $p + ) + + if ($p.ExitCode) { + Write-host "Process failed with exit code: $($p.ExitCode)" + exit 1 + } +} + +$configure = Start-Process -NoNewWindow -Wait -PassThru -ErrorAction Stop -FilePath "$msys_bash" -ArgumentList ("-lc", "`"pushd $openssl_path; ANDROID_NDK_HOME=$ndkPath PATH=${cc_path}:`$PATH CC=clang $openssl_path/Configure shared android-arm`"") +CheckExitCode $configure + +$make = Start-Process -NoNewWindow -Wait -PassThru -ErrorAction Stop -FilePath "$msys_bash" -ArgumentList ("-lc", "`"pushd $openssl_path; ANDROID_NDK_HOME=$ndkPath PATH=${cc_path}:`$PATH CC=clang make -f $openssl_path/Makefile build_generated`"") +CheckExitCode $make + Pop-Location Set-EnvironmentVariable "OPENSSL_ANDROID_HOME" "$destination" diff --git a/coin/provisioning/common/windows/android.ps1 b/coin/provisioning/common/windows/android.ps1 index def09116..2cf18cdc 100644 --- a/coin/provisioning/common/windows/android.ps1 +++ b/coin/provisioning/common/windows/android.ps1 @@ -40,10 +40,10 @@ # That's why we need to use Andoid-21 API version in Qt 5.9. # NDK -$ndkVersion = "r19c" +$ndkVersion = "r20" $ndkCachedUrl = "\\ci-files01-hki.intra.qt.io\provisioning\android\android-ndk-$ndkVersion-windows-x86_64.zip" $ndkOfficialUrl = "https://dl.google.com/android/repository/android-ndk-$ndkVersion-windows-x86_64.zip" -$ndkChecksum = "c4cd8c0b6e7618ca0a871a5f24102e40c239f6a3" +$ndkChecksum = "36e1dc77fad08ad2498fb94b13ad8caf26bbd9df" $ndkFolder = "c:\Utils\Android\android-ndk-$ndkVersion" $ndkZip = "c:\Windows\Temp\android_ndk_$ndkVersion.zip" @@ -95,9 +95,12 @@ Out-File -FilePath C:\Utils\Android\licenses\android-sdk-license -Encoding utf8 # Get a PATH where Java's path is defined from previous provisioning [Environment]::SetEnvironmentVariable("PATH", [Environment]::GetEnvironmentVariable("PATH", "Machine"), "Process") +# Attempt to catch all errors of sdkmanager.bat, even when hidden behind a pipeline. +$ErrorActionPreference = "Stop" + cd $toolsFolder\bin\ $sdkmanager_args += "platforms;$sdkApiLevel", "platform-tools", "build-tools;$sdkBuildToolsVersion" -$command = 'for($i=0;$i -lt 6;$i++) { $response += "y`n"}; $response | .\sdkmanager.bat @sdkmanager_args' +$command = 'for($i=0;$i -lt 6;$i++) { $response += "y`n"}; $response | .\sdkmanager.bat @sdkmanager_args | Out-Null' Invoke-Expression $command $command = 'for($i=0;$i -lt 6;$i++) { $response += "y`n"}; $response | .\sdkmanager.bat --licenses' iex $command 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/conan_manifests/icu/65.1/qtproject/stable/package/488cd5989854dc1a08e31f9977289ed30f65b0f0/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/icu/65.1/qtproject/stable/package/488cd5989854dc1a08e31f9977289ed30f65b0f0/conanmanifest.txt new file mode 100644 index 00000000..29781a54 --- /dev/null +++ b/coin/provisioning/common/windows/conan_manifests/icu/65.1/qtproject/stable/package/488cd5989854dc1a08e31f9977289ed30f65b0f0/conanmanifest.txt @@ -0,0 +1,250 @@ +1582255516 +bin/derb.exe: d93a62f01851ea95efc58eb4f3e791d4 +bin/escapesrc.exe: 75766f460e5dd0ef808b120c732d92c7 +bin/genbrk.exe: 4da632c505bd5b926a89a6dd7b650596 +bin/genccode.exe: 41877ba4b04cf49f636a263aae4f2886 +bin/gencfu.exe: 525a49626036d2aa86e8bfc18b45b465 +bin/gencmn.exe: b15da25db0862b3849b93253b645bd16 +bin/gencnval.exe: 98574f94180b8bd9ff07ef5eeac235f7 +bin/gendict.exe: ee8fa0b65b6a843c8e92079a0d301941 +bin/gennorm2.exe: 385efdd848fe0e109ae5ee72dc36f42a +bin/genrb.exe: 148d9244a745bad05dd0673c110bfa1a +bin/gensprep.exe: be0b6b49063cff5266a8b37bbd91bb4a +bin/icu-config: 834abc11547153b24a70aae3f4df2ac3 +bin/icudt.dll: 03d96a7e1c900cf203bdca34ea180587 +bin/icudt65.dll: 53718118d1f9fac7737f13a072f4e1cb +bin/icuin.dll: ad70d6cc6d9224b69b09ec3ee1f21b1b +bin/icuin65.dll: ad70d6cc6d9224b69b09ec3ee1f21b1b +bin/icuinfo.exe: 2acbbb839cca99cf9027c4de7fc818f5 +bin/icuio.dll: c09966904d088940c4ccf498302d4712 +bin/icuio65.dll: c09966904d088940c4ccf498302d4712 +bin/icupkg.exe: 6461f7ae7163bdc1d542d450eeff22ce +bin/icutest.dll: 91bc1bd35f625900ca74f90373a1b811 +bin/icutest65.dll: 91bc1bd35f625900ca74f90373a1b811 +bin/icutu.dll: 2d9def13c1f8a2c6b99d43feb3d37d6a +bin/icutu65.dll: 2d9def13c1f8a2c6b99d43feb3d37d6a +bin/icuuc.dll: ac883bcb5dda0de14c7789bb0cfa0d0f +bin/icuuc65.dll: ac883bcb5dda0de14c7789bb0cfa0d0f +bin/makeconv.exe: fbf44ce800fb2377ca93b022aa6c4e24 +bin/pkgdata.exe: bb2da4ab37e16ff6c0fe037f431a7920 +conaninfo.txt: d3efa735bfabe1d967065dfa9682bce6 +include/unicode/alphaindex.h: 1be039746e3da3f7baa9421062373468 +include/unicode/appendable.h: 48b3a0a4c3044ad5f2af18f1ab48c8ff +include/unicode/basictz.h: 57fe3c53d6b1a2bf5d1f40ec51efd7a1 +include/unicode/brkiter.h: e5ff475b7b01a97e5cd11a5362785921 +include/unicode/bytestream.h: 34a6807cd42f2e64ca60429897eb4b10 +include/unicode/bytestrie.h: d9be048d5c7e9dd0a2c6cd82e91e6002 +include/unicode/bytestriebuilder.h: 66236ad8247bd04c9ea525012b4c4ca8 +include/unicode/calendar.h: 692005b416fc2e4a8c497ff9b9a31bd8 +include/unicode/caniter.h: a70809c92ea90b654e9f11a793f84429 +include/unicode/casemap.h: d088e7422633b4cad3ad2b0b83ca239b +include/unicode/char16ptr.h: c234b9ba14299c6068f5af1a936c1ead +include/unicode/chariter.h: c8623016adba39ab38ef29f38ec87e45 +include/unicode/choicfmt.h: 832e7b39d19ec192ac1551360436f946 +include/unicode/coleitr.h: d9f07937d600ee811c121c0b0504724c +include/unicode/coll.h: a2062360d7415e08abb01c44088f074e +include/unicode/compactdecimalformat.h: 029f9640501bd640495c18397b5ff8bb +include/unicode/curramt.h: 41fc0e62956b2e0fa7fd5e05213afc85 +include/unicode/currpinf.h: 09cbc4d9eb04b2aa2c4c155961f13c89 +include/unicode/currunit.h: 43648726f439d03c8c8a13b87c122332 +include/unicode/datefmt.h: 28ef92e98cdac29630b0aa0daf122798 +include/unicode/dbbi.h: 3d4186ec9549d6693d136257f610ec06 +include/unicode/dcfmtsym.h: b18b90c0c6371eab5028582492859142 +include/unicode/decimfmt.h: fb4231ddf75de524300ee952634ef038 +include/unicode/docmain.h: 697c221351932e373cf9e5903f40b723 +include/unicode/dtfmtsym.h: cabbccbf9deec91ebf291a19110007fb +include/unicode/dtintrv.h: 7a7ce170e6035b90ef5b4bee91893833 +include/unicode/dtitvfmt.h: da220b13a8f895c4e77b653d865eb049 +include/unicode/dtitvinf.h: 1ad6b7f844a9362b2b7a0f509284cae7 +include/unicode/dtptngen.h: 8f8fcb053b5024c5b1d3dfc258f59344 +include/unicode/dtrule.h: 68551564f8ab72271d3574aa0cba381d +include/unicode/edits.h: 6b8aa73dbf2c2f0b49da5bc5903bcc8c +include/unicode/enumset.h: 3bb75fc43c88682895ae98c02e69810d +include/unicode/errorcode.h: debeda4467a19aaf964fafc73629c8ae +include/unicode/fieldpos.h: 3b041c7d9a5df0aef744b88e764af17e +include/unicode/filteredbrk.h: e54dd29247eb75f8490423f7f8541691 +include/unicode/fmtable.h: 3816f155db2c35ac5de3f80ffdaa549c +include/unicode/format.h: 0417863e1b303fa282659c4903e3a11c +include/unicode/formattedvalue.h: fc50c8972404b212799d76cf8e647888 +include/unicode/fpositer.h: b5e8bbc249dc37e3b159f0a2b5053957 +include/unicode/gender.h: 5e093c1cfb96ef671f2e5dedb96a0d64 +include/unicode/gregocal.h: 15c7b4ceaca9b8b8f8e747d5427aa7a7 +include/unicode/icudataver.h: d1c480a9eb95aaa058a6b9311074bc33 +include/unicode/icuplug.h: 60ad27a2a36284bbc1766f9920769175 +include/unicode/idna.h: a7c3650d5311edeb01f754c574d0fb8b +include/unicode/listformatter.h: 65911d72679c6e0a267e951b03467f37 +include/unicode/localebuilder.h: 1b6106448cf6cde7e7ebf25ee6fe4065 +include/unicode/localematcher.h: 3a03cbb5970a14fe153041c878f583f2 +include/unicode/localpointer.h: a89505f84a4bb4e231a17676f1b1d51a +include/unicode/locdspnm.h: aa260a00e31e970757e3b3cbe00fff3d +include/unicode/locid.h: 6caa36f85c9bab54b78ecd0c056789aa +include/unicode/measfmt.h: 21b534367e4b3825dc70c3a289822df8 +include/unicode/measunit.h: 0f903f67958ad91e8bd2e49fc40c3075 +include/unicode/measure.h: 49091c823a2f12f5f60f7fecd7c452f2 +include/unicode/messagepattern.h: 15ecc58806c256ac91c2549d4f5c242f +include/unicode/msgfmt.h: f9ff9322fa80486203829c15d4982573 +include/unicode/normalizer2.h: 436d923df3a66774b7bf26ffe75a5d1c +include/unicode/normlzr.h: 5bf33ff933ee7eb49c330df38f490f57 +include/unicode/nounit.h: 2b4901f562077b370d82c4bbe229aac4 +include/unicode/numberformatter.h: 0f62c292f92d5598a61647bbf4294e1a +include/unicode/numberrangeformatter.h: 58623918bf66f1fd6687f3dd03180a4b +include/unicode/numfmt.h: 2a21117116463390ec4f19d53f485890 +include/unicode/numsys.h: 186ba43c003b4f56af3c63abd08f418e +include/unicode/parseerr.h: ce38831411af01eeaf0bbbb6e1cb0153 +include/unicode/parsepos.h: 5c53fa7c473d4593fd72ce964b505807 +include/unicode/platform.h: 56fe53b31059acb1be086c45ce88e8c6 +include/unicode/plurfmt.h: 6f1b781b7a62a6ac1c7e4c6a2bb18d77 +include/unicode/plurrule.h: cf4b0b9ec1a525b96e7d27e489044337 +include/unicode/ptypes.h: d74097874c82f77331d8e06a5c59d37f +include/unicode/putil.h: ee1c69d5060b8d5754bf8879bb7f10d1 +include/unicode/rbbi.h: 6c5f44ef812dfb48b65466732513c091 +include/unicode/rbnf.h: e870f2cf64c9b72eb549c413d6f98299 +include/unicode/rbtz.h: ea9f5a1edac3fe535ec7b83636daf61d +include/unicode/regex.h: 16565e3d41228a76f17a63842d9594d2 +include/unicode/region.h: 22585a516ee7525f3e9094f2843b7640 +include/unicode/reldatefmt.h: 1b226903d9375471432582c27ade4934 +include/unicode/rep.h: eab550a9bbb33b4c1283ab16bc2dfafa +include/unicode/resbund.h: cc93ada0e9871eee0a86f81548a3be73 +include/unicode/schriter.h: acea2a510e5c9127dad0e2538cf65ccd +include/unicode/scientificnumberformatter.h: 40eb759fc2902b6c8e732b440fe6a1bc +include/unicode/search.h: a93ebdadfc5113f1b9c9c185262ef461 +include/unicode/selfmt.h: 581ab6f6ac584265d5c56dad4051ee12 +include/unicode/simpleformatter.h: 8e5e9a9589359e06110af10bcf941d54 +include/unicode/simpletz.h: 194e0d388b74daa4cf51d012e2d14ebd +include/unicode/smpdtfmt.h: 0e6383eafd569b511791e826b51df8d1 +include/unicode/sortkey.h: 27f3d671f37c27d0b36953d00c1f2e7b +include/unicode/std_string.h: bb3b2e28a2ae9b66a60b7d90f8c07512 +include/unicode/strenum.h: 3c23eb4fa4d847b6afdd18adf3ccdaf5 +include/unicode/stringoptions.h: d4929224e8d9df2f272f0305780cbacb +include/unicode/stringpiece.h: 3d7911a3b2a59830eaceb37e46110285 +include/unicode/stringtriebuilder.h: 08ce10a0f6e85f4bb078f69d5382f8bc +include/unicode/stsearch.h: b15838a5cf5740b0aaa9af5356aef26b +include/unicode/symtable.h: 7487ffc7069316553d08f1109965bf9d +include/unicode/tblcoll.h: ee27157293d0802cde26d75c6098c1d3 +include/unicode/timezone.h: 54689b5ef15d0f03a146e8aeac163be8 +include/unicode/tmunit.h: 9ddf31866353dde1ae249ed93fce9234 +include/unicode/tmutamt.h: beea411e9f16d8b91fef39a297cd06d8 +include/unicode/tmutfmt.h: ae13f8ac46ad754bf83142943b19a647 +include/unicode/translit.h: f225620498133e8e4bcc2ad6679225e5 +include/unicode/tzfmt.h: b6c94cd901ffe5387f0245ca9fd68604 +include/unicode/tznames.h: a50010925037c01304c719e47bfb369a +include/unicode/tzrule.h: 0e3465c0eeb27a0545f94bf9f5cfc21e +include/unicode/tztrans.h: 117392a0dc2fe373946aecfa74475842 +include/unicode/ubidi.h: d90a13a2933198f134efefc0ff7563e6 +include/unicode/ubiditransform.h: fab65809ece8816f1a002eb843b80e29 +include/unicode/ubrk.h: e85002afa629b85ba239135ab11f47f0 +include/unicode/ucal.h: d247badde5d39cc16e06d26153054c85 +include/unicode/ucasemap.h: 2f240e1dc6db1771e843f1a03fd0c8f4 +include/unicode/ucat.h: f412352b86adccba85d7f3e4b4515064 +include/unicode/uchar.h: ebac2b0b753a1cd10db2f428736bf06d +include/unicode/ucharstrie.h: 16d3d38154f1444b8a3425254ab7ab81 +include/unicode/ucharstriebuilder.h: b92f18132f6c1d61da0ad51b8099435d +include/unicode/uchriter.h: a356cb90d62d9e425e5efbb071c30b21 +include/unicode/uclean.h: ef4b9289f510edd0bb6b779d0a299f44 +include/unicode/ucnv.h: db701a7a83540ef4dcfc4e780f1da016 +include/unicode/ucnv_cb.h: 69c1c5b156028cd623ed7e5b5b4ab730 +include/unicode/ucnv_err.h: 6ef0751460140d23ae678ef85c298906 +include/unicode/ucnvsel.h: 6e4c5e31c2a89439ef4945cd4a402ef3 +include/unicode/ucol.h: 47c1acc6c2bde098f0b06c8590d68b9f +include/unicode/ucoleitr.h: b4576706530850666c1cfd2424276b26 +include/unicode/uconfig.h: 80678a12de446cdf8679cdd5792a12e9 +include/unicode/ucpmap.h: 0b16934410c99981d87ddd10e1759bed +include/unicode/ucptrie.h: 7450de71dd5e1a83f5290da33d48d40d +include/unicode/ucsdet.h: c7d5b3d36da0c71b0a85a72642439a90 +include/unicode/ucurr.h: 5de7a80ece54cf7583e19f292ad17825 +include/unicode/udat.h: c665d53e4691b564ae5394957fcdcf31 +include/unicode/udata.h: 98e2327300a26bbaf40bd8eb7eee8c1a +include/unicode/udateintervalformat.h: 178f650518ecceeb2eca7b763dd68799 +include/unicode/udatpg.h: ce0332b911d1a820a0b45922bd0e97fc +include/unicode/udisplaycontext.h: 57a269787da52ad6720ff5b1e87b5cdd +include/unicode/uenum.h: 41cce54d4862d5068f4f087b935c0657 +include/unicode/ufieldpositer.h: 21f8ba8e285bfea4daa3da8a01911b7e +include/unicode/uformattable.h: cad38a97f9f929ebc28d5e72dc5ec14f +include/unicode/uformattedvalue.h: e1e69e0927595423076481b8f948fd2a +include/unicode/ugender.h: d64c9ad1d5cf04136534e3aca38d2638 +include/unicode/uidna.h: 88ee381ec6ec01cb677f3e5222e9cf22 +include/unicode/uiter.h: 3fea96177f4f814091918f54d1e68ccd +include/unicode/uldnames.h: d18634bc73c16b9ae02b6a60fd94d8be +include/unicode/ulistformatter.h: 21277400caea3c7e7fdb57457c10e423 +include/unicode/uloc.h: 39d42620d3a97a7ae26d7b560ea3eacc +include/unicode/ulocdata.h: 116fad6a2c0db0d08e3f5ae02d93a035 +include/unicode/umachine.h: 0a7fe7df81aedd43f322a9ec540feff5 +include/unicode/umisc.h: eca71d8c8bf86529ae5bbc5f34598bea +include/unicode/umsg.h: 298645d31f8d8e209cbb5eb3751e3ceb +include/unicode/umutablecptrie.h: 5dc81c63a8b2c80ffd401c9bb5180e61 +include/unicode/unifilt.h: e170c06bf1bf81a56c7ed605d41fa02f +include/unicode/unifunct.h: 23981a5088ba5d5af70309b73eef7666 +include/unicode/unimatch.h: 66161ce491e3b24e9e011cfc0e78be42 +include/unicode/unirepl.h: 462716fd44618949b405645ba7b5c8e6 +include/unicode/uniset.h: cb94f902233b2e1807156afe0967e3e0 +include/unicode/unistr.h: 5ebe061e4a17e981bb249c4814f4dd9d +include/unicode/unorm.h: ca96f37ed2e2afd56585a238d73cea51 +include/unicode/unorm2.h: e8fff4023ad114b325f346d2cdbbe043 +include/unicode/unum.h: 656d2aa9a41ca4b7bfad0a09420bdc23 +include/unicode/unumberformatter.h: 9be73b6bb76bb5862a8dfd615e563b82 +include/unicode/unumsys.h: 7e5dd76a0e07f790c30c944bfb810e71 +include/unicode/uobject.h: b56a28b01e3df9088315aeb145ec3a8e +include/unicode/upluralrules.h: 15feae7c7df35b97d5e715f28f616e63 +include/unicode/uregex.h: 10fe8b8c9f98758bf192bc765fa45e3c +include/unicode/uregion.h: a3f28f15972bf18600012815a8c76535 +include/unicode/ureldatefmt.h: d528589ebdc3f8cb6c27ce4867752c55 +include/unicode/urename.h: 1642d190b583bbaaf454ac65a37a8024 +include/unicode/urep.h: 6ada98ac1aa68081f10d17b1abadef6e +include/unicode/ures.h: 8c69586a969eb2898d5d3e8c08beda9c +include/unicode/uscript.h: 5bf2d96240b17507a05ebe4d36b1a38e +include/unicode/usearch.h: 1f3fcea9dc6c40e908992e74f602235f +include/unicode/uset.h: a285e1b480a3abaaee753ba74d245efd +include/unicode/usetiter.h: ab1ebd4b0b9e3560a94a7c6cb3a9e48f +include/unicode/ushape.h: 86fdf709d4312bb17cf95b16f58e1dc4 +include/unicode/uspoof.h: 8b9508cbe045b114f0f618d04fcab512 +include/unicode/usprep.h: e88585ae8bdb3a35aa88417993bde732 +include/unicode/ustdio.h: 3104e526d3de60538f42c0fd5430adcb +include/unicode/ustream.h: 0a74df2b9d1967d0b859d21f5828f4e8 +include/unicode/ustring.h: 92f522f8ef62e443c11baa56c32e42e4 +include/unicode/ustringtrie.h: 54a28aa9c4e117cd3ebfd0a670324f6c +include/unicode/utext.h: 89a08f750d0c5751d4f385c4874c0e61 +include/unicode/utf.h: 4434eeb75c89a49228884aa247714e1c +include/unicode/utf16.h: 147fbb88d8300af3e38d80ce59c1c1ce +include/unicode/utf32.h: a1fdf74f4bd8808f9fb17df371f886d9 +include/unicode/utf8.h: 7f0c4c02bd7506e80fd11a4597cc1450 +include/unicode/utf_old.h: 92ffc297b71c8d83ed05b644183c477c +include/unicode/utmscale.h: 7c59d91f835bc9f4b805dd64e73851d7 +include/unicode/utrace.h: 420d2f8d462ae300ca1903c2a6ebaba3 +include/unicode/utrans.h: 5cd9b1f130197e5fdd8a66519233abf5 +include/unicode/utypes.h: 47eb8ff3f909dafa9bee14f8bb224342 +include/unicode/uvernum.h: a91a8e07c665891ed234de3a58302663 +include/unicode/uversion.h: 0b8f75f3d1c816ee3359dde5be390d17 +include/unicode/vtzone.h: 615f12cb0d05441d0872aa677db80a90 +lib/icu/65.1/Makefile.inc: a010e16166fd57feaffe08a65d0ae173 +lib/icu/65.1/pkgdata.inc: 9e0c896d9c5269625cebf6cbe09cbd1c +lib/icu/Makefile.inc: a010e16166fd57feaffe08a65d0ae173 +lib/icu/current/Makefile.inc: a010e16166fd57feaffe08a65d0ae173 +lib/icu/current/pkgdata.inc: 9e0c896d9c5269625cebf6cbe09cbd1c +lib/icu/pkgdata.inc: 9e0c896d9c5269625cebf6cbe09cbd1c +lib/icudt.lib: ad50da716c0eb6bcdc66a7af5d049876 +lib/icuin.lib: d8b960575d5737a7e80a0eaf77a0ccd3 +lib/icuio.lib: 5edd899a7b0a07ef963258ee9adb4558 +lib/icutest.lib: 192e87c4ce05c5eda7a2697127b133b3 +lib/icutu.lib: 30f71a2ff5da26365e87511eff019264 +lib/icuuc.lib: b2df448006c67b3ba595ec3096a58286 +lib/pkgconfig/icu-i18n.pc: 6edbc25754da101395bb827058b3066e +lib/pkgconfig/icu-io.pc: 3354070d7484f6e3ef09f18e28290679 +lib/pkgconfig/icu-uc.pc: 2c56fbbb59cde31869da0e5b0224c770 +licenses/LICENSE: 8bc5d32052a96f214cbdd1e53dfc935d +share/icu/65.1/LICENSE: 8bc5d32052a96f214cbdd1e53dfc935d +share/icu/65.1/config/mh-msys-msvc: c3bf313c25288142820e4ab191c1c153 +share/icu/65.1/install-sh: 5afe8eb5573965dfb58378e4e46f3813 +share/icu/65.1/mkinstalldirs: 31c4856b24c8dbc6319819ccd43b4fda +share/man/man1/derb.1: bddb017162105939f6d43c9539c99497 +share/man/man1/genbrk.1: a4e60e4a60ab26eb29119649bfb60d2b +share/man/man1/gencfu.1: 4950b8178b944a3ebfea1c419ffd3319 +share/man/man1/gencnval.1: 53b10d9351473a7ea603400973377a7d +share/man/man1/gendict.1: 9c1bf2760e5735b0e6601f48e92cb0d9 +share/man/man1/genrb.1: ffebc1e8007bd58f5623299e6b4babe8 +share/man/man1/icu-config.1: f4670ca16d77ce21310e48aa91f7ee5b +share/man/man1/makeconv.1: c96397ad56d2c21649757c407aac46d8 +share/man/man1/pkgdata.1: 5f7b05c28de887cca1e5d7bfb9db4c39 +share/man/man8/genccode.8: 498418dc0aec1fa7ccfb83c491b5a23e +share/man/man8/gencmn.8: c43635e431ea0f1616ea8266e36c0d75 +share/man/man8/gensprep.8: 396d70fec1a04aae25e6bfc6e8e58c65 +share/man/man8/icupkg.8: 430bcbed42faa9ea33b161a48c0490c6 diff --git a/coin/provisioning/common/windows/conan_manifests/icu/65.1/qtproject/stable/package/cd2d3d20ffbb190b9b990f98e6dedc2be0228764/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/icu/65.1/qtproject/stable/package/cd2d3d20ffbb190b9b990f98e6dedc2be0228764/conanmanifest.txt new file mode 100644 index 00000000..6f0c7a16 --- /dev/null +++ b/coin/provisioning/common/windows/conan_manifests/icu/65.1/qtproject/stable/package/cd2d3d20ffbb190b9b990f98e6dedc2be0228764/conanmanifest.txt @@ -0,0 +1,250 @@ +1582256246 +bin/derb.exe: e6041fdf335b5a524557f138c869cc84 +bin/escapesrc.exe: 9cfd048a6bf3519b17f30df342966a33 +bin/genbrk.exe: 752b9f024858391ddbec6403bfb2048a +bin/genccode.exe: 0369bda45bcbeb73f0915b74287d9ad5 +bin/gencfu.exe: ca626c73c414e88b65d934fa48a8f506 +bin/gencmn.exe: 8626f0646549407b32ac13d6e1952fd6 +bin/gencnval.exe: 3864bdb0a1b41b22d0582cb938cfcd5e +bin/gendict.exe: a409064c7b8458063022de5fb14808b5 +bin/gennorm2.exe: 646e92dfa248ab1b06e4486b885a57ec +bin/genrb.exe: 346551698bd19f0d29a57f1ed4f2fde7 +bin/gensprep.exe: 95680f967adc685b197756ba265cd7ef +bin/icu-config: 09fb7ddac5b9883611c1f2fefb28e692 +bin/icudt.dll: a9192d258154160b288d939bb1eb3f96 +bin/icudt65.dll: 3a45a96f7e1e69d427063fe3627b1a38 +bin/icuin.dll: ab4224faef23c6b0bcb0601b44dd39b9 +bin/icuin65.dll: ab4224faef23c6b0bcb0601b44dd39b9 +bin/icuinfo.exe: abc421ec846b8d7dac99b1f4d296773d +bin/icuio.dll: cab9b7f62754cbe7bce23d07bce9fedc +bin/icuio65.dll: cab9b7f62754cbe7bce23d07bce9fedc +bin/icupkg.exe: bc5f4f3f340b4621df456c4aed4073c2 +bin/icutest.dll: 921c386181ff37db17e063bc4cf55a62 +bin/icutest65.dll: 921c386181ff37db17e063bc4cf55a62 +bin/icutu.dll: f72c49d172522323d7069a96224d89a9 +bin/icutu65.dll: f72c49d172522323d7069a96224d89a9 +bin/icuuc.dll: afe869974d32eedcf1289b5592ea007c +bin/icuuc65.dll: afe869974d32eedcf1289b5592ea007c +bin/makeconv.exe: 5f302e72bc98f33db337fdb644c79181 +bin/pkgdata.exe: a48d51ee2d5a1e6d71dd2d7e98dc69be +conaninfo.txt: ebe8d1091c909c57853d44504c05ac72 +include/unicode/alphaindex.h: 1be039746e3da3f7baa9421062373468 +include/unicode/appendable.h: 48b3a0a4c3044ad5f2af18f1ab48c8ff +include/unicode/basictz.h: 57fe3c53d6b1a2bf5d1f40ec51efd7a1 +include/unicode/brkiter.h: e5ff475b7b01a97e5cd11a5362785921 +include/unicode/bytestream.h: 34a6807cd42f2e64ca60429897eb4b10 +include/unicode/bytestrie.h: d9be048d5c7e9dd0a2c6cd82e91e6002 +include/unicode/bytestriebuilder.h: 66236ad8247bd04c9ea525012b4c4ca8 +include/unicode/calendar.h: 692005b416fc2e4a8c497ff9b9a31bd8 +include/unicode/caniter.h: a70809c92ea90b654e9f11a793f84429 +include/unicode/casemap.h: d088e7422633b4cad3ad2b0b83ca239b +include/unicode/char16ptr.h: c234b9ba14299c6068f5af1a936c1ead +include/unicode/chariter.h: c8623016adba39ab38ef29f38ec87e45 +include/unicode/choicfmt.h: 832e7b39d19ec192ac1551360436f946 +include/unicode/coleitr.h: d9f07937d600ee811c121c0b0504724c +include/unicode/coll.h: a2062360d7415e08abb01c44088f074e +include/unicode/compactdecimalformat.h: 029f9640501bd640495c18397b5ff8bb +include/unicode/curramt.h: 41fc0e62956b2e0fa7fd5e05213afc85 +include/unicode/currpinf.h: 09cbc4d9eb04b2aa2c4c155961f13c89 +include/unicode/currunit.h: 43648726f439d03c8c8a13b87c122332 +include/unicode/datefmt.h: 28ef92e98cdac29630b0aa0daf122798 +include/unicode/dbbi.h: 3d4186ec9549d6693d136257f610ec06 +include/unicode/dcfmtsym.h: b18b90c0c6371eab5028582492859142 +include/unicode/decimfmt.h: fb4231ddf75de524300ee952634ef038 +include/unicode/docmain.h: 697c221351932e373cf9e5903f40b723 +include/unicode/dtfmtsym.h: cabbccbf9deec91ebf291a19110007fb +include/unicode/dtintrv.h: 7a7ce170e6035b90ef5b4bee91893833 +include/unicode/dtitvfmt.h: da220b13a8f895c4e77b653d865eb049 +include/unicode/dtitvinf.h: 1ad6b7f844a9362b2b7a0f509284cae7 +include/unicode/dtptngen.h: 8f8fcb053b5024c5b1d3dfc258f59344 +include/unicode/dtrule.h: 68551564f8ab72271d3574aa0cba381d +include/unicode/edits.h: 6b8aa73dbf2c2f0b49da5bc5903bcc8c +include/unicode/enumset.h: 3bb75fc43c88682895ae98c02e69810d +include/unicode/errorcode.h: debeda4467a19aaf964fafc73629c8ae +include/unicode/fieldpos.h: 3b041c7d9a5df0aef744b88e764af17e +include/unicode/filteredbrk.h: e54dd29247eb75f8490423f7f8541691 +include/unicode/fmtable.h: 3816f155db2c35ac5de3f80ffdaa549c +include/unicode/format.h: 0417863e1b303fa282659c4903e3a11c +include/unicode/formattedvalue.h: fc50c8972404b212799d76cf8e647888 +include/unicode/fpositer.h: b5e8bbc249dc37e3b159f0a2b5053957 +include/unicode/gender.h: 5e093c1cfb96ef671f2e5dedb96a0d64 +include/unicode/gregocal.h: 15c7b4ceaca9b8b8f8e747d5427aa7a7 +include/unicode/icudataver.h: d1c480a9eb95aaa058a6b9311074bc33 +include/unicode/icuplug.h: 60ad27a2a36284bbc1766f9920769175 +include/unicode/idna.h: a7c3650d5311edeb01f754c574d0fb8b +include/unicode/listformatter.h: 65911d72679c6e0a267e951b03467f37 +include/unicode/localebuilder.h: 1b6106448cf6cde7e7ebf25ee6fe4065 +include/unicode/localematcher.h: 3a03cbb5970a14fe153041c878f583f2 +include/unicode/localpointer.h: a89505f84a4bb4e231a17676f1b1d51a +include/unicode/locdspnm.h: aa260a00e31e970757e3b3cbe00fff3d +include/unicode/locid.h: 6caa36f85c9bab54b78ecd0c056789aa +include/unicode/measfmt.h: 21b534367e4b3825dc70c3a289822df8 +include/unicode/measunit.h: 0f903f67958ad91e8bd2e49fc40c3075 +include/unicode/measure.h: 49091c823a2f12f5f60f7fecd7c452f2 +include/unicode/messagepattern.h: 15ecc58806c256ac91c2549d4f5c242f +include/unicode/msgfmt.h: f9ff9322fa80486203829c15d4982573 +include/unicode/normalizer2.h: 436d923df3a66774b7bf26ffe75a5d1c +include/unicode/normlzr.h: 5bf33ff933ee7eb49c330df38f490f57 +include/unicode/nounit.h: 2b4901f562077b370d82c4bbe229aac4 +include/unicode/numberformatter.h: 0f62c292f92d5598a61647bbf4294e1a +include/unicode/numberrangeformatter.h: 58623918bf66f1fd6687f3dd03180a4b +include/unicode/numfmt.h: 2a21117116463390ec4f19d53f485890 +include/unicode/numsys.h: 186ba43c003b4f56af3c63abd08f418e +include/unicode/parseerr.h: ce38831411af01eeaf0bbbb6e1cb0153 +include/unicode/parsepos.h: 5c53fa7c473d4593fd72ce964b505807 +include/unicode/platform.h: 56fe53b31059acb1be086c45ce88e8c6 +include/unicode/plurfmt.h: 6f1b781b7a62a6ac1c7e4c6a2bb18d77 +include/unicode/plurrule.h: cf4b0b9ec1a525b96e7d27e489044337 +include/unicode/ptypes.h: d74097874c82f77331d8e06a5c59d37f +include/unicode/putil.h: ee1c69d5060b8d5754bf8879bb7f10d1 +include/unicode/rbbi.h: 6c5f44ef812dfb48b65466732513c091 +include/unicode/rbnf.h: e870f2cf64c9b72eb549c413d6f98299 +include/unicode/rbtz.h: ea9f5a1edac3fe535ec7b83636daf61d +include/unicode/regex.h: 16565e3d41228a76f17a63842d9594d2 +include/unicode/region.h: 22585a516ee7525f3e9094f2843b7640 +include/unicode/reldatefmt.h: 1b226903d9375471432582c27ade4934 +include/unicode/rep.h: eab550a9bbb33b4c1283ab16bc2dfafa +include/unicode/resbund.h: cc93ada0e9871eee0a86f81548a3be73 +include/unicode/schriter.h: acea2a510e5c9127dad0e2538cf65ccd +include/unicode/scientificnumberformatter.h: 40eb759fc2902b6c8e732b440fe6a1bc +include/unicode/search.h: a93ebdadfc5113f1b9c9c185262ef461 +include/unicode/selfmt.h: 581ab6f6ac584265d5c56dad4051ee12 +include/unicode/simpleformatter.h: 8e5e9a9589359e06110af10bcf941d54 +include/unicode/simpletz.h: 194e0d388b74daa4cf51d012e2d14ebd +include/unicode/smpdtfmt.h: 0e6383eafd569b511791e826b51df8d1 +include/unicode/sortkey.h: 27f3d671f37c27d0b36953d00c1f2e7b +include/unicode/std_string.h: bb3b2e28a2ae9b66a60b7d90f8c07512 +include/unicode/strenum.h: 3c23eb4fa4d847b6afdd18adf3ccdaf5 +include/unicode/stringoptions.h: d4929224e8d9df2f272f0305780cbacb +include/unicode/stringpiece.h: 3d7911a3b2a59830eaceb37e46110285 +include/unicode/stringtriebuilder.h: 08ce10a0f6e85f4bb078f69d5382f8bc +include/unicode/stsearch.h: b15838a5cf5740b0aaa9af5356aef26b +include/unicode/symtable.h: 7487ffc7069316553d08f1109965bf9d +include/unicode/tblcoll.h: ee27157293d0802cde26d75c6098c1d3 +include/unicode/timezone.h: 54689b5ef15d0f03a146e8aeac163be8 +include/unicode/tmunit.h: 9ddf31866353dde1ae249ed93fce9234 +include/unicode/tmutamt.h: beea411e9f16d8b91fef39a297cd06d8 +include/unicode/tmutfmt.h: ae13f8ac46ad754bf83142943b19a647 +include/unicode/translit.h: f225620498133e8e4bcc2ad6679225e5 +include/unicode/tzfmt.h: b6c94cd901ffe5387f0245ca9fd68604 +include/unicode/tznames.h: a50010925037c01304c719e47bfb369a +include/unicode/tzrule.h: 0e3465c0eeb27a0545f94bf9f5cfc21e +include/unicode/tztrans.h: 117392a0dc2fe373946aecfa74475842 +include/unicode/ubidi.h: d90a13a2933198f134efefc0ff7563e6 +include/unicode/ubiditransform.h: fab65809ece8816f1a002eb843b80e29 +include/unicode/ubrk.h: e85002afa629b85ba239135ab11f47f0 +include/unicode/ucal.h: d247badde5d39cc16e06d26153054c85 +include/unicode/ucasemap.h: 2f240e1dc6db1771e843f1a03fd0c8f4 +include/unicode/ucat.h: f412352b86adccba85d7f3e4b4515064 +include/unicode/uchar.h: ebac2b0b753a1cd10db2f428736bf06d +include/unicode/ucharstrie.h: 16d3d38154f1444b8a3425254ab7ab81 +include/unicode/ucharstriebuilder.h: b92f18132f6c1d61da0ad51b8099435d +include/unicode/uchriter.h: a356cb90d62d9e425e5efbb071c30b21 +include/unicode/uclean.h: ef4b9289f510edd0bb6b779d0a299f44 +include/unicode/ucnv.h: db701a7a83540ef4dcfc4e780f1da016 +include/unicode/ucnv_cb.h: 69c1c5b156028cd623ed7e5b5b4ab730 +include/unicode/ucnv_err.h: 6ef0751460140d23ae678ef85c298906 +include/unicode/ucnvsel.h: 6e4c5e31c2a89439ef4945cd4a402ef3 +include/unicode/ucol.h: 47c1acc6c2bde098f0b06c8590d68b9f +include/unicode/ucoleitr.h: b4576706530850666c1cfd2424276b26 +include/unicode/uconfig.h: 80678a12de446cdf8679cdd5792a12e9 +include/unicode/ucpmap.h: 0b16934410c99981d87ddd10e1759bed +include/unicode/ucptrie.h: 7450de71dd5e1a83f5290da33d48d40d +include/unicode/ucsdet.h: c7d5b3d36da0c71b0a85a72642439a90 +include/unicode/ucurr.h: 5de7a80ece54cf7583e19f292ad17825 +include/unicode/udat.h: c665d53e4691b564ae5394957fcdcf31 +include/unicode/udata.h: 98e2327300a26bbaf40bd8eb7eee8c1a +include/unicode/udateintervalformat.h: 178f650518ecceeb2eca7b763dd68799 +include/unicode/udatpg.h: ce0332b911d1a820a0b45922bd0e97fc +include/unicode/udisplaycontext.h: 57a269787da52ad6720ff5b1e87b5cdd +include/unicode/uenum.h: 41cce54d4862d5068f4f087b935c0657 +include/unicode/ufieldpositer.h: 21f8ba8e285bfea4daa3da8a01911b7e +include/unicode/uformattable.h: cad38a97f9f929ebc28d5e72dc5ec14f +include/unicode/uformattedvalue.h: e1e69e0927595423076481b8f948fd2a +include/unicode/ugender.h: d64c9ad1d5cf04136534e3aca38d2638 +include/unicode/uidna.h: 88ee381ec6ec01cb677f3e5222e9cf22 +include/unicode/uiter.h: 3fea96177f4f814091918f54d1e68ccd +include/unicode/uldnames.h: d18634bc73c16b9ae02b6a60fd94d8be +include/unicode/ulistformatter.h: 21277400caea3c7e7fdb57457c10e423 +include/unicode/uloc.h: 39d42620d3a97a7ae26d7b560ea3eacc +include/unicode/ulocdata.h: 116fad6a2c0db0d08e3f5ae02d93a035 +include/unicode/umachine.h: 0a7fe7df81aedd43f322a9ec540feff5 +include/unicode/umisc.h: eca71d8c8bf86529ae5bbc5f34598bea +include/unicode/umsg.h: 298645d31f8d8e209cbb5eb3751e3ceb +include/unicode/umutablecptrie.h: 5dc81c63a8b2c80ffd401c9bb5180e61 +include/unicode/unifilt.h: e170c06bf1bf81a56c7ed605d41fa02f +include/unicode/unifunct.h: 23981a5088ba5d5af70309b73eef7666 +include/unicode/unimatch.h: 66161ce491e3b24e9e011cfc0e78be42 +include/unicode/unirepl.h: 462716fd44618949b405645ba7b5c8e6 +include/unicode/uniset.h: cb94f902233b2e1807156afe0967e3e0 +include/unicode/unistr.h: 5ebe061e4a17e981bb249c4814f4dd9d +include/unicode/unorm.h: ca96f37ed2e2afd56585a238d73cea51 +include/unicode/unorm2.h: e8fff4023ad114b325f346d2cdbbe043 +include/unicode/unum.h: 656d2aa9a41ca4b7bfad0a09420bdc23 +include/unicode/unumberformatter.h: 9be73b6bb76bb5862a8dfd615e563b82 +include/unicode/unumsys.h: 7e5dd76a0e07f790c30c944bfb810e71 +include/unicode/uobject.h: b56a28b01e3df9088315aeb145ec3a8e +include/unicode/upluralrules.h: 15feae7c7df35b97d5e715f28f616e63 +include/unicode/uregex.h: 10fe8b8c9f98758bf192bc765fa45e3c +include/unicode/uregion.h: a3f28f15972bf18600012815a8c76535 +include/unicode/ureldatefmt.h: d528589ebdc3f8cb6c27ce4867752c55 +include/unicode/urename.h: 1642d190b583bbaaf454ac65a37a8024 +include/unicode/urep.h: 6ada98ac1aa68081f10d17b1abadef6e +include/unicode/ures.h: 8c69586a969eb2898d5d3e8c08beda9c +include/unicode/uscript.h: 5bf2d96240b17507a05ebe4d36b1a38e +include/unicode/usearch.h: 1f3fcea9dc6c40e908992e74f602235f +include/unicode/uset.h: a285e1b480a3abaaee753ba74d245efd +include/unicode/usetiter.h: ab1ebd4b0b9e3560a94a7c6cb3a9e48f +include/unicode/ushape.h: 86fdf709d4312bb17cf95b16f58e1dc4 +include/unicode/uspoof.h: 8b9508cbe045b114f0f618d04fcab512 +include/unicode/usprep.h: e88585ae8bdb3a35aa88417993bde732 +include/unicode/ustdio.h: 3104e526d3de60538f42c0fd5430adcb +include/unicode/ustream.h: 0a74df2b9d1967d0b859d21f5828f4e8 +include/unicode/ustring.h: 92f522f8ef62e443c11baa56c32e42e4 +include/unicode/ustringtrie.h: 54a28aa9c4e117cd3ebfd0a670324f6c +include/unicode/utext.h: 89a08f750d0c5751d4f385c4874c0e61 +include/unicode/utf.h: 4434eeb75c89a49228884aa247714e1c +include/unicode/utf16.h: 147fbb88d8300af3e38d80ce59c1c1ce +include/unicode/utf32.h: a1fdf74f4bd8808f9fb17df371f886d9 +include/unicode/utf8.h: 7f0c4c02bd7506e80fd11a4597cc1450 +include/unicode/utf_old.h: 92ffc297b71c8d83ed05b644183c477c +include/unicode/utmscale.h: 7c59d91f835bc9f4b805dd64e73851d7 +include/unicode/utrace.h: 420d2f8d462ae300ca1903c2a6ebaba3 +include/unicode/utrans.h: 5cd9b1f130197e5fdd8a66519233abf5 +include/unicode/utypes.h: 47eb8ff3f909dafa9bee14f8bb224342 +include/unicode/uvernum.h: a91a8e07c665891ed234de3a58302663 +include/unicode/uversion.h: 0b8f75f3d1c816ee3359dde5be390d17 +include/unicode/vtzone.h: 615f12cb0d05441d0872aa677db80a90 +lib/icu/65.1/Makefile.inc: 73ad866aae05ced0a9a9d1458dc1bf8f +lib/icu/65.1/pkgdata.inc: bf50cad45e347453287b6c89411eaea9 +lib/icu/Makefile.inc: 73ad866aae05ced0a9a9d1458dc1bf8f +lib/icu/current/Makefile.inc: 73ad866aae05ced0a9a9d1458dc1bf8f +lib/icu/current/pkgdata.inc: bf50cad45e347453287b6c89411eaea9 +lib/icu/pkgdata.inc: bf50cad45e347453287b6c89411eaea9 +lib/icudt.lib: 5dbe4c8d0feeacf4d9eea9d067a7afc3 +lib/icuin.lib: 45f344989a36defbc1f0f7227308865d +lib/icuio.lib: 33e944538f0f5c890581d2e8840bba83 +lib/icutest.lib: cc355097c595e6c1c4a1cb1e92ed311a +lib/icutu.lib: 5db94d78a0f650efa606d964444b78e8 +lib/icuuc.lib: 80d1fd2e66b136767395e3811227737c +lib/pkgconfig/icu-i18n.pc: 648b5d9ec85b0426e1069c02742b5617 +lib/pkgconfig/icu-io.pc: 34521e04a76356658abd41e3932acd56 +lib/pkgconfig/icu-uc.pc: cb702fa4b4c1fa616e01eb228cebd947 +licenses/LICENSE: 8bc5d32052a96f214cbdd1e53dfc935d +share/icu/65.1/LICENSE: 8bc5d32052a96f214cbdd1e53dfc935d +share/icu/65.1/config/mh-msys-msvc: c3bf313c25288142820e4ab191c1c153 +share/icu/65.1/install-sh: 5afe8eb5573965dfb58378e4e46f3813 +share/icu/65.1/mkinstalldirs: 31c4856b24c8dbc6319819ccd43b4fda +share/man/man1/derb.1: bddb017162105939f6d43c9539c99497 +share/man/man1/genbrk.1: a4e60e4a60ab26eb29119649bfb60d2b +share/man/man1/gencfu.1: 4950b8178b944a3ebfea1c419ffd3319 +share/man/man1/gencnval.1: 53b10d9351473a7ea603400973377a7d +share/man/man1/gendict.1: 9c1bf2760e5735b0e6601f48e92cb0d9 +share/man/man1/genrb.1: ffebc1e8007bd58f5623299e6b4babe8 +share/man/man1/icu-config.1: f4670ca16d77ce21310e48aa91f7ee5b +share/man/man1/makeconv.1: c96397ad56d2c21649757c407aac46d8 +share/man/man1/pkgdata.1: 5f7b05c28de887cca1e5d7bfb9db4c39 +share/man/man8/genccode.8: 498418dc0aec1fa7ccfb83c491b5a23e +share/man/man8/gencmn.8: c43635e431ea0f1616ea8266e36c0d75 +share/man/man8/gensprep.8: 396d70fec1a04aae25e6bfc6e8e58c65 +share/man/man8/icupkg.8: 430bcbed42faa9ea33b161a48c0490c6 diff --git a/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.3/qtproject/stable/package/1c8544b57637b92dcdfce760b76b459bde0ce701/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.3/qtproject/stable/package/1c8544b57637b92dcdfce760b76b459bde0ce701/conanmanifest.txt new file mode 100644 index 00000000..4f7d3680 --- /dev/null +++ b/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.3/qtproject/stable/package/1c8544b57637b92dcdfce760b76b459bde0ce701/conanmanifest.txt @@ -0,0 +1,12 @@ +1582282172 +conaninfo.txt: d3531bf4208a49880b6916cb487ca0fd +include/jconfig.h: 36405c50a3b1509877826e26eac4fb69 +include/jerror.h: 9b7898fe417de269b8be88b10df908b0 +include/jmorecfg.h: 7873b0a4457d21a746e23c16fc16127d +include/jpeglib.h: 49b0829e2b84fcd4a0cee359199499cb +include/turbojpeg.h: b5b3a4a233ea12d2041ad1d1c971e6a0 +lib/jpeg-static.lib: f1380749e57edaa40366510a55c4a581 +lib/pkgconfig/libjpeg.pc: 46be85b895bb997ec57faee440b199c9 +lib/pkgconfig/libturbojpeg.pc: 891d57d67b7bb2d2246f6c84e3802ff3 +lib/turbojpeg-static.lib: 03531f3967223cb10088dccf1f0ab17e +licenses/LICENSE.md: 2a423a921d0f68082c80ccc7ad808ef2 diff --git a/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.3/qtproject/stable/package/7fbb66ade701b46f34dff2e121edef66968608b5/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.3/qtproject/stable/package/7fbb66ade701b46f34dff2e121edef66968608b5/conanmanifest.txt new file mode 100644 index 00000000..acabe605 --- /dev/null +++ b/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.3/qtproject/stable/package/7fbb66ade701b46f34dff2e121edef66968608b5/conanmanifest.txt @@ -0,0 +1,12 @@ +1582282050 +conaninfo.txt: 5d70fc12733b9ab4f2eef806064af4fc +include/jconfig.h: 36405c50a3b1509877826e26eac4fb69 +include/jerror.h: 9b7898fe417de269b8be88b10df908b0 +include/jmorecfg.h: 7873b0a4457d21a746e23c16fc16127d +include/jpeglib.h: 49b0829e2b84fcd4a0cee359199499cb +include/turbojpeg.h: b5b3a4a233ea12d2041ad1d1c971e6a0 +lib/jpeg-static.lib: dc1e769eef09dec4761fcecb6e25e416 +lib/pkgconfig/libjpeg.pc: 58e4fea9c97c1e8ddfe69f5c7a90ee63 +lib/pkgconfig/libturbojpeg.pc: d8e6f88b279ae6759cf8f0363cb08913 +lib/turbojpeg-static.lib: 34efadab9c45a4be93bb62e415b7bd5b +licenses/LICENSE.md: 2a423a921d0f68082c80ccc7ad808ef2 diff --git a/coin/provisioning/common/windows/conan_manifests/libxml2/2.9.10/qtproject/stable/package/52cf7dbd8248b3f021f6d94e6a16c70823093916/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libxml2/2.9.10/qtproject/stable/package/52cf7dbd8248b3f021f6d94e6a16c70823093916/conanmanifest.txt new file mode 100644 index 00000000..0e317ac4 --- /dev/null +++ b/coin/provisioning/common/windows/conan_manifests/libxml2/2.9.10/qtproject/stable/package/52cf7dbd8248b3f021f6d94e6a16c70823093916/conanmanifest.txt @@ -0,0 +1,56 @@ +1582269846 +bin/libxml2.dll: 9807c311cef5ae7c2116871b45bb4398 +bin/xmlcatalog.exe: 3ead86d739b476b2ca12ac46ef1f0707 +bin/xmllint.exe: bd9d34f006212ca595816def045d62f7 +conaninfo.txt: 0768398792af659c3fbe40072a9585d3 +include/libxml2/libxml/DOCBparser.h: 21e6523a86338325c527e1e8847adc1d +include/libxml2/libxml/HTMLparser.h: d57891c89573ed6dce04b8133e7438d2 +include/libxml2/libxml/HTMLtree.h: 46cf4cefb419e18c40b8d5b6ac982f3f +include/libxml2/libxml/SAX.h: bf46553ceac47b24126d4a1abb7b26fa +include/libxml2/libxml/SAX2.h: 226675de48e46a282141b438b0895db4 +include/libxml2/libxml/c14n.h: 6f2b3ecf12e815ce0159be0fbba1bc4f +include/libxml2/libxml/catalog.h: 382caf85e794d06e84280cf702a42c18 +include/libxml2/libxml/chvalid.h: 4e1ca6554b98687e75d03662cd92d14e +include/libxml2/libxml/debugXML.h: 73816937df233c77ebfa261f3ca00dd8 +include/libxml2/libxml/dict.h: a48513ceb9774ebece2daa8a2cd52f07 +include/libxml2/libxml/encoding.h: 807b84fade38abad3ae0d9b6af714dbc +include/libxml2/libxml/entities.h: 16467595fdaff28420d1657b1658f267 +include/libxml2/libxml/globals.h: 4b9d5b9ff807b093244cc301d2cefda5 +include/libxml2/libxml/hash.h: af6927d60ab5a971b68a65626d903bb2 +include/libxml2/libxml/list.h: 7600108b9a637797d97d3f47ed045287 +include/libxml2/libxml/nanoftp.h: 3f25d5edfbdb1fd084e53d9a7dbaff73 +include/libxml2/libxml/nanohttp.h: d31b62933eab6d58a46eb075b49b7715 +include/libxml2/libxml/parser.h: 3e149b90da438833f98a1bcd12a0abcb +include/libxml2/libxml/parserInternals.h: 4c3e253f541b903f061a2ef7fadcdc35 +include/libxml2/libxml/pattern.h: db123ed3ecc27ab31b3f808e96edb492 +include/libxml2/libxml/relaxng.h: 348c151f5b45a3543862c0e280f9fbba +include/libxml2/libxml/schemasInternals.h: 5072dee68b3423ac6f13185b984cc325 +include/libxml2/libxml/schematron.h: 96d9e0c083c4949e246ce02cf31de483 +include/libxml2/libxml/threads.h: 56e93792a1e4d23fe9c6940231cd4a40 +include/libxml2/libxml/tree.h: 406fe7a05a1503755da736b98b1ab781 +include/libxml2/libxml/uri.h: 032d430e35153af35f2fe17a9e9c37bf +include/libxml2/libxml/valid.h: 3c082c0a5b81e1bc9fd9a21b69014584 +include/libxml2/libxml/xinclude.h: 1f8b2beb8f49da4bf3a658d31dccb2ef +include/libxml2/libxml/xlink.h: 0f722691abab1f60d5a9f0c14bbb26c4 +include/libxml2/libxml/xmlIO.h: cb4be47d203f7d54f374b9272db7e3f3 +include/libxml2/libxml/xmlautomata.h: 3c3c0a7d353bacfbede7c2decf27e62a +include/libxml2/libxml/xmlerror.h: 28cd85987165565f9306b9b66a2b4e88 +include/libxml2/libxml/xmlexports.h: 27052360fc0021d99870d8f49371dae0 +include/libxml2/libxml/xmlmemory.h: c0167c625ecaf670d76480506425b472 +include/libxml2/libxml/xmlmodule.h: de174bf853776e7e653c66c059d19e61 +include/libxml2/libxml/xmlreader.h: f4e1ae61cb2ac0d3ded93985fed902db +include/libxml2/libxml/xmlregexp.h: fea3110c96e8cd9013900e1c8e5b6c0b +include/libxml2/libxml/xmlsave.h: eed2463cad941f74f99b8b9bc03aa74d +include/libxml2/libxml/xmlschemas.h: 44ee98f77e997b8843fe6e5c45aa4ab0 +include/libxml2/libxml/xmlschemastypes.h: 160197e01dfa56cd9ad09d201d5bdeb4 +include/libxml2/libxml/xmlstring.h: 82efb8a055d5fc8eb7d815ed471eca53 +include/libxml2/libxml/xmlunicode.h: b9f0b8acddfee9b620ea822978a51d29 +include/libxml2/libxml/xmlversion.h: 1e9e77170ee677ce49956476e0f845d6 +include/libxml2/libxml/xmlwriter.h: 8694436144b1fb0aab2e2d6b725035e3 +include/libxml2/libxml/xpath.h: bfe49b59c50e544f6e7a72423159775a +include/libxml2/libxml/xpathInternals.h: c18fad3cce22369a75166afed6343bcd +include/libxml2/libxml/xpointer.h: 5b8025430888d5b99d03d159ddc78388 +include/libxml2/win32config.h: e51ff5a65571584fbe45f75eede0ee3e +include/libxml2/wsockcompat.h: fd8ce4d6dabe53035a28c6aa64926b1c +lib/libxml2.lib: 7fcc4938ce977551d281c3b284908fc4 +licenses/COPYING: 2044417e2e5006b65a8b9067b683fcf1 diff --git a/coin/provisioning/common/windows/conan_manifests/libxml2/2.9.10/qtproject/stable/package/6950736270999084f676eb62bcb88ece1b8351b7/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libxml2/2.9.10/qtproject/stable/package/6950736270999084f676eb62bcb88ece1b8351b7/conanmanifest.txt new file mode 100644 index 00000000..04b694fb --- /dev/null +++ b/coin/provisioning/common/windows/conan_manifests/libxml2/2.9.10/qtproject/stable/package/6950736270999084f676eb62bcb88ece1b8351b7/conanmanifest.txt @@ -0,0 +1,56 @@ +1582269689 +bin/libxml2.dll: ae389e2ddae1c43bf9ec445624f47b2a +bin/xmlcatalog.exe: bbc783406f307ead9e208cc053057515 +bin/xmllint.exe: 219e6273a76bff9f81311845cdafbdc5 +conaninfo.txt: fa7291961078c99298606983d6ee6f4f +include/libxml2/libxml/DOCBparser.h: 21e6523a86338325c527e1e8847adc1d +include/libxml2/libxml/HTMLparser.h: d57891c89573ed6dce04b8133e7438d2 +include/libxml2/libxml/HTMLtree.h: 46cf4cefb419e18c40b8d5b6ac982f3f +include/libxml2/libxml/SAX.h: bf46553ceac47b24126d4a1abb7b26fa +include/libxml2/libxml/SAX2.h: 226675de48e46a282141b438b0895db4 +include/libxml2/libxml/c14n.h: 6f2b3ecf12e815ce0159be0fbba1bc4f +include/libxml2/libxml/catalog.h: 382caf85e794d06e84280cf702a42c18 +include/libxml2/libxml/chvalid.h: 4e1ca6554b98687e75d03662cd92d14e +include/libxml2/libxml/debugXML.h: 73816937df233c77ebfa261f3ca00dd8 +include/libxml2/libxml/dict.h: a48513ceb9774ebece2daa8a2cd52f07 +include/libxml2/libxml/encoding.h: 807b84fade38abad3ae0d9b6af714dbc +include/libxml2/libxml/entities.h: 16467595fdaff28420d1657b1658f267 +include/libxml2/libxml/globals.h: 4b9d5b9ff807b093244cc301d2cefda5 +include/libxml2/libxml/hash.h: af6927d60ab5a971b68a65626d903bb2 +include/libxml2/libxml/list.h: 7600108b9a637797d97d3f47ed045287 +include/libxml2/libxml/nanoftp.h: 3f25d5edfbdb1fd084e53d9a7dbaff73 +include/libxml2/libxml/nanohttp.h: d31b62933eab6d58a46eb075b49b7715 +include/libxml2/libxml/parser.h: 3e149b90da438833f98a1bcd12a0abcb +include/libxml2/libxml/parserInternals.h: 4c3e253f541b903f061a2ef7fadcdc35 +include/libxml2/libxml/pattern.h: db123ed3ecc27ab31b3f808e96edb492 +include/libxml2/libxml/relaxng.h: 348c151f5b45a3543862c0e280f9fbba +include/libxml2/libxml/schemasInternals.h: 5072dee68b3423ac6f13185b984cc325 +include/libxml2/libxml/schematron.h: 96d9e0c083c4949e246ce02cf31de483 +include/libxml2/libxml/threads.h: 56e93792a1e4d23fe9c6940231cd4a40 +include/libxml2/libxml/tree.h: 406fe7a05a1503755da736b98b1ab781 +include/libxml2/libxml/uri.h: 032d430e35153af35f2fe17a9e9c37bf +include/libxml2/libxml/valid.h: 3c082c0a5b81e1bc9fd9a21b69014584 +include/libxml2/libxml/xinclude.h: 1f8b2beb8f49da4bf3a658d31dccb2ef +include/libxml2/libxml/xlink.h: 0f722691abab1f60d5a9f0c14bbb26c4 +include/libxml2/libxml/xmlIO.h: cb4be47d203f7d54f374b9272db7e3f3 +include/libxml2/libxml/xmlautomata.h: 3c3c0a7d353bacfbede7c2decf27e62a +include/libxml2/libxml/xmlerror.h: 28cd85987165565f9306b9b66a2b4e88 +include/libxml2/libxml/xmlexports.h: 27052360fc0021d99870d8f49371dae0 +include/libxml2/libxml/xmlmemory.h: c0167c625ecaf670d76480506425b472 +include/libxml2/libxml/xmlmodule.h: de174bf853776e7e653c66c059d19e61 +include/libxml2/libxml/xmlreader.h: f4e1ae61cb2ac0d3ded93985fed902db +include/libxml2/libxml/xmlregexp.h: fea3110c96e8cd9013900e1c8e5b6c0b +include/libxml2/libxml/xmlsave.h: eed2463cad941f74f99b8b9bc03aa74d +include/libxml2/libxml/xmlschemas.h: 44ee98f77e997b8843fe6e5c45aa4ab0 +include/libxml2/libxml/xmlschemastypes.h: 160197e01dfa56cd9ad09d201d5bdeb4 +include/libxml2/libxml/xmlstring.h: 82efb8a055d5fc8eb7d815ed471eca53 +include/libxml2/libxml/xmlunicode.h: b9f0b8acddfee9b620ea822978a51d29 +include/libxml2/libxml/xmlversion.h: 1e9e77170ee677ce49956476e0f845d6 +include/libxml2/libxml/xmlwriter.h: 8694436144b1fb0aab2e2d6b725035e3 +include/libxml2/libxml/xpath.h: bfe49b59c50e544f6e7a72423159775a +include/libxml2/libxml/xpathInternals.h: c18fad3cce22369a75166afed6343bcd +include/libxml2/libxml/xpointer.h: 5b8025430888d5b99d03d159ddc78388 +include/libxml2/win32config.h: e51ff5a65571584fbe45f75eede0ee3e +include/libxml2/wsockcompat.h: fd8ce4d6dabe53035a28c6aa64926b1c +lib/libxml2.lib: 7fad5ca5e6d3bcc2115e380257743d75 +licenses/COPYING: 2044417e2e5006b65a8b9067b683fcf1 diff --git a/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.34/qtproject/stable/package/a19b1f00428920c59efe23b98acbe83d331049b4/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.34/qtproject/stable/package/a19b1f00428920c59efe23b98acbe83d331049b4/conanmanifest.txt new file mode 100644 index 00000000..6e45a634 --- /dev/null +++ b/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.34/qtproject/stable/package/a19b1f00428920c59efe23b98acbe83d331049b4/conanmanifest.txt @@ -0,0 +1,37 @@ +1582271502 +bin/libexslt.dll: dfa355cf061960fb9ac90eb96978efe2 +bin/libxslt.dll: 66d893778ed2fdb0996d65cfafde86c8 +bin/xsltproc.exe: 9758509e1893f33b8a72fac95277173d +conaninfo.txt: 925c32911a6c22d5017050c029b235fe +include/libexslt/exslt.h: f01af3bf058520059ba6d50f42133717 +include/libexslt/exsltconfig.h: a0afe6a6e6db6ad4dc8bf86d0364f188 +include/libexslt/exsltexports.h: 03a75a174bc5b056f014e592cfd4db36 +include/libexslt/libexslt.h: 4564d6e70f8ce16e36c0bde5969fdab5 +include/libxslt/attributes.h: 32e43c08f66b85266c391301d322a21f +include/libxslt/documents.h: 22a35bd1102fd1ac301e50cf650a8b8a +include/libxslt/extensions.h: 0396b6be07f707b0c6ee171a63b2e520 +include/libxslt/extra.h: 94fe9ce1c0c47724aae4a1bcb8c29433 +include/libxslt/functions.h: 052fd28e9971416b2bbebdc3d1103c4e +include/libxslt/imports.h: 66e26ad969e3c37fdeedcbc2716d7cf3 +include/libxslt/keys.h: 77a11ee3de841d02d3461b829cfcc11e +include/libxslt/libxslt.h: b84034c942ffa214709b590b29131637 +include/libxslt/namespaces.h: c784b4b8e80274491fe023ce26d4847b +include/libxslt/numbersInternals.h: 27c2c21ab1535f84710fe1c8c8829018 +include/libxslt/pattern.h: adf6b78e6c68a7d34ae680f6dc3f5240 +include/libxslt/preproc.h: 829de337aca8b15f699708e6b7340549 +include/libxslt/security.h: 1b24b61ea6afe01d18c647c94b1245c7 +include/libxslt/templates.h: 6901f4c8fad239b588b9f6d4cdfef5ac +include/libxslt/transform.h: ccbcce4553f3231003b1944002814246 +include/libxslt/trio.h: 7da7b1fcf378330699c7ecdd96908641 +include/libxslt/triodef.h: e41149b088de4a04c067c85969f4db3c +include/libxslt/variables.h: ebd9b3b1f996c4a2ed79d4473ff0fd77 +include/libxslt/win32config.h: c64153b1a2c8bba1a8aa600741f04690 +include/libxslt/xslt.h: 0c08b8e7223b72f822a58457520b6387 +include/libxslt/xsltInternals.h: 0c245b0fcc81bf537632a45adf8fcffb +include/libxslt/xsltconfig.h: 5a24e58adcdbe603c43a8f044ba5f763 +include/libxslt/xsltexports.h: 751f95448e71222d8e10d31ebf8822df +include/libxslt/xsltlocale.h: d7b200e408cefe5082b15d3a5e1bf600 +include/libxslt/xsltutils.h: 5f7848088182b183e6d1fdb335b2616a +lib/libexslt.lib: f6157fec5ccb3854968dc422548971f3 +lib/libxslt.lib: 63331e57a1bc5adaa352f3ee2c68b5cd +licenses/COPYING: 0cd9a07afbeb24026c9b03aecfeba458 diff --git a/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.34/qtproject/stable/package/d9686cd1257700d08189681d9907564e4a9147cb/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.34/qtproject/stable/package/d9686cd1257700d08189681d9907564e4a9147cb/conanmanifest.txt new file mode 100644 index 00000000..8422de36 --- /dev/null +++ b/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.34/qtproject/stable/package/d9686cd1257700d08189681d9907564e4a9147cb/conanmanifest.txt @@ -0,0 +1,37 @@ +1582271394 +bin/libexslt.dll: 1a591c14ad6a05a2fe4a20cf40573e75 +bin/libxslt.dll: 051a19fc29aff43011488ea49d2cf353 +bin/xsltproc.exe: 1105ea2e3f79fdd698feb5fa8858e01e +conaninfo.txt: f5d7a59989b8119bea8988657e0ba42c +include/libexslt/exslt.h: f01af3bf058520059ba6d50f42133717 +include/libexslt/exsltconfig.h: a0afe6a6e6db6ad4dc8bf86d0364f188 +include/libexslt/exsltexports.h: 03a75a174bc5b056f014e592cfd4db36 +include/libexslt/libexslt.h: 4564d6e70f8ce16e36c0bde5969fdab5 +include/libxslt/attributes.h: 32e43c08f66b85266c391301d322a21f +include/libxslt/documents.h: 22a35bd1102fd1ac301e50cf650a8b8a +include/libxslt/extensions.h: 0396b6be07f707b0c6ee171a63b2e520 +include/libxslt/extra.h: 94fe9ce1c0c47724aae4a1bcb8c29433 +include/libxslt/functions.h: 052fd28e9971416b2bbebdc3d1103c4e +include/libxslt/imports.h: 66e26ad969e3c37fdeedcbc2716d7cf3 +include/libxslt/keys.h: 77a11ee3de841d02d3461b829cfcc11e +include/libxslt/libxslt.h: b84034c942ffa214709b590b29131637 +include/libxslt/namespaces.h: c784b4b8e80274491fe023ce26d4847b +include/libxslt/numbersInternals.h: 27c2c21ab1535f84710fe1c8c8829018 +include/libxslt/pattern.h: adf6b78e6c68a7d34ae680f6dc3f5240 +include/libxslt/preproc.h: 829de337aca8b15f699708e6b7340549 +include/libxslt/security.h: 1b24b61ea6afe01d18c647c94b1245c7 +include/libxslt/templates.h: 6901f4c8fad239b588b9f6d4cdfef5ac +include/libxslt/transform.h: ccbcce4553f3231003b1944002814246 +include/libxslt/trio.h: 7da7b1fcf378330699c7ecdd96908641 +include/libxslt/triodef.h: e41149b088de4a04c067c85969f4db3c +include/libxslt/variables.h: ebd9b3b1f996c4a2ed79d4473ff0fd77 +include/libxslt/win32config.h: c64153b1a2c8bba1a8aa600741f04690 +include/libxslt/xslt.h: 0c08b8e7223b72f822a58457520b6387 +include/libxslt/xsltInternals.h: 0c245b0fcc81bf537632a45adf8fcffb +include/libxslt/xsltconfig.h: 5a24e58adcdbe603c43a8f044ba5f763 +include/libxslt/xsltexports.h: 751f95448e71222d8e10d31ebf8822df +include/libxslt/xsltlocale.h: d7b200e408cefe5082b15d3a5e1bf600 +include/libxslt/xsltutils.h: 5f7848088182b183e6d1fdb335b2616a +lib/libexslt.lib: b10239833b6a5f4f489202cb8b2256bd +lib/libxslt.lib: 0fcb41267f05f802050235fa09e0688f +licenses/COPYING: 0cd9a07afbeb24026c9b03aecfeba458 diff --git a/coin/provisioning/common/windows/disable-defragment.ps1 b/coin/provisioning/common/windows/disable-defragment.ps1 index 876938f8..e76f0649 100644 --- a/coin/provisioning/common/windows/disable-defragment.ps1 +++ b/coin/provisioning/common/windows/disable-defragment.ps1 @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2018 The Qt Company Ltd. +## Copyright (C) 2019 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -31,4 +31,42 @@ ## ############################################################################# -schtasks /Delete /TN "\Microsoft\Windows\Defrag\ScheduledDefrag" /F +# Windows 7 does not have Get-ScheduledTask and Unregister-ScheduledTask +# thus needing its own version. +Write-Host "Disabling defragmentation" +$version = Get-CimInstance Win32_OperatingSystem | Select-Object -ExpandProperty Caption +if ($version -like '*Windows 7*'){ + $pi = New-Object System.Diagnostics.ProcessStartInfo + $pi.FileName = "C:\Windows\System32\schtasks.exe" + $pi.RedirectStandardError = $true + $pi.UseShellExecute = $false + $pi.Arguments = "/Delete /TN `"\Microsoft\Windows\Defrag\ScheduledDefrag`" /F" + $prog = New-Object System.Diagnostics.Process + $prog.StartInfo = $pi + $prog.Start() | Out-Null + $err = $prog.StandardError.ReadToEnd() + $prog.WaitForExit() + if ($prog.ExitCode -eq 0){ + Write-Host "Scheduled defragmentation removed" + } else { + if ($err -like '*cannot find the file*'){ + Write-Host "No scheduled defragmentation task found" + exit 0 + } else { + Write-Host "Error while deleting scheduled defragmentation task: $err" + } + } +} +else { + try { + $state = (Get-ScheduledTask -ErrorAction Stop -TaskName "ScheduledDefrag").State + Write-Host "Scheduled defragmentation task found in state: $state" + } + catch { + Write-Host "No scheduled defragmentation task found" + exit 0 + } + Write-Host "Unregistering scheduled defragmentation task" + Unregister-ScheduledTask -ErrorAction Stop -Confirm:$false -TaskName ScheduledDefrag + Write-Host "Scheduled Defragmentation task was cancelled" +} diff --git a/coin/provisioning/common/windows/disable-windows-update-assessment.ps1 b/coin/provisioning/common/windows/disable-windows-update-assessment.ps1 deleted file mode 100644 index 8cf6d6fe..00000000 --- a/coin/provisioning/common/windows/disable-windows-update-assessment.ps1 +++ /dev/null @@ -1,23 +0,0 @@ -# The Windows as a Service (WaaS) Update Assessment Platform provides information on a device's Windows updates. - -$limit = (Get-Date).AddMinutes(20) -$path = "C:\Windows\System32\WaaSAssessment.dll" - -DO { - takeown /F $path - icacls $path /grant Administrators:f - Write-host "Deleting $path" - - Try { - del $path - } - Catch [System.UnauthorizedAccessException] { - Write-host "Access to the path '$path' is denied." - Continue - } - - if ((Get-Date) -gt $limit) { - exit 1 - } - -}while (Test-Path -Path "$path") diff --git a/coin/provisioning/common/windows/disable-windows-updates.ps1 b/coin/provisioning/common/windows/disable-windows-updates.ps1 index 87414f03..15644cfe 100644 --- a/coin/provisioning/common/windows/disable-windows-updates.ps1 +++ b/coin/provisioning/common/windows/disable-windows-updates.ps1 @@ -33,6 +33,8 @@ # This script disables the automatic Windows updates +. "$PSScriptRoot\helpers.ps1" + $service = get-service wuauserv if (-not $service) { Write-Host "Windows Update service not found." @@ -43,7 +45,7 @@ if ($service.Status -eq "Stopped") { Write-Host "Windows Update service already stopped." } else { Write-Host "Stopping Windows Update service." - Stop-Service -Name "wuauserv" -Force + Retry {Stop-Service -Name "wuauserv" -Force} 20 5 } $startup = Get-WmiObject Win32_Service | Where-Object {$_.Name -eq "wuauserv"} | Select -ExpandProperty "StartMode" diff --git a/coin/provisioning/common/windows/emsdk.ps1 b/coin/provisioning/common/windows/emsdk.ps1 new file mode 100755 index 00000000..b3375d07 --- /dev/null +++ b/coin/provisioning/common/windows/emsdk.ps1 @@ -0,0 +1,124 @@ +############################################################################ +## +## Copyright (C) 2019 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################ + +. "$PSScriptRoot\helpers.ps1" + +# This script will install emscripten needed by WebAssembly + +$version = "1.39.8" +$versionNode = "12.9.1" +$versionWinPython = "3.7.4" +$versionJre = "8_update_152" + +$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" + +$urlEmscriptenCache="$urlCache/emscripten.$version.zip" + +$urlWasmBinariesExternal="$urlEmscripten/win/9e60f34accb4627d7358223862a7e74291886ab6/wasm-binaries.zip" +$urlWasmBinariesCache="$urlCache\windows\wasm-binaries.$version.zip" +$sha1WasmBinaries="E94DCA7BA0526F88EDDBE45A0A0F61778D173603" + +$urlOfficialNode = "$urlEmscripten/deps/node-v$versionNode-win-x64.zip" +$urlCacheNode = "$urlCache/windows/node-v$versionNode-win-x64.zip" +$sha1Node = "D064145694578D6617AA99C694772D21480B6B6D" + +$urlOfficialWinPython = "$urlEmscripten/deps/python-$versionWinPython-embed-amd64-patched.zip" +$urlCacheWinPython = "$urlCache/windows/python-$versionWinPython-embed-amd64-patched.zip" +$sha1WinPython = "27C5A465390167FC03F3DD9075E3FDAAD9FBE104" + +$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 = "3721DC133824BA59CDBDFC93704D47CE265F2AFE" + +$installLocationEmsdk = "C:\\Utils\\emsdk" +$temp = "C:\Windows\Temp" + +function Install { + + Param ( + [string] $urlOfficial = $(BadParam("Official url path")), + [string] $urlCache = $(BadParam("Cached url path")), + [string] $sha1 = $(BadParam("SHA1 checksum of the file")), + [string] $location = $(BadParam("Download location")), + [string] $installLocation = $(BadParam("Install location")) + ) + + Download $urlOfficial $urlCache $location + Verify-Checksum $location $sha1 + Extract-7Zip $location $installLocation + +} + +New-Item -ItemType directory -Force -Path "$installLocationEmsdk" + +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\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\\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\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\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-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 +Write-Output "emsdk NodeJs = $versionNode" >> ~/versions.txt +Write-Output "emsdk WinPython 64bit = $versionWinPython" >> ~/versions.txt +Write-Output "emsdk portable jre = $versionJre" >> ~/versions.txt diff --git a/coin/provisioning/common/windows/helpers.ps1 b/coin/provisioning/common/windows/helpers.ps1 index 0f39beed..8599791d 100644 --- a/coin/provisioning/common/windows/helpers.ps1 +++ b/coin/provisioning/common/windows/helpers.ps1 @@ -3,7 +3,7 @@ function Verify-Checksum Param ( [string]$File=$(throw("You must specify a filename to get the checksum of.")), [string]$Expected=$(throw("Checksum required")), - [ValidateSet("sha1","md5")][string]$Algorithm="sha1" + [ValidateSet("sha256","sha1","md5")][string]$Algorithm="sha1" ) Write-Host "Verifying checksum of $File" $fs = new-object System.IO.FileStream $File, "Open" @@ -204,6 +204,38 @@ function Get-Proxy { return (Get-ItemProperty -Path 'HKCU:\Software\Microsoft\Windows\CurrentVersion\Internet Settings').proxyServer } +function Retry{ + <# + usage: + Retry{CODE} + Retry{CODE} <num of retries> <delay_s> + #delay is in seconds + #> + Param( + [Parameter(mandatory=$true)] + [scriptblock]$command, + [int][ValidateRange(1, 20)]$retry = 5, + [int][ValidateRange(1, 60)]$delay_s = 5 + ) + $success=$false + $retry_count=0 + do{ + try { + Invoke-Command -ScriptBlock $command + $success=$true + } + catch { + $retry_count++ + Write-Host "Error: $_, try: $retry_count, retrying in $delay_s seconds" + Start-Sleep -Seconds $delay_s + } + } until ($success -or $retry+1 -le $retry_count) + + if (-not $success) { + Throw("Failed to run command successfully in $retry_count tries") + } +} + function Remove { Param ( diff --git a/coin/provisioning/common/windows/install-gnuwin32.ps1 b/coin/provisioning/common/windows/install-gnuwin32.ps1 index 99862b3c..6acede79 100644 --- a/coin/provisioning/common/windows/install-gnuwin32.ps1 +++ b/coin/provisioning/common/windows/install-gnuwin32.ps1 @@ -44,3 +44,4 @@ Verify-Checksum "$temp\$zipPackage" "d7a34a385ccde2374b8a2ca3369e5b8a1452c5a5" Extract-7Zip "$temp\$zipPackage" C:\Utils Write-Output "$prog qt5 commit sha = 98c4f1bbebfb3cc6d8e031d36fd1da3c19e634fb" >> ~\versions.txt +Prepend-Path "C:\Utils\gnuwin32\bin" diff --git a/coin/provisioning/common/windows/install-msys2.ps1 b/coin/provisioning/common/windows/install-msys2.ps1 index e88c8f07..784b09dc 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. @@ -33,6 +33,8 @@ . "$PSScriptRoot\helpers.ps1" +# This script installs 7-Zip + $version = "20181211" $prog = "msys2" if (Is64BitWinHost) { @@ -56,17 +58,21 @@ $TargetLocation = "C:\Utils" Download $url_official $url_cache $PackagePath Verify-Checksum $PackagePath $sha1 Extract-tar_gz $PackagePath $TargetLocation -$bash = "$TargetLocation\$folder\usr\bin\bash" +$msys = "$TargetLocation\$folder\msys2_shell.cmd" # install perl -Run-Executable "$bash" "`"-l`" `"-c`" `"rm -rf /etc/pacman.d/gnupg;pacman-key --init;pacman-key --populate msys2;pacman -S --noconfirm perl make`"" -Run-Executable "$bash" "`"-l`" `"-c`" `"yes | 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`"" + +# Sometimes gpg-agent won't get killed after the installation process. If that happens the provisioning will won't continue and it will hang until timeout. So we need make sure it will be killed. +# Let's sleep for awhile and wait that msys installation is finished. Otherwise the installation might start up gpg-agent or dirmngr after the script has passed the killing process. +Start-Sleep -s 180 +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" -# pacman-key launches gpg-agent and dirmngr in the background, see https://github.com/Alexpux/MSYS2-pacman/issues/56 -Stop-Process -Name "gpg-agent" -ErrorAction Ignore -Stop-Process -Name "dirmngr" -ErrorAction Ignore - -Write-Output "MSYS2 = $version" >> ~\versions.txt +Write-Output "7-Zip = $version" >> ~\versions.txt diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86/01-systemsetup.sh b/coin/provisioning/common/windows/install_telegraf.ps1 index ee6af148..0a64cfd4 100755..100644 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86/01-systemsetup.sh +++ b/coin/provisioning/common/windows/install_telegraf.ps1 @@ -1,8 +1,6 @@ -#!/usr/bin/env bash - ############################################################################# ## -## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2019 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -33,27 +31,38 @@ ## ############################################################################# -# This script modifies system settings for automated use +. "$PSScriptRoot\..\..\common\windows\helpers.ps1" + + +# Install a specific version of Telegraf +# https://github.com/influxdata/telegraf/releases + +$version = "1.12.6" + +if (Is64BitWinHost) { + $arch = "amd64" + $sha256 = "5d025d85070e8c180c443580afa8a27421a7bbcf14b5044894e9f3298d0ce97a" +} else { + $arch = "i386" + $sha256 = "5178a0bdaab448c2ef965b0e36f835849cea731ccd87c4a4527f0f05fbbdf271" +} + +$filename = "telegraf-" + $version + "_windows_" + $arch + ".zip" -set -ex +$url_cache = "http://ci-files01-hki.intra.qt.io/input/telegraf/" + $filename +$url_official = "https://dl.influxdata.com/telegraf/releases/" + $filename +$tempfile = "C:\Windows\Temp\" + $filename -# shellcheck source=../common/unix/check_and_set_proxy.sh -source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh" +Write-Host "Fetching Telegraf $version..." +Download $url_official $url_cache $tempfile +Verify-Checksum $tempfile $sha256 sha256 -NTS_IP=10.212.2.216 +Write-Host "Installing telegraf.exe under C:\Utils\telegraf" +Extract-7Zip $tempfile C:\Utils "telegraf" +Copy-Item "$PSScriptRoot\..\..\common\windows\telegraf-coin.conf" C:\telegraf-coin.conf -echo "Set timezone to UTC." -sudo timedatectl set-timezone Etc/UTC -echo "Timeout for blanking the screen (0 = never)" -gsettings set org.gnome.desktop.session idle-delay 0 -echo "Prevents screen lock when screesaver goes active." -gsettings set org.gnome.desktop.screensaver lock-enabled false -echo "Disable questions on shutdown." -gsettings set com.canonical.indicator.session suppress-logout-restart-shutdown true +. "$PSScriptRoot\telegraf_password.ps1" -echo "Set Network Test Server address to $NTS_IP in /etc/hosts" -echo "$NTS_IP qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts +Start-Process -FilePath C:\Utils\telegraf\telegraf.exe -ArgumentList "--config C:\telegraf-coin.conf" -if [ "$proxy" != "" ]; then - echo "Acquire::http::Proxy \"$proxy\";" | sudo tee -a /etc/apt/apt.conf -fi +Write-Output "Telegraf = $version" >> ~\versions.txt diff --git a/coin/provisioning/common/windows/msvc_2015_update3_patch.ps1 b/coin/provisioning/common/windows/msvc_2015_update3_patch.ps1 deleted file mode 100644 index bfbb397a..00000000 --- a/coin/provisioning/common/windows/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/windows/msys.ps1 b/coin/provisioning/common/windows/msys.ps1 index df67cc20..f004bb49 100644 --- a/coin/provisioning/common/windows/msys.ps1 +++ b/coin/provisioning/common/windows/msys.ps1 @@ -12,5 +12,5 @@ $destination = "C:\msys" Download $url $url $zip Verify-Checksum $zip $sha1 C:\Utils\sevenzip\7z.exe x $zip -oC:\ - +Set-EnvironmentVariable "MSYS_PATH" "$destination\\1.0\\bin" Write-Output "Msys = $version" >> ~/versions.txt diff --git a/coin/provisioning/common/windows/mysql.ps1 b/coin/provisioning/common/windows/mysql.ps1 index 29ce0ab4..8ed91402 100644 --- a/coin/provisioning/common/windows/mysql.ps1 +++ b/coin/provisioning/common/windows/mysql.ps1 @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2019 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -36,7 +36,7 @@ # This script installs MySQL $version. # Both x86 and x64 versions needed when x86 integrations are done on x64 machine -$version = "5.6.11" +$version = "5.7.25" $baseNameX64 = "mysql-$version-winx64" $packagex64 = "C:\Windows\temp\$baseNameX64.zip" $baseNameX86 = "mysql-$version-win32" diff --git a/coin/provisioning/common/windows/postgresql.ps1 b/coin/provisioning/common/windows/postgresql.ps1 index 46d7501a..27f9190a 100644 --- a/coin/provisioning/common/windows/postgresql.ps1 +++ b/coin/provisioning/common/windows/postgresql.ps1 @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2017 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. @@ -36,7 +36,7 @@ # This script installs postgresql $version. # Both x86 and x64 versions needed when x86 integrations are done on x64 machine -$version = "9.1.9-1" +$version = "9.6.16-1" $packagex64 = "C:\Windows\temp\postgresql-$version-windows-x64-binaries.zip" $packagex86 = "C:\Windows\temp\postgresql-$version-windows-binaries.zip" @@ -46,7 +46,7 @@ if (Is64BitWinHost) { $installFolder = "C:\Utils\postgresql" $externalUrl = "http://get.enterprisedb.com/postgresql/postgresql-$version-windows-x64-binaries.zip" $internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\windows\postgresql-$version-windows-x64-binaries.zip" - $sha1 = "4da0453cdfda335e064d4437cf5bb9d356054cfd" + $sha1 = "5dd604f91973112209362b5abbbd1220c026f645" Write-Host "Fetching from URL ..." Download $externalUrl $internalUrl $packagex64 @@ -56,6 +56,9 @@ if (Is64BitWinHost) { Write-Host "Remove downloaded $packagex64 ..." Remove-Item -Path $packagex64 + # Remove pthread.h file so it won't be used in mingw builds (QTBUG-79555) + Remove-item -Path "$installFolder\pgsql\include\pthread.h" + Remove-item -Path "$installFolder\pgsql\include\unistd.h" Set-EnvironmentVariable "POSTGRESQL_INCLUDE_x64" "$installFolder\pgsql\include" Set-EnvironmentVariable "POSTGRESQL_LIB_x64" "$installFolder\pgsql\lib" @@ -65,7 +68,7 @@ if (Is64BitWinHost) { $architecture = "x86" $externalUrl = "http://get.enterprisedb.com/postgresql/postgresql-$version-windows-binaries.zip" $internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\windows\postgresql-$version-windows-binaries.zip" -$sha1 = "eb4f01845e1592800edbb74f60944b6c0aca51a9" +$sha1 = "46309190e60eead99c2d39c1dd18a91f2104d000" if (Is64BitWinHost) { $installFolder = "C:\Utils\postgresql$architecture" } else { @@ -81,6 +84,9 @@ Extract-7Zip $packagex86 $installFolder "pgsql\lib pgsql\bin pgsql\share pgsql\i Write-Host "Remove downloaded $packagex86 ..." Remove-Item -Path $packagex86 +# Remove pthread.h file so it won't be used in mingw builds (QTBUG-79555) +Remove-item -Path "$installFolder\pgsql\include\pthread.h" +Remove-item -Path "$installFolder\pgsql\include\unistd.h" Set-EnvironmentVariable "POSTGRESQL_INCLUDE_x86" "$installFolder\pgsql\include" Set-EnvironmentVariable "POSTGRESQL_LIB_x86" "$installFolder\pgsql\lib" diff --git a/coin/provisioning/common/windows/python.ps1 b/coin/provisioning/common/windows/python.ps1 index aee4c199..342358d5 100644 --- a/coin/provisioning/common/windows/python.ps1 +++ b/coin/provisioning/common/windows/python.ps1 @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2016 The Qt Company Ltd. +## Copyright (C) 2019 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -75,6 +75,9 @@ if (($archVer -eq 32) -And (Is64BitWinHost)) { Run-Executable "$targetDir\python.exe" "-m ensurepip" +Write-Host "Upgrade pip to the latest version available." +Run-Executable "$targetDir\python.exe" "-m pip install --upgrade pip" + # Install python virtual env if (IsProxyEnabled) { $proxy = Get-Proxy diff --git a/coin/provisioning/common/windows/python3.ps1 b/coin/provisioning/common/windows/python3.ps1 index c05c022c..8fbd615c 100644 --- a/coin/provisioning/common/windows/python3.ps1 +++ b/coin/provisioning/common/windows/python3.ps1 @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2019 The Qt Company Ltd. ## Copyright (C) 2017 Pelagicore AG ## Contact: http://www.qt.io/licensing/ ## @@ -79,6 +79,10 @@ if (IsProxyEnabled) { Write-Host "Using proxy ($proxy) with pip" $pip_args = "--proxy=$proxy" } + +Write-Host "Upgrade pip3 to the latest version available." +Run-Executable "$install_path\python.exe" "-m pip install --upgrade pip" + Run-Executable "$install_path\Scripts\pip3.exe" "$pip_args install virtualenv wheel" # Install all needed packages in a special wheel cache directory diff --git a/coin/provisioning/common/windows/squishInstall.ps1 b/coin/provisioning/common/windows/squishInstall.ps1 index de04d242..f8d600d7 100644 --- a/coin/provisioning/common/windows/squishInstall.ps1 +++ b/coin/provisioning/common/windows/squishInstall.ps1 @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2018 The Qt Company Ltd. +## Copyright (C) 2019 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -38,10 +38,10 @@ # NOTE! Make sure 64bit versions are always installed before 32bit, # because they use same folder name before a rename -$version = "6.4.3" +$version = "6.5" # Qt branch without dot (*.*) -$qtBranch = "512x" +$qtBranch = "513x" # So far Squish built with Qt5.12 works also with 5.13, but we have to be prepared that on some point # the compatibility breaks, and we may need to have separate Squish packages for different Qt versions. @@ -62,18 +62,16 @@ Function DownloadAndInstallSquish { [string]$bit, [string]$squishPackage ) - # MinGW x86 available only with Qt5.11, to be updated when Squish is supporting 5.13 - if ("$bit" -eq "win32" -and $squishPackage.StartsWith("mingw")) { - $qtBranch = "511x" - } - $SquishUrl = $squishBranchUrl + "\squish-" + $version + "-qt" + $qtBranch + "-" + $bit + "-" + $squishPackage + ".exe" + $SquishUrl = $squishBranchUrl + "\squish-nosignalhandler-" + $version + "-qt" + $qtBranch + "-" + $bit + "-" + $squishPackage + ".exe" $SquishInstaller = "$targetDir\$squishPackage.exe" $SquishParameters = "unattended=1 targetdir=$targetDir\$squishPackage" Write-Host "Fetching from URL $squishUrl" Copy-Item "$SquishUrl" "$SquishInstaller" Write-Host "Installing Squish" - Run-Executable "$SquishInstaller" "$SquishParameters" + $stdoutFile = [System.IO.Path]::GetTempFileName() + $stderrFile = [System.IO.Path]::GetTempFileName() + Start-Process -FilePath "$SquishInstaller" -Wait -ArgumentList $SquishParameters -PassThru -RedirectStandardOutput $stdoutFile -RedirectStandardError $stderrFile | Out-Null Remove-Item -Path $SquishInstaller if ("$bit" -eq "win64") { if ($squishPackage.StartsWith("mingw")) { diff --git a/coin/provisioning/common/windows/telegraf-coin.conf b/coin/provisioning/common/windows/telegraf-coin.conf new file mode 100644 index 00000000..9a4d22e8 --- /dev/null +++ b/coin/provisioning/common/windows/telegraf-coin.conf @@ -0,0 +1,41 @@ +[global_tags] +[agent] + interval = "10s" + round_interval = true + metric_batch_size = 100 + metric_buffer_limit = 10000 + collection_jitter = "0s" + flush_interval = "10s" + flush_jitter = "5s" + precision = "" + logfile = "C:\\telegraf-coin.log" + hostname = "$COIN_UNIQUE_JOB_ID" + omit_hostname = false +[[outputs.influxdb]] + urls= ["https://qtinfluxdb01.intra.qt.io:8086"] + insecure_skip_verify = true + database = "coin_vms" + skip_database_creation = true + username = "coin_vms_writer" + password = "COIN_VMS_WRITER_PASS" +[[inputs.cpu]] + percpu = true + totalcpu = true + collect_cpu_time = false + report_active = false +[[inputs.disk]] + ignore_fs = ["tmpfs", "devtmpfs", "devfs", "iso9660", "overlay", "aufs", "squashfs"] +[[inputs.diskio]] +[[inputs.kernel]] +[[inputs.mem]] +#[[inputs.processes]] +[[inputs.swap]] +[[inputs.system]] +#[[inputs.kernel_vmstat]] # linux-only +[[inputs.netstat]] + + +# Monitor Coin process +[[inputs.procstat]] + exe = "coin-" + pid_finder = "native" diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/03-install-rhel-epel.sh b/coin/provisioning/common/windows/telegraf_password.ps1 index 21a45506..773ec866 100755..100644 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/03-install-rhel-epel.sh +++ b/coin/provisioning/common/windows/telegraf_password.ps1 @@ -1,8 +1,6 @@ -#!/usr/bin/env bash - ############################################################################# ## -## Copyright (C) 2018 The Qt Company Ltd. +## Copyright (C) 2019 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -33,17 +31,16 @@ ## ############################################################################# -# shellcheck source=../common/unix/DownloadURL.sh -source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh" - -package="epel-release-6-8.noarch.rpm" -primaryUrl="https://dl.fedoraproject.org/pub/epel/6/x86_64/Packages/e/$package" -cacheUrl="http://ci-files01-hki.intra.qt.io/input/rhel6/$package" -sha1="2b2767a5ae0de30b9c7b840f2e34f5dd9deaf19a" -targetFile="/tmp/$package" - -DownloadURL "$primaryUrl" "$cacheUrl" "$sha1" "$targetFile" +$auth_file = "C:\Users\qt\work\influxdb\coin_vms_writer.auth" -sudo rpm -ivh "$targetFile" -rm "$targetFile" +# Provisioning should run even without the secrets repository +if (Test-Path $auth_file) { + $auth_content = Get-Content $auth_file + $influxdb_password = $auth_content.Substring($auth_content.LastIndexOf(':') + 1) + Remove-Item $auth_file +} else { + $influxdb_password = "no_password_provided" +} +$telegraf_conf = "C:\telegraf-coin.conf" +(Get-Content $telegraf_conf) | ForEach-Object { $_.Replace("COIN_VMS_WRITER_PASS", $influxdb_password) } | Out-File -Encoding UTF8 $telegraf_conf diff --git a/coin/provisioning/common/windows/unset-proxy.ps1 b/coin/provisioning/common/windows/unset-proxy.ps1 index 9c3dddb3..0b7d761f 100644 --- a/coin/provisioning/common/windows/unset-proxy.ps1 +++ b/coin/provisioning/common/windows/unset-proxy.ps1 @@ -38,6 +38,11 @@ $dcs = (Get-ItemProperty -Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\ $dcs[8] = $_ -band 0xF7 Set-ItemProperty -Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\Internet Settings\Connections" -Name DefaultConnectionSettings -Value $dcs Set-ItemProperty -Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\Internet Settings" -Name ProxyEnable -Value 0 -Remove-ItemProperty -Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\Internet Settings" -Name ProxyServer -Remove-ItemProperty -Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\Internet Settings" -Name ProxyOverride +if(Get-ItemProperty -ErrorAction SilentlyContinue -Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\Internet Settings" -Name ProxyServer){ + Remove-ItemProperty -Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\Internet Settings" -Name ProxyServer + +} +if(Get-ItemProperty -ErrorAction SilentlyContinue -Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\Internet Settings" -Name ProxyOverride){ + Remove-ItemProperty -Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\Internet Settings" -Name ProxyOverride +} diff --git a/coin/provisioning/common/windows/version.ps1 b/coin/provisioning/common/windows/version.ps1 new file mode 100644 index 00000000..7f701f63 --- /dev/null +++ b/coin/provisioning/common/windows/version.ps1 @@ -0,0 +1,6 @@ +Write-Host '******************** SW VERSIONS ********************' +type ~/versions.txt +Write-Host '*****************************************************' +Write-Host '******************** Get-PSDrive ********************' +Get-PSDrive +Write-Host '*****************************************************' diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/02-disable-ntp.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/02-disable-ntp.sh deleted file mode 100755 index 89806892..00000000 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/02-disable-ntp.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -# shellcheck source=../common/linux/disable-ntp_linux.sh -source "${BASH_SOURCE%/*}/../common/linux/disable-ntp_linux.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/05-subscription-manager-tooling.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/05-subscription-manager-tooling.sh deleted file mode 100755 index d3072b37..00000000 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/05-subscription-manager-tooling.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash -# provides: fix for possible bug in the subscription manager -# version: provided by RedHat -# needed for yum to work properly in case there is incorrect data in -# the sslclientkey repository parameter value - -set -ex - -sudo rm -f /etc/pki/entitlement/* -sudo subscription-manager refresh diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/06-odbc.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/06-odbc.sh deleted file mode 100755 index c8edc2a2..00000000 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/06-odbc.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash -# provides: odbc devel packages on RHEL -# version: provided by default Linux distribution repository -# needed for configure -plugin-sql-odbc in qtbase - -set -ex - -sudo yum install -y unixODBC-devel diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh deleted file mode 100755 index 74520b6e..00000000 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash -set -ex - -"$(dirname "$0")/../common/linux/cmake_linux.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/20-libusb.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/20-libusb.sh deleted file mode 100755 index b156e8f9..00000000 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/20-libusb.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash -# Required for tqtc-boot2qt/qdb - -set -ex - -sudo yum install -y libusb1-devel diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/22-mqtt_broker.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/22-mqtt_broker.sh deleted file mode 100755 index 505374c5..00000000 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/22-mqtt_broker.sh +++ /dev/null @@ -1,37 +0,0 @@ -#!/usr/bin/env bash - -############################################################################# -## -## Copyright (C) 2017 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ -## -## This file is part of the test suite 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$ -## -############################################################################# - -# shellcheck source=../common/unix/mqtt_broker.sh -source "${BASH_SOURCE%/*}/../common/unix/mqtt_broker.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/30-install_icu.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/30-install_icu.sh deleted file mode 100755 index 67c17954..00000000 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/30-install_icu.sh +++ /dev/null @@ -1,74 +0,0 @@ -#!/usr/bin/env bash - -############################################################################# -## -## Copyright (C) 2016 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ -## -## This file is part of the test suite 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$ -## -############################################################################# - -# This script installs the right ICU version - -set -ex -icuVersion="56.1" -icuLocation="/usr/lib64" -sha1="f2eab775c04ce5f3bdae6c47d06b62158b5d6753" - -function Install7ZPackageFromURL { - url=$1 - expectedSha1=$2 - targetDirectory=$3 - - targetFile=$(mktemp) - wget --tries=5 --waitretry=5 --output-document="$targetFile" "$url" - echo "$expectedSha1 $targetFile" | sha1sum --check - sudo /usr/local/bin/7z x -yo"$targetDirectory" "$targetFile" - rm "$targetFile" -} - -echo "Installing custom ICU $icuVersion $sha1 packages on RHEL to $icuLocation" - -baseBinaryPackageURL="http://master.qt.io/development_releases/prebuilt/icu/prebuilt/$icuVersion/icu-linux-g++-Rhel6.6-x64.7z" -Install7ZPackageFromURL "$baseBinaryPackageURL" "$sha1" "/usr/lib64" - -echo "Installing custom ICU devel packages on RHEL" - -sha1Dev="82f8b216371b848b8d36ecec7fe7b6e9b0dba0df" -develPackageURL="http://master.qt.io/development_releases/prebuilt/icu/prebuilt/$icuVersion/icu-linux-g++-Rhel6.6-x64-devel.7z" -tempDir=$(mktemp -d) -# shellcheck disable=SC2064 -trap "sudo rm -fr $tempDir" EXIT -Install7ZPackageFromURL "$develPackageURL" "$sha1Dev" "$tempDir" -sudo cp -a "$tempDir/lib"/* /usr/lib64 -sudo cp -a "$tempDir"/* /usr/ - -sudo /sbin/ldconfig - -# Storage version information to ~/versions.txt, which is used to print version information to provision log. -echo "ICU = $icuVersion" >> ~/versions.txt diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/99-version.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/99-version.sh deleted file mode 100755 index 1354bf6b..00000000 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/99-version.sh +++ /dev/null @@ -1,48 +0,0 @@ -#!/usr/bin/env bash - -############################################################################# -## -## Copyright (C) 2016 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ -## -## This file is part of the test suite 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$ -## -############################################################################# - -# This script needs to be called last during provisioning so that the software information will show up last in provision log. - -# Storage installed RPM packages information - -set -ex - -# shellcheck disable=SC2129 -echo "*********************************************" >> ~/versions.txt -echo "***** All installed RPM packages *****" >> ~/versions.txt -rpm -q -a | sort >> ~/versions.txt -echo "*********************************************" >> ~/versions.txt - -"$(dirname "$0")/../common/linux/version.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-disable-mlocate.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-disable-mlocate.sh deleted file mode 100755 index f12cff1e..00000000 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-disable-mlocate.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash -BASEDIR=$(dirname "$0") -# shellcheck source=../common/linux/disable-mlocate.sh -"$BASEDIR/../common/linux/disable-mlocate.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/90-python-modules.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/90-python-modules.sh new file mode 100755 index 00000000..8a3fc7b9 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/90-python-modules.sh @@ -0,0 +1,39 @@ +#!/usr/bin/env bash + +############################################################################# +## +## 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$ +## +############################################################################# + +set -ex + +# shellcheck source=../common/unix/python-modules.sh +source "${BASH_SOURCE%/*}/../common/unix/python-modules.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-disable-mlocate.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/01-disable-mlocate.sh index f12cff1e..f12cff1e 100755 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-disable-mlocate.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/01-disable-mlocate.sh diff --git a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/01-install_telegraf.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/01-install_telegraf.sh new file mode 100755 index 00000000..729f9003 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/01-install_telegraf.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +"$(dirname "$0")"/../common/unix/telegraf_install.sh diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/01-refresh-subscription-manager.sh index 0b85f10d..e26a1e0d 100755 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-systemsetup.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/01-refresh-subscription-manager.sh @@ -2,7 +2,7 @@ ############################################################################# ## -## Copyright (C) 2017 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. @@ -33,14 +33,16 @@ ## ############################################################################# -set -ex +set -e -# shellcheck source=../common/unix/check_and_set_proxy.sh -source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh" +curl --retry 5 --retry-delay 10 --retry-max-time 60 http://ci-files01-hki.intra.qt.io/input/semisecure/redhat_ak.sh -o "/tmp/redhat_ak.sh" &>/dev/null +sudo chmod 755 /tmp/redhat_ak.sh +/tmp/redhat_ak.sh -# shellcheck disable=SC2031 -if [ "$http_proxy" != "" ]; then - echo "proxy=$proxy" | sudo tee -a /etc/yum.conf -fi +# refresh local certificates +sudo subscription-manager refresh -sudo yum update -y nss curl +# Attach available subscriptions to system. This is needed when subscriptions are renewed. +sudo subscription-manager attach --auto + +sudo rm -f /tmp/redhat_ak.sh diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/01-systemsetup.sh index c0f94a49..c0f94a49 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-systemsetup.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/01-systemsetup.sh diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/02-enable-repos.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/02-enable-repos.sh index 548cb9ca..28f7faa0 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/02-enable-repos.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/02-enable-repos.sh @@ -38,6 +38,7 @@ set -ex echo "set WritePreparedUpdates=false" | sudo tee -a /etc/PackageKit/PackageKit.conf sudo systemctl stop packagekit sudo systemctl disable packagekit +sudo yum -y remove PackageKit gnome-software sudo subscription-manager config --rhsm.manage_repos=0 sudo subscription-manager refresh diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/03-install-devtoolset.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/03-install-devtoolset.sh index ebc7cac6..ebc7cac6 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/03-install-devtoolset.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/03-install-devtoolset.sh diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/03-install-rhel-epel.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/03-install-rhel-epel.sh index 5cdf7df0..443bfa9e 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/03-install-rhel-epel.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/03-install-rhel-epel.sh @@ -38,14 +38,13 @@ set -ex # shellcheck source=../common/unix/DownloadURL.sh source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh" -package="epel-release-7-11.noarch.rpm" +package="epel-release-7-12.noarch.rpm" primaryUrl="https://dl.fedoraproject.org/pub/epel/7/x86_64/Packages/e/$package" cacheUrl="http://ci-files01-hki.intra.qt.io/input/rhel7/$package" -sha1="5512b80e5b71f2370d8419fa16a0bc14c5edf854" +sha256="d6bb83c00ab3af26ded56459e7d6fceabfef66efbe0780b4dedbe81d62c07cd5" targetFile="/tmp/$package" -DownloadURL "$primaryUrl" "$cacheUrl" "$sha1" "$targetFile" +DownloadURL "$cacheUrl" "$primaryUrl" "$sha256" "$targetFile" -sudo rpm -ivh "$targetFile" +sudo yum -y install "$targetFile" rm "$targetFile" - diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/04-install-packages.sh index b956d6a3..b3ecceea 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/04-install-packages.sh @@ -2,7 +2,7 @@ ############################################################################# ## -## Copyright (C) 2017 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. @@ -115,6 +115,13 @@ installPackages+=(unixODBC-devel) installPackages+=(unixODBC) # Vulkan support installPackages+=(vulkan-devel) +# Conan: For Python build +installPackages+=(xz-devel) +installPackages+=(zlib-devel) +installPackages+=(libffi-devel) +installPackages+=(libsqlite3x-devel) +# Build.pl +installPackages+=(perl-Data-Dumper) sudo yum -y install "${installPackages[@]}" diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-p7zip.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/04-p7zip.sh index 45565766..45565766 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-p7zip.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/04-p7zip.sh diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/05-libclang.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/05-libclang.sh index 7074cbc1..7074cbc1 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/05-libclang.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/05-libclang.sh diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/06-cmake.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/06-cmake.sh index 062b2790..062b2790 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/06-cmake.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/06-cmake.sh diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/07-qnx_700.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/07-qnx_700.sh index 92c741fb..92c741fb 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/07-qnx_700.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/07-qnx_700.sh diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/08-integrity.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/08-integrity.sh index 154370da..154370da 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/08-integrity.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/08-integrity.sh diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/09-disable_selinux.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/09-disable_selinux.sh index b7a53cd4..b7a53cd4 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/09-disable_selinux.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/09-disable_selinux.sh diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-install-openssl.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/09-install-openssl.sh index 4f1d3768..4f1d3768 100755 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-install-openssl.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/09-install-openssl.sh diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/22-mqtt_broker.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/22-mqtt_broker.sh index e677427f..e677427f 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/22-mqtt_broker.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/22-mqtt_broker.sh diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/30-fbx.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/30-fbx.sh index d8df4375..d8df4375 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/30-fbx.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/30-fbx.sh diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/30-install_icu.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/30-install_icu.sh index 7c4d46dd..7c4d46dd 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/30-install_icu.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/30-install_icu.sh diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/35-install-breakpad.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/35-install-breakpad.sh index 74dd1579..74dd1579 100644..100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/35-install-breakpad.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/35-install-breakpad.sh diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/40-android_linux.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/40-android_linux.sh index a6c4dfff..a6c4dfff 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/40-android_linux.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/40-android_linux.sh diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/50-openssl_for_android_linux.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/50-openssl_for_android_linux.sh index ef2b3ba8..ef2b3ba8 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/50-openssl_for_android_linux.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/50-openssl_for_android_linux.sh diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/60-install_protobuff.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/60-install_protobuff.sh index a77938b3..a77938b3 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/60-install_protobuff.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/60-install_protobuff.sh diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/01-sha1sum-compatibility.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/70-install_dwz.sh index 52650fea..935d9227 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/01-sha1sum-compatibility.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/70-install_dwz.sh @@ -2,7 +2,7 @@ ############################################################################# ## -## Copyright (C) 2018 The Qt Company Ltd. +## Copyright (C) 2020 Konstantin Tokarev <annulen@yandex.ru> ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -33,9 +33,10 @@ ## ############################################################################# -#!/usr/bin/env bash - set -ex -# shellcheck source=../common/macos/sha1sum-compatibility.sh -source "${BASH_SOURCE%/*}/../common/macos/sha1sum-compatibility.sh" +sudo yum -y install elfutils-libelf-devel + +# shellcheck source=../common/linux/install_dwz.sh +source "${BASH_SOURCE%/*}/../common/linux/install_dwz.sh" + diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/90-squish.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/90-squish.sh index e4281588..e4281588 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/90-squish.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/90-squish.sh diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/99-version.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/99-version.sh index 03565da2..03565da2 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/99-version.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/99-version.sh diff --git a/coin/provisioning/qtci-linux-SLES-12-x86_64/02-disable-gnome-notifications.sh b/coin/provisioning/qtci-linux-SLES-12-x86_64/02-disable-gnome-notifications.sh deleted file mode 100755 index f38c9bab..00000000 --- a/coin/provisioning/qtci-linux-SLES-12-x86_64/02-disable-gnome-notifications.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -# shellcheck source=../common/linux/disable-notifications.sh -source "${BASH_SOURCE%/*}/../common/linux/disable-notifications.sh" diff --git a/coin/provisioning/qtci-linux-SLES-12-x86_64/02-zypperpackages.sh b/coin/provisioning/qtci-linux-SLES-12-x86_64/02-zypperpackages.sh deleted file mode 100755 index cdea163f..00000000 --- a/coin/provisioning/qtci-linux-SLES-12-x86_64/02-zypperpackages.sh +++ /dev/null @@ -1,96 +0,0 @@ -#!/usr/bin/env bash - -############################################################################# -## -## 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$ -## -############################################################################# - -set -ex - -sudo zypper -nq install git gcc gcc-c++ - -sudo zypper -nq install bison flex gperf \ - zlib-devel \ - libudev-devel \ - glib2-devel \ - libopenssl-devel \ - freetype2-devel \ - fontconfig-devel \ - sqlite3-devel \ - libxkbcommon-devel \ - libxkbcommon-x11-devel - -sudo zypper -nq install p7zip - -# EGL support -sudo zypper -nq install Mesa-libEGL-devel Mesa-libGL-devel - -# gtk3 style for QtGui/QStyle -sudo zypper -nq install gtk3-devel - -# Xinput2 -sudo zypper -nq install libXi-devel postgresql10 postgresql10-devel mysql-devel mysql mysql-server - -# system provided XCB libraries -sudo zypper -nq install xcb-util-devel xcb-util-image-devel xcb-util-keysyms-devel \ - xcb-util-wm-devel xcb-util-renderutil-devel - -# ICU -sudo zypper -nq install libicu-devel libicu52_1 - -# qtwebengine -sudo zypper -nq install alsa-devel dbus-1-devel \ - libXcomposite-devel libXcursor-devel libXrandr-devel libXtst-devel \ - mozilla-nspr-devel mozilla-nss-devel - -# qtwebkit -sudo zypper -nq install libxml2-devel libxslt-devel - -# GStreamer (qtwebkit and qtmultimedia), pulseaudio (qtmultimedia) -sudo zypper -nq install gstreamer-devel gstreamer-plugins-base-devel libpulse-devel - -# cups -sudo zypper -nq install cups-devel - -# speech-dispatcher -sudo zypper -nq install libspeechd-devel -# https://bugzilla.suse.com/show_bug.cgi?id=1129586 -sudo mv /usr/include/speech-dispatcher/speech-dispatcher/* /usr/include/speech-dispatcher/ - -# ODBC support -sudo zypper -nq install unixODBC-devel unixODBC - -# freetds support -sudo zypper -nq install libfreetds freetds-devel - -# sqlite2 support -sudo zypper -nq install sqlite2 sqlite2-devel - diff --git a/coin/provisioning/qtci-linux-SLES-12-x86_64/09-install-openssl.sh b/coin/provisioning/qtci-linux-SLES-12-x86_64/09-install-openssl.sh deleted file mode 100755 index 4f1d3768..00000000 --- a/coin/provisioning/qtci-linux-SLES-12-x86_64/09-install-openssl.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash - -set -ex - -# shellcheck source=../common/unix/install-openssl.sh -source "${BASH_SOURCE%/*}/../common/unix/install-openssl.sh" "linux" diff --git a/coin/provisioning/qtci-linux-SLES-12-x86_64/55-emsdk.sh b/coin/provisioning/qtci-linux-SLES-12-x86_64/55-emsdk.sh deleted file mode 100755 index 09a76778..00000000 --- a/coin/provisioning/qtci-linux-SLES-12-x86_64/55-emsdk.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/usr/bin/env bash - -############################################################################# -## -## 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$ -## -############################################################################# - -set -ex - -# shellcheck source=../common/linux/emsdk.sh -source "${BASH_SOURCE%/*}/../common/linux/emsdk.sh" diff --git a/coin/provisioning/qtci-linux-SLES-15-x86_64/01-install_telegraf.sh b/coin/provisioning/qtci-linux-SLES-15-x86_64/01-install_telegraf.sh new file mode 100755 index 00000000..729f9003 --- /dev/null +++ b/coin/provisioning/qtci-linux-SLES-15-x86_64/01-install_telegraf.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +"$(dirname "$0")"/../common/unix/telegraf_install.sh diff --git a/coin/provisioning/qtci-linux-SLES-15-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-SLES-15-x86_64/01-systemsetup.sh index ee0b6894..28f25728 100755 --- a/coin/provisioning/qtci-linux-SLES-15-x86_64/01-systemsetup.sh +++ b/coin/provisioning/qtci-linux-SLES-15-x86_64/01-systemsetup.sh @@ -59,10 +59,12 @@ echo 'export DISPLAY=":0"' >> ~/.bashrc sudo systemctl stop packagekit sudo systemctl disable packagekit +sudo systemctl mask packagekit while sudo fuser /usr/lib/packagekitd >/dev/null 2>&1 ; do echo "Waiting for PackageKit to finish..." sleep 5 done +sudo zypper -nq remove gnome-software # shellcheck disable=SC2031 if [ "$http_proxy" != "" ]; then diff --git a/coin/provisioning/qtci-linux-SLES-15-x86_64/02-zypperpackages.sh b/coin/provisioning/qtci-linux-SLES-15-x86_64/02-zypperpackages.sh index 12f3a673..3ea67ef0 100755 --- a/coin/provisioning/qtci-linux-SLES-15-x86_64/02-zypperpackages.sh +++ b/coin/provisioning/qtci-linux-SLES-15-x86_64/02-zypperpackages.sh @@ -35,10 +35,9 @@ set -ex - sudo zypper -nq install elfutils binutils -sudo zypper -nq install git gcc gcc-c++ +sudo zypper -nq install git gcc gcc-c++ make patch wget tar sudo zypper -nq install bison flex gperf \ zlib-devel \ diff --git a/coin/provisioning/qtci-linux-SLES-15-x86_64/08-pythondev.sh b/coin/provisioning/qtci-linux-SLES-15-x86_64/08-pythondev.sh index ab35a009..2da45c2b 100755 --- a/coin/provisioning/qtci-linux-SLES-15-x86_64/08-pythondev.sh +++ b/coin/provisioning/qtci-linux-SLES-15-x86_64/08-pythondev.sh @@ -39,21 +39,31 @@ set -ex -sudo zypper -nq install python-devel +PROVISIONING_DIR="$(dirname "$0")/../" +. "$PROVISIONING_DIR"/common/unix/common.sourced.sh +. "$PROVISIONING_DIR"/common/unix/DownloadURL.sh + + +# Python 2 +$CMD_PKG_INSTALL python-devel # Selected installation instructions coming from: # https://raw.githubusercontent.com/linux-on-ibm-z/scripts/master/Python3/build_python3.sh export PACKAGE_NAME="python" -export PACKAGE_VERSION="3.7.2" +export PACKAGE_VERSION="3.7.6" +export PACKAGE_SHA=55a2cce72049f0794e9a11a84862e9039af9183603b78bc60d89539f82cf533f ( - sudo zypper install -y gcc gcc-c++ make ncurses patch wget tar zlib-devel zlib libffi-devel libopenssl-devel + $CMD_PKG_INSTALL ncurses zlib-devel libffi-devel libopenssl-devel - printf -- 'Configuration and Installation started \n' + echo 'Configuration and Installation started' - #Downloading Source code - wget "https://www.python.org/ftp/${PACKAGE_NAME}/${PACKAGE_VERSION}/Python-${PACKAGE_VERSION}.tar.xz" - tar -xvf "Python-${PACKAGE_VERSION}.tar.xz" + #Download Source code + DownloadURL \ + http://ci-files01-hki.intra.qt.io/input/python/Python-${PACKAGE_VERSION}.tar.xz \ + https://www.python.org/ftp/${PACKAGE_NAME}/${PACKAGE_VERSION}/Python-${PACKAGE_VERSION}.tar.xz \ + $PACKAGE_SHA + tar -xf "Python-${PACKAGE_VERSION}.tar.xz" #Configure and Build cd "Python-${PACKAGE_VERSION}" @@ -61,14 +71,14 @@ export PACKAGE_VERSION="3.7.2" make sudo make install - export PATH="/usr/local/bin:${PATH}" - printf -- '\nInstalled python successfully \n' + echo 'Installed python successfully' #Cleanup cd - rm "Python-${PACKAGE_VERSION}.tar.xz" #Verify python installation + export PATH="/usr/local/bin:${PATH}" if command -V "$PACKAGE_NAME"${PACKAGE_VERSION:0:1} >/dev/null then printf -- "%s installation completed. Please check the Usage to start the service.\n" "$PACKAGE_NAME" diff --git a/coin/provisioning/qtci-linux-SLES-15-x86_64/55-emsdk.sh b/coin/provisioning/qtci-linux-SLES-15-x86_64/55-emsdk.sh index 09a76778..44cf1b80 100755 --- a/coin/provisioning/qtci-linux-SLES-15-x86_64/55-emsdk.sh +++ b/coin/provisioning/qtci-linux-SLES-15-x86_64/55-emsdk.sh @@ -35,5 +35,5 @@ set -ex -# shellcheck source=../common/linux/emsdk.sh -source "${BASH_SOURCE%/*}/../common/linux/emsdk.sh" +# shellcheck source=../common/unix/emsdk.sh +source "${BASH_SOURCE%/*}/../common/unix/emsdk.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86/01-disable-cracklib.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86/01-disable-cracklib.sh deleted file mode 100755 index 8590d4e4..00000000 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86/01-disable-cracklib.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -# shellcheck source=../common/linux/disable-cracklib.sh -source "${BASH_SOURCE%/*}/../common/linux/disable-cracklib.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86/01-disable-mlocate.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86/01-disable-mlocate.sh deleted file mode 100755 index f12cff1e..00000000 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86/01-disable-mlocate.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash -BASEDIR=$(dirname "$0") -# shellcheck source=../common/linux/disable-mlocate.sh -"$BASEDIR/../common/linux/disable-mlocate.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86/01-remove_update-manager b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86/01-remove_update-manager deleted file mode 100755 index 12302976..00000000 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86/01-remove_update-manager +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -# shellcheck source=../common/linux/remove_update-manager.sh -source "${BASH_SOURCE%/*}/../common/linux/remove_update-manager.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86/02-apt.sh deleted file mode 100755 index 909e4288..00000000 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86/02-apt.sh +++ /dev/null @@ -1,58 +0,0 @@ -#!/usr/bin/env bash - -############################################################################# -## -## 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$ -## -############################################################################# - -# Install required packages with APT - -set -ex - -echo "Disabling auto update" -sudo sed -i 's/APT::Periodic::Update-Package-Lists "1";/APT::Periodic::Update-Package-Lists "0";/' /etc/apt/apt.conf.d/10periodic -for service in apt-daily.timer apt-daily-upgrade.timer apt-daily.service apt-daily-upgrade.service; do - sudo systemctl stop $service - sudo systemctl disable $service -done - -# Stop fetching the dep-11 metadata, since our mirrors do not handle them well -sudo mv /etc/apt/apt.conf.d/50appstream{,.disabled} - -installPackages+=(git) -installPackages+=(p7zip-full) -installPackages+=(expect) - -echo "Running update for apt" -sudo apt-get update -echo "Installing packages" -sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install "${installPackages[@]}" - diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86/09-install-openssl.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86/09-install-openssl.sh deleted file mode 100755 index 4f1d3768..00000000 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86/09-install-openssl.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash - -set -ex - -# shellcheck source=../common/unix/install-openssl.sh -source "${BASH_SOURCE%/*}/../common/unix/install-openssl.sh" "linux" diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86/50-openssl_for_android_linux.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86/50-openssl_for_android_linux.sh deleted file mode 100755 index 81ea3b17..00000000 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86/50-openssl_for_android_linux.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash - -############################################################################# -## -## 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$ -## -############################################################################# - -set -ex - -# shellcheck source=../common/linux/openssl_for_android_linux.sh -source "${BASH_SOURCE%/*}/../common/linux/openssl_for_android_linux.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86/90-squish.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86/90-squish.sh deleted file mode 100755 index 965112af..00000000 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86/90-squish.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash -BASEDIR=$(dirname "$0") -"$BASEDIR/../common/unix/squishInstall.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-disable-cracklib.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-disable-cracklib.sh deleted file mode 100755 index 8590d4e4..00000000 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-disable-cracklib.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -# shellcheck source=../common/linux/disable-cracklib.sh -source "${BASH_SOURCE%/*}/../common/linux/disable-cracklib.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-disable-mlocate.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-disable-mlocate.sh deleted file mode 100755 index f12cff1e..00000000 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-disable-mlocate.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash -BASEDIR=$(dirname "$0") -# shellcheck source=../common/linux/disable-mlocate.sh -"$BASEDIR/../common/linux/disable-mlocate.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-remove_update-manager b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-remove_update-manager deleted file mode 100755 index 12302976..00000000 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-remove_update-manager +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -# shellcheck source=../common/linux/remove_update-manager.sh -source "${BASH_SOURCE%/*}/../common/linux/remove_update-manager.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh deleted file mode 100755 index b917d292..00000000 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh +++ /dev/null @@ -1,65 +0,0 @@ -#!/usr/bin/env bash - -############################################################################# -## -## 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$ -## -############################################################################# - -# This script modifies system settings for automated use - -set -ex - -# shellcheck source=../common/unix/check_and_set_proxy.sh -source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh" - -NTS_IP=10.212.2.216 - -echo "Set timezone to UTC." -sudo timedatectl set-timezone Etc/UTC -echo "Timeout for blanking the screen (0 = never)" -gsettings set org.gnome.desktop.session idle-delay 0 -echo "Prevents screen lock when screesaver goes active." -gsettings set org.gnome.desktop.screensaver lock-enabled false -echo "Disable questions on shutdown." -gsettings set com.canonical.indicator.session suppress-logout-restart-shutdown true -echo "Set grub timeout to 0" -sudo sed -i 's|GRUB_TIMEOUT=10|GRUB_TIMEOUT=0|g' /etc/default/grub -sudo update-grub - -echo "Set Network Test Server address to $NTS_IP in /etc/hosts" -echo "$NTS_IP qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts - -if [ "$http_proxy" != "" ]; then - echo "Acquire::http::Proxy \"$proxy\";" | sudo tee -a /etc/apt/apt.conf -fi - -# This won't be needed for Ubuntu 17 and above, see QTBUG-67757. -sudo sed -i '/-UnityDecoration-extents/c\ -UnityDecoration-extents: 0 0 0 0;' /usr/share/themes/Ambiance/gtk-3.0/apps/unity.css diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh deleted file mode 100755 index 226b1ebf..00000000 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh +++ /dev/null @@ -1,188 +0,0 @@ -#!/usr/bin/env bash - -############################################################################# -## -## 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$ -## -############################################################################# - -# Install required packages with APT - -set -ex - -echo "Disabling auto update" -sudo sed -i 's/APT::Periodic::Update-Package-Lists "1";/APT::Periodic::Update-Package-Lists "0";/' /etc/apt/apt.conf.d/10periodic -for service in apt-daily.timer apt-daily-upgrade.timer apt-daily.service apt-daily-upgrade.service; do - sudo systemctl stop $service - sudo systemctl disable $service -done - -# Stop fetching the dep-11 metadata, since our mirrors do not handle them well -sudo mv /etc/apt/apt.conf.d/50appstream{,.disabled} - -# aptdaemon is used by update notifiers and similar and there is no point in having those (the symptom is aptd holding a lock) -for i in $(seq 10); do - echo attempting to remove aptdaemon - sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y remove aptdaemon || true - # check that aptdaemon is no longer installed - which aptd > /dev/null || break - if [[ $i -eq 10 ]]; then - exit 1 - fi - sleep 10 -done - -# Git is not needed by builds themselves, but is nice to have -# immediately as one starts debugging -installPackages+=(git) -# 7zip is a needed decompressing tool -installPackages+=(p7zip-full) -# To be able to mount yocto-cache during builds -installPackages+=(nfs-common) -# libssl-dev provides headers for OpenSSL -installPackages+=(libssl-dev) -# Needed libraries for X11 support accordingly to https://wiki.qt.io/Building_Qt_5_from_Git -installPackages+=("^libxcb.*") -installPackages+=(libxkbcommon-dev) -installPackages+=(libxkbcommon-x11-dev) -installPackages+=(libx11-xcb-dev) -installPackages+=(libglu1-mesa-dev) -installPackages+=(libxrender-dev) -installPackages+=(libxi-dev) -# Enable linking to system dbus -installPackages+=(libdbus-1-dev) -# Needed libraries for WebEngine -installPackages+=(libudev-dev) -installPackages+=(libegl1-mesa-dev) -installPackages+=(libfontconfig1-dev) -installPackages+=(libxss-dev) -# Common event loop handling -installPackages+=(libglib2.0-dev) -# MySQL support -installPackages+=(libmysqlclient-dev) -# PostgreSQL support -installPackages+=(libpq-dev) -# SQLite support -installPackages+=(libsqlite3-dev) -# ODBC support -installPackages+=(unixodbc-dev) -# Support for FreeType font engine -installPackages+=(libfreetype6-dev) -# Enable the usage of system jpeg libraries -installPackages+=(libjpeg-dev) -# Enable support for printer driver -installPackages+=(libcups2-dev) -# Install libraries needed for QtMultimedia to be able to support all plugins -installPackages+=(libasound2-dev) -installPackages+=(libgstreamer1.0-dev) -installPackages+=(libgstreamer-plugins-base1.0-dev) -installPackages+=(libgstreamer-plugins-good1.0-dev) -installPackages+=(libgstreamer-plugins-bad1.0-dev) -# Support for cross-building to x86 (needed by WebEngine boot2qt builds) -installPackages+=(g++-multilib) -# python2 development package -installPackages+=(python-pip) -# python3 development package -installPackages+=(python3-dev) -installPackages+=(python3-pip) -installPackages+=(python3-virtualenv) -installPackages+=(python3-wheel) -# Needed to be able to build Yocto -installPackages+=(chrpath) -installPackages+=(gawk) -installPackages+=(texinfo) -# Automates interactive applications (Needed by RTA to automate configure testing) -installPackages+=(expect) -installPackages+=(mesa-common-dev) -installPackages+=(libgl1-mesa-glx) -installPackages+=(libgl1-mesa-dev) -installPackages+=(libegl1-mesa-dev) -installPackages+=(curl) -installPackages+=(libicu-dev) -installPackages+=(zlib1g-dev) -installPackages+=(zlib1g) -installPackages+=(zlib1g:i386) -installPackages+=(openjdk-8-jdk) -installPackages+=(libgtk-3-dev) -installPackages+=(ninja-build) -installPackages+=(libssl-dev) -installPackages+=(libxcursor-dev) -installPackages+=(libxcomposite-dev) -installPackages+=(libxdamage-dev) -installPackages+=(libxrandr-dev) -installPackages+=(libfontconfig1-dev) -installPackages+=(libxss-dev) -installPackages+=(libsrtp0-dev) -installPackages+=(libwebp-dev) -installPackages+=(libjsoncpp-dev) -installPackages+=(libopus-dev) -installPackages+=(libminizip-dev) -installPackages+=(libavutil-dev) -installPackages+=(libavformat-dev) -installPackages+=(libavcodec-dev) -installPackages+=(libevent-dev) -installPackages+=(bison) -installPackages+=(flex) -installPackages+=(gperf) -installPackages+=(libasound2-dev) -installPackages+=(libpulse-dev) -installPackages+=(libxtst-dev) -installPackages+=(libnspr4-dev) -installPackages+=(libnss3-dev) -installPackages+=(libopenal-dev) -installPackages+=(libbluetooth-dev) -#VirtualBox for RTA -installPackages+=(virtualbox) -installPackages+=(dkms) -#Pypdf for QSR documentation -installPackages+=(python-pypdf2) - -sudo tee "/etc/apt/sources.list" > /dev/null <<-EOC -deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ xenial main restricted universe multiverse -deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ xenial-updates main restricted universe multiverse -deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ xenial-backports main restricted universe -deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ xenial-security main restricted universe multiverse -deb [arch=i386] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ xenial main restricted universe multiverse -deb [arch=i386] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ xenial-updates main restricted universe multiverse -deb [arch=i386] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ xenial-backports main restricted universe -deb [arch=i386] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ xenial-security main restricted universe multiverse -EOC - -echo "Running update for apt" -sudo apt-get update -echo "Installing packages" -sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install "${installPackages[@]}" - -# Install all needed packages in a special wheel cache directory -pip3 wheel --wheel-dir "$HOME/python3-wheels" -r "${BASH_SOURCE%/*}/../common/shared/requirements.txt" - -# shellcheck source=../common/unix/SetEnvVar.sh -source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" -SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels" diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-disable-ntp.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-disable-ntp.sh deleted file mode 100755 index 89806892..00000000 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-disable-ntp.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -# shellcheck source=../common/linux/disable-ntp_linux.sh -source "${BASH_SOURCE%/*}/../common/linux/disable-ntp_linux.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-remove-update_notifier.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-remove-update_notifier.sh deleted file mode 100755 index 55c6ce79..00000000 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-remove-update_notifier.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -# shellcheck source=../common/linux/remove-update_notifier.sh -source "${BASH_SOURCE%/*}/../common/linux/remove-update_notifier.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/04-libclang.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/04-libclang.sh deleted file mode 100755 index 331a14d9..00000000 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/04-libclang.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - -BASEDIR=$(dirname "$0") -# shellcheck source=../common/unix/libclang.sh -"$BASEDIR/../common/unix/libclang.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/09-install-openssl.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/09-install-openssl.sh deleted file mode 100755 index 4f1d3768..00000000 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/09-install-openssl.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash - -set -ex - -# shellcheck source=../common/unix/install-openssl.sh -source "${BASH_SOURCE%/*}/../common/unix/install-openssl.sh" "linux" diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/22-mqtt_broker.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/22-mqtt_broker.sh deleted file mode 100755 index 96b197ea..00000000 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/22-mqtt_broker.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/usr/bin/env bash - -############################################################################# -## -## 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$ -## -############################################################################# - -set -ex - -# shellcheck source=../common/unix/mqtt_broker.sh -source "${BASH_SOURCE%/*}/../common/unix/mqtt_broker.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/30-fbx.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/30-fbx.sh deleted file mode 100755 index d8df4375..00000000 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/30-fbx.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -set -ex - -BASEDIR=$(dirname "$0") -"$BASEDIR/../common/linux/fbx_linux.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/35-install-breakpad.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/35-install-breakpad.sh deleted file mode 100755 index 74dd1579..00000000 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/35-install-breakpad.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -set -ex - -# shellcheck source=../common/unix/install-breakpad.sh -source "${BASH_SOURCE%/*}/../common/unix/install-breakpad.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/40-android_linux.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/40-android_linux.sh deleted file mode 100755 index 0527fe85..00000000 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/40-android_linux.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash - -############################################################################# -## -## 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$ -## -############################################################################# - -set -ex - -# shellcheck source=../common/linux/android_linux.sh -source "${BASH_SOURCE%/*}/../common/linux/android_linux.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/40-cmake.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/40-cmake.sh deleted file mode 100755 index db8a3ff5..00000000 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/40-cmake.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -BASEDIR=$(dirname "$0") -"$BASEDIR/../common/linux/cmake_linux.sh" - diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/50-openssl_for_android_linux.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/50-openssl_for_android_linux.sh deleted file mode 100755 index 81ea3b17..00000000 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/50-openssl_for_android_linux.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash - -############################################################################# -## -## 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$ -## -############################################################################# - -set -ex - -# shellcheck source=../common/linux/openssl_for_android_linux.sh -source "${BASH_SOURCE%/*}/../common/linux/openssl_for_android_linux.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/60-qnx660.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/60-qnx660.sh deleted file mode 100755 index 4034162e..00000000 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/60-qnx660.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/env bash - -############################################################################# -## -## 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$ -## -############################################################################# - -set -ex - -# shellcheck source=../common/linux/qnx_660.sh -source "${BASH_SOURCE%/*}/../common/linux/qnx_660.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/70-qnx700.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/70-qnx700.sh deleted file mode 100755 index a2d162d3..00000000 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/70-qnx700.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/env bash - -############################################################################# -## -## 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$ -## -############################################################################# - -set -ex - -# shellcheck source=../common/linux/qnx_700.sh -source "${BASH_SOURCE%/*}/../common/linux/qnx_700.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/80-docker.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/80-docker.sh deleted file mode 100755 index 82c2c659..00000000 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/80-docker.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash - -BASEDIR=$(dirname "$0") -"$BASEDIR/../common/linux/docker.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/90-squish.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/90-squish.sh deleted file mode 100755 index e4281588..00000000 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/90-squish.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash -BASEDIR=$(dirname "$0") -"$BASEDIR/../common/unix/squishInstall.sh" - diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/01-install_telegraf.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/01-install_telegraf.sh new file mode 100755 index 00000000..729f9003 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/01-install_telegraf.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +"$(dirname "$0")"/../common/unix/telegraf_install.sh diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/01-systemsetup.sh index 96bf23f8..5198e230 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/01-systemsetup.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/01-systemsetup.sh @@ -57,6 +57,9 @@ echo "Setting up workaround for Ubuntu systemd resolve bug" sudo rm -f /etc/resolv.conf sudo ln -s /run/systemd/resolve/resolv.conf /etc/resolv.conf +# remove hostname to get unique based on IP address +sudo rm /etc/hostname + echo "Set Network Test Server address to $NTS_IP in /etc/hosts" echo "$NTS_IP qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts 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 59df5a6b..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 @@ -100,6 +100,8 @@ installPackages+=(libfreetype6-dev) installPackages+=(libjpeg-dev) # Enable support for printer driver installPackages+=(libcups2-dev) +# Enable support for printer test +installPackages+=(cups-pdf) # Install libraries needed for QtMultimedia to be able to support all plugins installPackages+=(libasound2-dev) installPackages+=(libgstreamer1.0-dev) @@ -167,6 +169,13 @@ 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) +installPackages+=(libxml2-dev) +installPackages+=(libhyphen-dev) echo "Running update for apt" waitLoop diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-git_lfs.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-git_lfs.sh index 7f5140fd..7f5140fd 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-git_lfs.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-git_lfs.sh 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-Ubuntu-18.04-x86_64/03-qemu.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-qemu.sh index 9a4558e2..d4ad40b7 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-qemu.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-qemu.sh @@ -34,21 +34,35 @@ set -ex +# shellcheck source=../common/unix/DownloadURL.sh +source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh" # shellcheck source=../common/unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" -# build latest qemu to usermode sudo apt-get -y install automake autoconf libtool -tempDir=$(mktemp -d) -git clone git://git.qemu.org/qemu.git "$tempDir" -cd "$tempDir" - -#latest commit from the master proven to work -git checkout c7f1cf01b8245762ca5864e835d84f6677ae8b1f -git cherry-pick 75e5b70e6b5dcc4f2219992d7cffa462aa406af0 -git cherry-pick 04b33e21866412689f18b7ad6daf0a54d8f959a7 -git submodule update --init pixman +DownloadAndBuiltQemu () { + tempDir=$(mktemp -d) + cd ${tempDir} + + commit_sha=c7f1cf01b8245762ca5864e835d84f6677ae8b1f + qemu_tarball="qemu_tarball.zip" + PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/qemu/${qemu_tarball}" + AltUrl="https://github.com/qemu/qemu/archive/${commit_sha}.zip" + SHA1="351289c4420f16575bff060f91ce540d7b3fa2ab" + DownloadURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$qemu_tarball" + unzip ${qemu_tarball} + cd qemu-${commit_sha} + + fixes=( 75e5b70e6b5dcc4f2219992d7cffa462aa406af0 04b33e21866412689f18b7ad6daf0a54d8f959a7 cd8133679f7e0e2c292f631f1c78b2452d2435c7 ) + fixes_sha1sums=( e53c4f567b461e7e2905636b369c4458ee8c0277 1914e5fa2f707d69d86ceb7c94957d096c8e8db4 eeca01c307d37eb362913b3f811034d5ac77cac8 ) + for i in $(seq 0 $((${#fixes[@]} - 1))); do + PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/qemu/${fixes[$i]}.diff" + AltUrl="https://github.com/qemu/qemu/commit/${fixes[$i]}.diff" + SHA1="${fixes_sha1sums[$i]}" + DownloadURL "$PrimaryUrl" "$AltUrl" "$SHA1" "${fixes[$i]}.diff" + patch -p1 < ${fixes[$i]}.diff + done patch -p1 <<EOT From aad6a8f17dc7ad3681d2d98a01e474a8904a129b Mon Sep 17 00:00:00 2001 @@ -158,27 +172,46 @@ index 94d8abc745..e72cfb0cb5 100644 2.17.1 EOT -./configure --target-list=arm-linux-user,aarch64-linux-user --static --disable-werror -make -sudo make install -rm -rf "$tempDir" + ./configure --disable-bsd-user --disable-guest-agent --disable-strip --disable-werror --disable-gcrypt --disable-debug-info --disable-debug-tcg --disable-tcg-interpreter --enable-attr --disable-brlapi --disable-linux-aio --disable-bzip2 --disable-bluez --disable-cap-ng --disable-curl --disable-fdt --disable-glusterfs --disable-gnutls --disable-nettle --disable-gtk --disable-rdma --disable-libiscsi --disable-vnc-jpeg --disable-kvm --disable-lzo --disable-curses --disable-libnfs --disable-numa --disable-opengl --disable-vnc-png --disable-rbd --disable-vnc-sasl --disable-sdl --disable-seccomp --disable-smartcard --disable-snappy --disable-spice --disable-libusb --disable-usb-redir --disable-vde --disable-vhost-net --disable-virglrenderer --disable-virtfs --disable-vnc --disable-vte --disable-xen --disable-xen-pci-passthrough --disable-xfsctl --enable-linux-user --disable-system --disable-blobs --disable-tools --target-list=arm-linux-user,aarch64-linux-user --static --disable-pie --disable-docs + make + sudo make install + +# To create a new qemu.deb file add "--prefix=${tempDir}/qemu_prebuilt/usr/local/" to ./configure +# Then add the following commands, make sure to change the version number. +# mkdir ${tempDir}/qemu_prebuilt/DEBIAN +# echo -n "Package: QEMU +# Version: 2.8.0-833-g09cc6b1ab7-dirty +# Section: misc +# Priority: important +# Architecture: i386 +# Maintainer: Fabrice Bellard and the QEMU Project developers +# Description: QEMU for arm and arm64" > ${tempDir}/qemu_prebuilt/DEBIAN/control +# +# dpkg-deb --build ${tempDir}/qemu_prebuilt/ + rm -rf ${tempDir} +} + +qemu_prebuilt="/tmp/qemu_prebuilt.deb" +PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/qemu/qemu_prebuilt.deb" +AltUrl=${PrimaryUrl} +SHA1="a50bea7ee79ca7b7b6eebe55f02853997d445ea4" +DownloadURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$qemu_prebuilt" 2>&1 && success=$? || success=$? +if [ $success -eq 0 ]; then + sudo dpkg -i ${qemu_prebuilt} +else + DownloadAndBuiltQemu +fi # Enable binfmt support sudo apt-get -y install binfmt-support # Install qemu binfmt for 32bit and 64bit arm architectures -sudo update-binfmts --package qemu-arm --install arm \ -/usr/local/bin/qemu-arm \ ---magic \ -"\x7f\x45\x4c\x46\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28\x00" \ ---mask \ -"\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff" -sudo update-binfmts --package qemu-aarch64 --install aarch64 \ -/usr/local/bin/qemu-aarch64 \ ---magic \ -"\x7f\x45\x4c\x46\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\xb7\x00" \ ---mask \ -"\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff" +sudo update-binfmts --package qemu-arm --install arm /usr/local/bin/qemu-arm \ +--magic "\x7f\x45\x4c\x46\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28\x00" \ +--mask "\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff" +sudo update-binfmts --package qemu-aarch64 --install aarch64 /usr/local/bin/qemu-aarch64 \ +--magic "\x7f\x45\x4c\x46\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\xb7\x00" \ +--mask "\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff" # First test using QFont fails if fonts-noto-cjk is installed. This happens because # running fontcache for that font takes > 5 mins when run on QEMU. Running fc-cache diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto.sh index c9daf834..c5289f45 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto.sh @@ -2,7 +2,7 @@ ############################################################################# ## -## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2019 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -42,16 +42,16 @@ source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh" # shellcheck source=../common/unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" -echo "Installing Yocto toolchain for 32-bit b2qt..." +echo "Installing Yocto toolchain for 32-bit b2qt ARMV7..." -versionARM="2.3.4" -package="b2qt-x86_64-meta-toolchain-b2qt-embedded-sdk-qemuarmv7-7608ebe.sh" -PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/boot2qt/pyro/$package" -AltUrl="http://download.qt.io/development_releases/prebuilt/boot2qt/pyro/$package" -SHA1="db7a0f4f9ddd5992a563d5348889021a7ceb1c56" +versionARM="2.6.1" +package="b2qt-x86_64-meta-toolchain-b2qt-embedded-sdk-qemuarmv7-9e1a27d.sh" +PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/boot2qt/thud/$package" +AltUrl="http://download.qt.io/development_releases/prebuilt/boot2qt/thud/$package" +SHA1="7c76230ef1bb58bf907daa81117d81b48534802c" yoctoInstaller="/tmp/yocto-toolchain-ARMv7.sh" yoctoLocationARMv7="/opt/yocto-armv7" -sysrootARMv7="sysroots/armv7ahf-neon-poky-linux-gnueabi" +sysrootARMv7="sysroots/armv7at2hf-neon-poky-linux-gnueabi" crosscompileARMv7="sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi-" DownloadURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$yoctoInstaller" @@ -60,13 +60,13 @@ chmod +x "$yoctoInstaller" /bin/bash "$yoctoInstaller" -y -d "$yoctoLocationARMv7" rm -rf "$yoctoInstaller" -echo "Installing Yocto toolchain for 64-bit b2qt..." +echo "Installing Yocto toolchain for 64-bit b2qt ARM64..." -versionARM64="2.3.4" -package="b2qt-x86_64-meta-toolchain-b2qt-embedded-sdk-qemuarm64-7608ebe.sh" -PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/boot2qt/pyro/$package" -AltUrl="http://download.qt.io/development_releases/prebuilt/boot2qt/pyro/$package" -SHA1="5dcae7c6cbc266798ba49a9e51fff1f06790729d" +versionARM64="2.6.1" +package="b2qt-x86_64-meta-toolchain-b2qt-embedded-sdk-qemuarm64-9e1a27d.sh" +PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/boot2qt/thud/$package" +AltUrl="http://download.qt.io/development_releases/prebuilt/boot2qt/thud/$package" +SHA1="598c24b8bcf289bb67a14aea51567c0d00bf5187" yoctoInstaller="/tmp/yocto-toolchain-ARM64.sh" yoctoLocationARM64="/opt/yocto-arm64" sysrootARM64="sysroots/aarch64-poky-linux" @@ -78,11 +78,33 @@ chmod +x "$yoctoInstaller" /bin/bash "$yoctoInstaller" -y -d "$yoctoLocationARM64" rm -rf "$yoctoInstaller" -if [ -e "$yoctoLocationARMv7/$sysrootARMv7" ] && [ -e "$yoctoLocationARMv7/${crosscompileARMv7}g++" ] && [ -e "$yoctoLocationARM64/$sysrootARM64" ] && [ -e "$yoctoLocationARM64/${crosscompileARM64}g++" ]; then +echo "Installing Yocto toolchain for 64-bit b2qt MIPS64..." + +versionMIPS64="2.6.1" +package="b2qt-x86_64-meta-toolchain-b2qt-embedded-sdk-qemumips64-9e1a27d.sh" +PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/boot2qt/thud/$package" +AltUrl="http://download.qt.io/development_releases/prebuilt/boot2qt/thud/$package" +SHA1="8cea8504463ab96322e92f3c6e9e922f394ae3c7" +yoctoInstaller="/tmp/yocto-toolchain-mips64.sh" +yoctoLocationMIPS64="/opt/yocto-mips64" +sysrootMIPS64="sysroots/mips64-poky-linux" +crosscompileMIPS64="sysroots/x86_64-pokysdk-linux/usr/bin/mips64-poky-linux/mips64-poky-linux-" + +DownloadURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$yoctoInstaller" +chmod +x "$yoctoInstaller" + +/bin/bash "$yoctoInstaller" -y -d "$yoctoLocationMIPS64" +rm -rf "$yoctoInstaller" + + + +if [ -e "$yoctoLocationARMv7/$sysrootARMv7" ] && [ -e "$yoctoLocationARMv7/${crosscompileARMv7}g++" ] && [ -e "$yoctoLocationARM64/$sysrootARM64" ] && [ -e "$yoctoLocationARM64/${crosscompileARM64}g++" ] && [ -e "$yoctoLocationMIPS64/$sysrootMIPS64" ] && [ -e "$yoctoLocationMIPS64/${crosscompileMIPS64}g++" ]; then SetEnvVar "QEMUARMV7_TOOLCHAIN_SYSROOT" "$yoctoLocationARMv7/$sysrootARMv7" SetEnvVar "QEMUARMV7_TOOLCHAIN_CROSS_COMPILE" "$yoctoLocationARMv7/$crosscompileARMv7" SetEnvVar "QEMUARM64_TOOLCHAIN_SYSROOT" "$yoctoLocationARM64/$sysrootARM64" SetEnvVar "QEMUARM64_TOOLCHAIN_CROSS_COMPILE" "$yoctoLocationARM64/$crosscompileARM64" + SetEnvVar "QEMUMIPS64_TOOLCHAIN_SYSROOT" "$yoctoLocationMIPS64/$sysrootMIPS64" + SetEnvVar "QEMUMIPS64_TOOLCHAIN_CROSS_COMPILE" "$yoctoLocationMIPS64/$crosscompileMIPS64" else echo "Error! Couldn't find installation paths for Yocto toolchain. Aborting provisioning." 1>&2 exit 1 @@ -90,9 +112,10 @@ fi echo "Yocto ARMv7 toolchain = $versionARM" >> ~/versions.txt echo "Yocto ARM64 toolchain = $versionARM64" >> ~/versions.txt +echo "Yocto MIPS64 toolchain = $versionMIPS64" >> ~/versions.txt # List qt user in qemu toolchain sysroots -sudo sh -c "grep ^qt /etc/passwd >> /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi/etc/passwd" -sudo sh -c "grep ^qt /etc/group >> /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi/etc/group" +sudo sh -c "grep ^qt /etc/passwd >> /opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi/etc/passwd" +sudo sh -c "grep ^qt /etc/group >> /opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi/etc/group" sudo sh -c "grep ^qt /etc/passwd >> /opt/yocto-arm64/sysroots/aarch64-poky-linux/etc/passwd" sudo sh -c "grep ^qt /etc/group >> /opt/yocto-arm64/sysroots/aarch64-poky-linux/etc/group" diff --git a/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/01-install_telegraf.sh b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/01-install_telegraf.sh new file mode 100755 index 00000000..729f9003 --- /dev/null +++ b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/01-install_telegraf.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +"$(dirname "$0")"/../common/unix/telegraf_install.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/01-systemsetup.sh index 61c19510..d3724ceb 100755 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/01-systemsetup.sh @@ -8,6 +8,9 @@ source "$BASEDIR/../common/shared/network_test_server_ip.txt" # shellcheck source=../common/unix/check_and_set_proxy.sh source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh" +# https://bugzilla.opensuse.org/show_bug.cgi?id=1032027 +sudo btrfs quota disable / + sed -i '$ a\[Daemon\]\nAutolock=false\nLockOnResume=false' ~/.config/kscreenlockerrc sudo sed -i 's|GRUB_TIMEOUT=8|GRUB_TIMEOUT=0|g' /etc/default/grub @@ -20,6 +23,9 @@ echo 'export DISPLAY=":0"' >> ~/.bashrc echo "Disabling file indexing." sudo balooctl disable +sudo systemctl stop packagekit +sudo systemctl disable packagekit +sudo systemctl mask packagekit while sudo fuser /usr/lib/packagekitd >/dev/null 2>&1 ; do echo "Waiting for PackageKit to finish..." sleep 0.5 @@ -33,4 +39,3 @@ if [ "$http_proxy" != "" ]; then sudo sed -i 's/PROXY_ENABLED=\"no\"/PROXY_ENABLED=\"yes\"/' /etc/sysconfig/proxy sudo sed -i "s|HTTP_PROXY=\".*\"|HTTP_PROXY=\"$proxy\"|" /etc/sysconfig/proxy fi - diff --git a/coin/provisioning/qtci-linux-SLES-12-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-SLES-12-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.1-x86_64/02-zypperpackages.sh b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/02-zypperpackages.sh new file mode 100755 index 00000000..d1f3050f --- /dev/null +++ b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/02-zypperpackages.sh @@ -0,0 +1,51 @@ +#!/usr/bin/env bash + +set -ex + +sudo zypper -nq install git gcc7 gcc7-c++ +sudo /usr/sbin/update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-7 1 \ + --slave /usr/bin/g++ g++ /usr/bin/g++-7 \ + --slave /usr/bin/cc cc /usr/bin/gcc-7 \ + --slave /usr/bin/c++ c++ /usr/bin/g++-7 + +sudo zypper -nq install bison flex gperf \ + zlib-devel \ + libudev-devel \ + glib2-devel \ + libopenssl-devel \ + freetype2-devel \ + fontconfig-devel \ + sqlite3-devel \ + libxkbcommon-devel \ + libxkbcommon-x11-devel + +# EGL support +sudo zypper -nq install Mesa-libEGL-devel Mesa-libGL-devel + + +# Xinput2 +sudo zypper -nq install libXi-devel + +# system provided XCB libraries +sudo zypper -nq install xcb-util-devel xcb-util-image-devel xcb-util-keysyms-devel \ + xcb-util-wm-devel xcb-util-renderutil-devel + +# ICU +sudo zypper -nq install libicu-devel libicu60_2 + +# qtwebengine +sudo zypper -nq install alsa-devel dbus-1-devel \ + libXcomposite-devel libXcursor-devel libXrandr-devel libXtst-devel \ + mozilla-nspr-devel mozilla-nss-devel + +# qtwebkit +sudo zypper -nq install libxml2-devel libxslt-devel + +# GStreamer (qtwebkit and qtmultimedia), pulseaudio (qtmultimedia) +sudo zypper -nq install gstreamer-devel gstreamer-plugins-base-devel libpulse-devel + +# cups +sudo zypper -nq install cups-devel + +#speech-dispatcher +sudo zypper -nq install libspeechd-devel diff --git a/coin/provisioning/qtci-linux-SLES-12-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-SLES-12-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-42.3-x86_64/08-pythondev.sh b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/08-pythondev.sh index 6c5d2a0f..ab966a02 100755 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/08-pythondev.sh @@ -5,11 +5,10 @@ set -ex -sudo pkcon -y refresh -sudo pkcon -y install python-devel python-virtualenv +sudo zypper -nq install python-devel python-xml # install python3 -sudo pkcon -y install libpython3_4m1_0 python3-base python3 python3-pip python3-devel python3-virtualenv python3-wheel +sudo zypper -nq install python3-base python3 python3-pip python3-devel python3-virtualenv python3-wheel # Install all needed packages in a special wheel cache directory pip3 wheel --wheel-dir "$HOME/python3-wheels" -r "${BASH_SOURCE%/*}/../common/shared/requirements.txt" diff --git a/coin/provisioning/qtci-linux-SLES-12-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-SLES-12-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-RHEL-7.4-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-RHEL-7.4-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-SLES-12-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-SLES-12-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-SLES-12-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-SLES-12-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-42.3-x86_64/55-emsdk.sh b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/55-emsdk.sh index 09a76778..44cf1b80 100755 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/55-emsdk.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/55-emsdk.sh @@ -35,5 +35,5 @@ set -ex -# shellcheck source=../common/linux/emsdk.sh -source "${BASH_SOURCE%/*}/../common/linux/emsdk.sh" +# shellcheck source=../common/unix/emsdk.sh +source "${BASH_SOURCE%/*}/../common/unix/emsdk.sh" diff --git a/coin/provisioning/qtci-linux-SLES-12-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-SLES-12-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-SLES-12-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-SLES-12-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-SLES-12-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-SLES-12-x86_64/99-version.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/99-version.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/02-disable-ntp.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/02-disable-ntp.sh deleted file mode 100755 index 38707a8a..00000000 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/02-disable-ntp.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash -# shellcheck source=../common/linux/disable-ntp_linux.sh -source "${BASH_SOURCE%/*}/../common/linux/disable-ntp_linux.sh" diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/02-zypperpackages.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/02-zypperpackages.sh deleted file mode 100755 index 2fab85ac..00000000 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/02-zypperpackages.sh +++ /dev/null @@ -1,69 +0,0 @@ -#!/usr/bin/env bash - -set -ex - -sudo zypper -nq install git -sudo zypper -nq install gcc7 -sudo zypper -nq install gcc7-c++ -sudo /usr/sbin/update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-7 1 \ - --slave /usr/bin/g++ g++ /usr/bin/g++-7 \ - --slave /usr/bin/cc cc /usr/bin/gcc-7 \ - --slave /usr/bin/c++ c++ /usr/bin/g++-7 - -sudo zypper -nq install bison -sudo zypper -nq install flex -sudo zypper -nq install gperf - -sudo zypper -nq install zlib-devel -sudo zypper -nq install libudev-devel -sudo zypper -nq install glib2-devel -sudo zypper -nq install libopenssl-devel -sudo zypper -nq install freetype2-devel -sudo zypper -nq install fontconfig-devel -sudo zypper -nq install sqlite3-devel - -# EGL support -sudo zypper -nq install Mesa-libEGL-devel -sudo zypper -nq install Mesa-libGL-devel - -# libxkbcommon -sudo zypper -nq install libxkbcommon-devel -sudo zypper -nq install libxkbcommon-x11-devel - -# Xinput2 -sudo zypper -nq install libXi-devel - -# system provided XCB libraries -sudo zypper -nq install xcb-util-devel -sudo zypper -nq install xcb-util-image-devel -sudo zypper -nq install xcb-util-keysyms-devel -sudo zypper -nq install xcb-util-wm-devel -sudo zypper -nq install xcb-util-renderutil-devel - -# ICU -sudo zypper -nq install libicu-devel -sudo zypper -nq install libicu52_1 - -# qtwebengine -sudo zypper -nq install alsa-devel -sudo zypper -nq install dbus-1-devel -sudo zypper -nq install libXcomposite-devel -sudo zypper -nq install libXcursor-devel -sudo zypper -nq install libXrandr-devel -sudo zypper -nq install libXtst-devel -sudo zypper -nq install mozilla-nspr-devel -sudo zypper -nq install mozilla-nss-devel - -# qtwebkit -sudo zypper -nq install libxml2-devel -sudo zypper -nq install libxslt-devel - -# GStreamer (qtwebkit and qtmultimedia) -sudo zypper -nq install gstreamer-devel -sudo zypper -nq install gstreamer-plugins-base-devel - -# pulseaudio (qtmultimedia) -sudo zypper -nq install libpulse-devel - -# cups -sudo zypper -nq install cups-devel diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-libclang.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-libclang.sh deleted file mode 100755 index bbe2b4b4..00000000 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-libclang.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -set -ex - -BASEDIR=$(dirname "$0") -# shellcheck source=../common/unix/libclang.sh -"$BASEDIR/../common/unix/libclang.sh" diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/09-cmake.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/09-cmake.sh deleted file mode 100755 index 5eb53566..00000000 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/09-cmake.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - -set -ex - -"$(dirname "$0")/../common/linux/cmake_linux.sh" diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/09-install-openssl.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/09-install-openssl.sh deleted file mode 100755 index 4f1d3768..00000000 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/09-install-openssl.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash - -set -ex - -# shellcheck source=../common/unix/install-openssl.sh -source "${BASH_SOURCE%/*}/../common/unix/install-openssl.sh" "linux" diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/18-icc.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/18-icc.sh deleted file mode 100755 index 7ab8528a..00000000 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/18-icc.sh +++ /dev/null @@ -1,86 +0,0 @@ -#!/usr/bin/env bash - -############################################################################# -## -## 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$ -## -############################################################################# - -# This script install Intel Parallel Studio XE Composer Edition for C++ Linux - -# shellcheck source=../common/unix/DownloadURL.sh -source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh" - -set -ex - -mainStorage="ci-files01-hki.intra.qt.io:/hdd/www/input" -localMount="/mnt/storage/" - -iccPackage="parallel_studio_xe_2018_update1_composer_edition_for_cpp.tgz" -iccPackageSource="$localMount/intel/$iccPackage" -iccInstallPath="/opt/intel" -iccTmpPath="/tmp/icc" - -iccLicense="l_icc_2018.lic" -iccLicenseSource="$localMount/semisecure/$iccLicense" -iccLicenseTarget="/home/qt/$iccLicense" - -iccInstallInstructions="$iccTmpPath/instructions.txt" - -sudo mkdir -p "$localMount" -sudo mount "$mainStorage" "$localMount" -mkdir -p "$iccTmpPath" -tar -zxf "$iccPackageSource" -C "$iccTmpPath" --strip 1 - -cp "$iccLicenseSource" "$iccLicenseTarget" - -sudo umount "$localMount" - -cat >"$iccInstallInstructions" <<EOT -ACCEPT_EULA=accept -CONTINUE_WITH_OPTIONAL_ERROR=yes -PSET_INSTALL_DIR=$iccInstallPath -CONTINUE_WITH_INSTALLDIR_OVERWRITE=yes -PSET_MODE=install -ACTIVATION_LICENSE_FILE=$iccLicenseTarget -ACTIVATION_TYPE=license_file -PHONEHOME_SEND_USAGE_DATA=no -ARCH_SELECTED=ALL -COMPONENTS=;intel-comp__x86_64;intel-comp-32bit__x86_64;intel-comp-doc__noarch;intel-comp-l-all-common__noarch;intel-comp-l-all-vars__noarch;intel-comp-nomcu-vars__noarch;intel-comp-ps-32bit__x86_64;intel-comp-ps__x86_64;intel-comp-ps-ss__x86_64;intel-comp-ps-ss-bec__x86_64;intel-comp-ps-ss-bec-32bit__x86_64;intel-openmp__x86_64;intel-openmp-32bit__x86_64;intel-openmp-common__noarch;intel-openmp-common-icc__noarch;intel-tbb-libs-32bit__x86_64;intel-tbb-libs__x86_64;intel-idesupport-icc-common-ps__noarch;intel-icc__x86_64;intel-icc-32bit__x86_64;intel-c-comp-common__noarch;intel-icc-common__noarch;intel-icc-common-ps__noarch;intel-icc-common-ps-ss-bec__noarch;intel-icc-doc__noarch;intel-icc-doc-ps__noarch;intel-icc-ps__x86_64;intel-icc-ps-ss__x86_64;intel-icc-ps-ss-bec__x86_64;intel-icc-ps-ss-bec-32bit__x86_64;intel-tbb-devel-32bit__x86_64;intel-tbb-devel__x86_64;intel-tbb-common__noarch;intel-tbb-doc__noarch;intel-ism__noarch;intel-ccompxe__noarch;intel-psxe-common__noarch;intel-psxe-doc__noarch;intel-psxe-common-doc__noarch;intel-ccompxe-doc__noarch;intel-psxe-licensing__noarch;intel-psxe-licensing-doc__noarch;intel-icsxe-pset -EOT - -(cd "$iccTmpPath" && sudo ./install.sh --silent $iccInstallInstructions --ignore-cpu) - -# Export LD_LIBRARY_PATH to Coin -echo "export ICC64_18_LDLP=$iccInstallPath/lib/intel64" >>~/.bashrc -echo "export ICC64_18_PATH=$iccInstallPath/compilers_and_libraries_2018.1.163/linux/bin/intel64:$iccInstallPath/bin" >>~/.bashrc -echo "ICC = 18.0.1 20171018" >> ~/versions.txt - -rm -rf "$iccTmpPath" diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/22-mqtt_broker.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/22-mqtt_broker.sh deleted file mode 100755 index e677427f..00000000 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/22-mqtt_broker.sh +++ /dev/null @@ -1,37 +0,0 @@ -#!/usr/bin/env bash - -############################################################################# -## -## 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$ -## -############################################################################# - -# shellcheck source=../common/unix/mqtt_broker.sh -source "${BASH_SOURCE%/*}/../common/unix/mqtt_broker.sh" diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/90-squish.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/90-squish.sh deleted file mode 100755 index e4281588..00000000 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/90-squish.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash -BASEDIR=$(dirname "$0") -"$BASEDIR/../common/unix/squishInstall.sh" - diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/99-unset-proxy.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/99-unset-proxy.sh deleted file mode 100755 index 5ff78055..00000000 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/99-unset-proxy.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/usr/bin/env bash -############################################################################# -## -## 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$ -## -############################################################################# - -set -ex - -# Having proxy set while running autotests makes them fail -sudo sed -i 's/PROXY_ENABLED=\"yes\"/PROXY_ENABLED=\"no\"/' /etc/sysconfig/proxy - diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/99-version.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/99-version.sh deleted file mode 100755 index 03565da2..00000000 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/99-version.sh +++ /dev/null @@ -1,48 +0,0 @@ -#!/usr/bin/env bash - -############################################################################# -## -## 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$ -## -############################################################################# - -# This script needs to be called last during provisioning so that the software information will show up last in provision log. - -# Storage installed RPM packages information - -set -ex - -# shellcheck disable=SC2129 -echo "*********************************************" >> ~/versions.txt -echo "***** All installed RPM packages *****" >> ~/versions.txt -rpm -q -a | sort >> ~/versions.txt -echo "*********************************************" >> ~/versions.txt - -"$(dirname "$0")/../common/linux/version.sh" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/02-disable-ntp.sh b/coin/provisioning/qtci-macos-10.12-x86_64/02-disable-ntp.sh deleted file mode 100755 index 3304cc3e..00000000 --- a/coin/provisioning/qtci-macos-10.12-x86_64/02-disable-ntp.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash -set -ex - -# shellcheck source=../common/unix/disable-ntp_macos.sh -source "${BASH_SOURCE%/*}/../common/unix/disable-ntp_macos.sh" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/03-bashprofile.sh b/coin/provisioning/qtci-macos-10.12-x86_64/03-bashprofile.sh deleted file mode 100755 index 2c3e45f3..00000000 --- a/coin/provisioning/qtci-macos-10.12-x86_64/03-bashprofile.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env sh - -set -ex - -# Read .bashrc if exist -printf -- "# Get the aliases and functions\nif [ -f ~/.bashrc ]; then\n . ~/.bashrc\nfi\n" >> ~/.bash_profile - diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/05-systemsetup.sh b/coin/provisioning/qtci-macos-10.12-x86_64/05-systemsetup.sh deleted file mode 100755 index 95631107..00000000 --- a/coin/provisioning/qtci-macos-10.12-x86_64/05-systemsetup.sh +++ /dev/null @@ -1,100 +0,0 @@ -#!/usr/bin/env bash - -############################################################################# -## -## 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$ -## -############################################################################# - -set -ex - -# This script modified system settings for automated use - -targetFile="$HOME/vncpw.txt" - -# Fetch password -curl --retry 5 --retry-delay 10 --retry-max-time 60 "http://ci-files01-hki.intra.qt.io/input/semisecure/vncpw.txt" -o "$targetFile" -shasum "$targetFile" |grep "a795fccaa8f277e62ec08e6056c544b8b63924a0" - -{ VNCPassword=$(cat "$targetFile"); } 2> /dev/null -NTS_IP=10.212.2.216 - -echo "Disable Screensaver" -# For current session -defaults -currentHost write com.apple.screensaver idleTime 0 - -echo "Disable sleep" -sudo pmset sleep 0 displaysleep 0 - -# For session after a reboot -mkdir -p "$HOME/Library/LaunchAgents" -cat >"$HOME/Library/LaunchAgents/no-screensaver.plist" <<EOT -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> - -<plist version="1.0"> - <dict> - <key>Label</key> - <string>org.qt.io.screensaver_disable</string> - <key>ProgramArguments</key> - <array> - <string>defaults</string> - <string>-currentHost</string> - <string>write</string> - <string>com.apple.screensaver</string> - <string>idleTime</string> - <string>0</string> - </array> - <key>RunAtLoad</key> - <true/> - <key>KeepAlive</key> - <false/> - </dict> -</plist> -EOT - -defaults write com.apple.screensaver askForPassword -int 0 - -echo "Set keyboard type rates and delays" -# normal minimum is 15 (225 ms) -defaults write -g InitialKeyRepeat -int 15 -# normal minimum is 2 (30 ms) -defaults write -g KeyRepeat -int 2 - -set +x -echo "Enable remote desktop sharing" -sudo /System/Library/CoreServices/RemoteManagement/ARDAgent.app/Contents/Resources/kickstart -activate -configure -access -on -clientopts -setvnclegacy -vnclegacy yes -clientopts -setvncpw -vncpw $VNCPassword -restart -agent -privs -all -set -x - -echo "Set Network Test Server address to $NTS_IP in /etc/hosts" -echo "$NTS_IP qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts - -sudo systemsetup settimezone GMT -sudo rm -f "$targetFile" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/06-crashreporter.sh b/coin/provisioning/qtci-macos-10.12-x86_64/06-crashreporter.sh deleted file mode 100755 index 8461c656..00000000 --- a/coin/provisioning/qtci-macos-10.12-x86_64/06-crashreporter.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env sh - -set -ex - -defaults write com.apple.CrashReporter DialogType server diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/06-disable_spotlight.sh b/coin/provisioning/qtci-macos-10.12-x86_64/06-disable_spotlight.sh deleted file mode 100755 index 67e2c1f6..00000000 --- a/coin/provisioning/qtci-macos-10.12-x86_64/06-disable_spotlight.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash -set -ex - -# shellcheck source=../common/macos/disable_spotlight.sh -source "${BASH_SOURCE%/*}/../common/macos/disable_spotlight.sh" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/06-disable_update_downloads.sh b/coin/provisioning/qtci-macos-10.12-x86_64/06-disable_update_downloads.sh deleted file mode 100755 index 3c11214d..00000000 --- a/coin/provisioning/qtci-macos-10.12-x86_64/06-disable_update_downloads.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash -set -ex -BASEDIR=$(dirname "$0") -"$BASEDIR"/../common/macos/disable_update_downloads.sh diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/07-SSL_keychain.sh b/coin/provisioning/qtci-macos-10.12-x86_64/07-SSL_keychain.sh deleted file mode 100755 index 6e7c796a..00000000 --- a/coin/provisioning/qtci-macos-10.12-x86_64/07-SSL_keychain.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env sh - -set -ex - -# shellcheck source=../common/unix/SetEnvVar.sh -source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" - -# Enables the usage of temporary keychains for SSL autotests -SetEnvVar "QT_SSL_USE_TEMPORARY_KEYCHAIN" "1" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/15-xz.sh b/coin/provisioning/qtci-macos-10.12-x86_64/15-xz.sh deleted file mode 100755 index 6e47f6a5..00000000 --- a/coin/provisioning/qtci-macos-10.12-x86_64/15-xz.sh +++ /dev/null @@ -1,52 +0,0 @@ -#!/usr/bin/env bash - -############################################################################# -## -## 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$ -## -############################################################################# - -# This script installs XZ-Utils - -# XZ-Utils are needed for uncompressing xz-compressed files - -set -ex - -# shellcheck source=../common/macos/InstallPKGFromURL.sh -source "${BASH_SOURCE%/*}/../common/macos/InstallPKGFromURL.sh" - -PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/macos_10.12_sierra/XZ.pkg" -AltUrl="http://sourceforge.net/projects/macpkg/files/XZ/5.0.7/XZ.pkg" -SHA1="f0c1f82ebcffe0bd4b8b57b6a77805db56b2de67" -DestDir="/" - -InstallPKGFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$DestDir" - -echo "XZ = 5.0.7" >> ~/versions.txt diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/20-java.sh b/coin/provisioning/qtci-macos-10.12-x86_64/20-java.sh deleted file mode 100755 index dcfcb93b..00000000 --- a/coin/provisioning/qtci-macos-10.12-x86_64/20-java.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash -set -ex - -BASEDIR=$(dirname "$0") -"$BASEDIR/../common/macos/java.sh" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/20-xcode.sh b/coin/provisioning/qtci-macos-10.12-x86_64/20-xcode.sh deleted file mode 100755 index 304eb0b6..00000000 --- a/coin/provisioning/qtci-macos-10.12-x86_64/20-xcode.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/usr/bin/env bash - -############################################################################# -## -## 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$ -## -############################################################################# - -# This script installs Xcode -# Prerequisites: Have Xcode prefetched to local cache as xz compressed. -# This can be achieved by fetching Xcode_8.xip from Apple Store. -# Uncompress it with 'xar -xf Xcode_8.xip' -# Then get https://gist.githubusercontent.com/pudquick/ff412bcb29c9c1fa4b8d/raw/24b25538ea8df8d0634a2a6189aa581ccc6a5b4b/parse_pbzx2.py -# with which you can run 'python parse_pbzx2.py Content'. -# This will give you a file called "Content.part00.cpio.xz" that -# can be renamed to Xcode_8.xz for this script. - -set -ex - -# shellcheck source=../common/macos/install_xcode.sh -source "${BASH_SOURCE%/*}/../common/macos/install_xcode.sh" - -InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/Xcode_9.2.tar.gz 9.2 diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/21-install-commandlinetools.sh b/coin/provisioning/qtci-macos-10.12-x86_64/21-install-commandlinetools.sh deleted file mode 100755 index 1fa8b05d..00000000 --- a/coin/provisioning/qtci-macos-10.12-x86_64/21-install-commandlinetools.sh +++ /dev/null @@ -1,47 +0,0 @@ -#!/usr/bin/env bash - -############################################################################# -## -## 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$ -## -############################################################################# - -set -ex - -# shellcheck source=../common/macos/install-commandlinetools.sh -source "${BASH_SOURCE%/*}/../common/macos/install-commandlinetools.sh" - -version="9.2" -packageName="Command_Line_Tools_macOS_10.12_for_Xcode_$version.dmg" -url="http://ci-files01-hki.intra.qt.io/input/mac/$packageName" -sha1="f121c3b70fb77a98c1f2fc5e1932bd93bde03acf" - -InstallCommandLineTools $url $url $sha1 $packageName $version - diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/25-homebrew.sh b/coin/provisioning/qtci-macos-10.12-x86_64/25-homebrew.sh deleted file mode 100755 index 06e984ec..00000000 --- a/coin/provisioning/qtci-macos-10.12-x86_64/25-homebrew.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -set -ex - -BASEDIR=$(dirname "$0") -"$BASEDIR/../common/macos/homebrew.sh" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/25-postgresql.sh b/coin/provisioning/qtci-macos-10.12-x86_64/25-postgresql.sh deleted file mode 100755 index 9f79c594..00000000 --- a/coin/provisioning/qtci-macos-10.12-x86_64/25-postgresql.sh +++ /dev/null @@ -1,57 +0,0 @@ -#!/usr/bin/env bash - -############################################################################# -## -## 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$ -## -############################################################################# - -# This script installs PostgreSQL - -# PostgreSQL is needed for Qt to be able to support PostgreSQL - -set -ex - -# shellcheck source=../common/macos/InstallAppFromCompressedFileFromURL.sh -source "${BASH_SOURCE%/*}/../common/macos/InstallAppFromCompressedFileFromURL.sh" -# shellcheck source=../common/unix/SetEnvVar.sh -source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" - -psqlVersion="9.6.0" - -PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/macos_10.12_sierra/Postgres-$psqlVersion.zip" -AltUrl="https://github.com/PostgresApp/PostgresApp/releases/download/$psqlVersion/Postgres-$psqlVersion.zip" -SHA1="5078e44663787006ca55fa3b5e2be598bed82eb5" -appPrefix="" - -InstallAppFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$appPrefix" - -SetEnvVar "POSTGRESQLBINPATH" "/Applications/Postgres.app/Contents/Versions/9.6/bin" -echo "PostgreSQL = $psqlVersion" >> ~/versions.txt diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/25-python2.sh b/coin/provisioning/qtci-macos-10.12-x86_64/25-python2.sh deleted file mode 100755 index 7ebb8825..00000000 --- a/coin/provisioning/qtci-macos-10.12-x86_64/25-python2.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash -set -ex - -# shellcheck source=../common/macos/python2.sh -source "${BASH_SOURCE%/*}/../common/macos/python2.sh" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/25-python3.sh b/coin/provisioning/qtci-macos-10.12-x86_64/25-python3.sh deleted file mode 100755 index eb2a4863..00000000 --- a/coin/provisioning/qtci-macos-10.12-x86_64/25-python3.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash -set -ex - -# shellcheck source=../common/macos/python3.sh -source "${BASH_SOURCE%/*}/../common/macos/python3.sh" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/26-odbc.sh b/coin/provisioning/qtci-macos-10.12-x86_64/26-odbc.sh deleted file mode 100755 index 2aedfe7b..00000000 --- a/coin/provisioning/qtci-macos-10.12-x86_64/26-odbc.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash -# Install libiodbc - -set -ex - -BASEDIR=$(dirname "$0") -"$BASEDIR/../common/macos/libiodbc.sh" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/26-p7zip.sh b/coin/provisioning/qtci-macos-10.12-x86_64/26-p7zip.sh deleted file mode 100755 index 15511332..00000000 --- a/coin/provisioning/qtci-macos-10.12-x86_64/26-p7zip.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash -# Install 7z to be used from command line - -set -ex - -brew update -brew install p7zip diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/26-virtualenv.sh b/coin/provisioning/qtci-macos-10.12-x86_64/26-virtualenv.sh deleted file mode 100755 index eaabce82..00000000 --- a/coin/provisioning/qtci-macos-10.12-x86_64/26-virtualenv.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -set -ex - -BASEDIR=$(dirname "$0") -"$BASEDIR/../common/macos/virtualenv.sh" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/27-libclang.sh b/coin/provisioning/qtci-macos-10.12-x86_64/27-libclang.sh deleted file mode 100755 index 33795b08..00000000 --- a/coin/provisioning/qtci-macos-10.12-x86_64/27-libclang.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -set -ex - -BASEDIR=$(dirname "$0") -# There is only one mac package -"$BASEDIR/../common/unix/libclang.sh" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh b/coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh deleted file mode 100755 index 44fa76f1..00000000 --- a/coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -set -ex - -# shellcheck source=../common/macos/install_openssl.sh -source "${BASH_SOURCE%/*}/../common/unix/install-openssl.sh" "macos" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/55-signtools.sh b/coin/provisioning/qtci-macos-10.12-x86_64/55-signtools.sh deleted file mode 100755 index 5bc77ad3..00000000 --- a/coin/provisioning/qtci-macos-10.12-x86_64/55-signtools.sh +++ /dev/null @@ -1,138 +0,0 @@ -#!/usr/bin/env sh - -############################################################################# -## -## 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$ -## -############################################################################# - -# Install tools for singing packages -# This script assume that OS is vanilla. Target machine dosen't have any signing certificates installed. - -set -ex - -cache="http://ci-files01-hki.intra.qt.io/input" -cacheSigningTools="$cache/mac/sign_tools" -targetFolder="/Users/qt" -keychains="$targetFolder/Library/Keychains" - -Install() { - - url=$1 - targetFile=$2 - expectedSha1=$3 - - echo "Fetching $targetFile from $url..." - curl --retry 5 --retry-delay 10 --retry-max-time 60 "$url" -o "$targetFile" - shasum "$targetFile" |grep "$expectedSha1" - -} - -# qt-license -sha1QtLicense="9d59241d16f68d914f1c7aa1dc23e05faa169e8d" -Install "$cache/semisecure/.qt-license" "$targetFolder/.qt-license" $sha1QtLicense - -# Login keychain -sha1LoginKeychainPassword="aae58d00d0a1b179a09f21cfc67f9d16fb95ff36" -Install "$cacheSigningTools/login_keychain_password.txt" "$targetFolder/login_keychain_password.txt" "$sha1LoginKeychainPassword" -loginKeychainPassword=$(cat "$targetFolder/login_keychain_password.txt") -loginKeychain=$keychains/login.keychain - -echo "Setting login.keychain as default keychain.." -security default-keychain -s $loginKeychain* -echo "Unlocking Login keychain with password.." -security unlock-keychain -p "$loginKeychainPassword" $loginKeychain* - -echo "remove the "Lock after X minutes of inactivity" from login.keychain" -security set-keychain-settings $loginKeychain - -# Apple Worldwide Developer Relations Certification Authority -> https://developer.apple.com/certificationauthority/AppleWWDRCA.cer -sha1AppleWWDRCA="ff6797793a3cd798dc5b2abef56f73edc9f83a64" -Install "$cacheSigningTools/AppleWWDRCA.cer" "$targetFolder/AppleWWDRCA.cer" $sha1AppleWWDRCA -sudo security add-certificates -k $loginKeychain* "$targetFolder/AppleWWDRCA.cer" - -# Developer ID Certification Authority -> https://www.apple.com/certificateauthority/DeveloperIDCA.cer -sha1DeveloperIDCA="3b166c3b7dc4b751c9fe2afab9135641e388e186" -Install "$cacheSigningTools/DeveloperIDCA.cer" "$targetFolder/DeveloperIDCA.cer" $sha1DeveloperIDCA -sudo security add-certificates -k $loginKeychain* "$targetFolder/DeveloperIDCA.cer" - -# Create script to unlock keychain 'security unlock-keychain -p 'password' Developer_ID_TheQtCompany.keychain' -sha1UnLockKeychain="4398870e3f558ad28c80566b5f70e24dc29ea724" -unlockKeychain=$targetFolder/unlock-keychain.sh -Install "$cacheSigningTools/unlock-keychain.sh" "$unlockKeychain" $sha1UnLockKeychain -sudo chmod 755 "$unlockKeychain" - -# Codesigning requirements file. The bundle identifier in the requirements file should match the identifier of the application that is signed. -shaCsreq="2c3f00b1845a0f475673fd6934ba25ea51d1f910" -csreq=$targetFolder/csreq_qt_company.txt -Install "$cacheSigningTools/csreq_qt_company.txt" "$csreq" $shaCsreq -chmod 755 "$csreq" - -# iOS signing tools -devIDKeychain="Developer_ID_TheQtCompany.keychain" -shaDevIdKeychain="0420a129c17725a97afd6fdafeb9cddfb80a65ca" -Install "$cacheSigningTools/$devIDKeychain" "$keychains/$devIDKeychain" $shaDevIdKeychain -echo "Opening $devIDKeychain.." -open "$keychains/$devIDKeychain" - -sha1DeveloperIDTheQtCompanyKeychainPassword="d758e067736bbda7a91ffaec66cd38afdaf68ea6" -Install "$cacheSigningTools/Developer_ID_TheQtCompany_keychain_password.txt" "$targetFolder/Developer_ID_TheQtCompany_keychain_password.txt" "$sha1DeveloperIDTheQtCompanyKeychainPassword" -DeveloperIDTheQtCompanyKeychainPassword=$(cat "$targetFolder/Developer_ID_TheQtCompany_keychain_password.txt") - -echo "Unlocking $devIDKeychain with password.." -security unlock-keychain -p "$DeveloperIDTheQtCompanyKeychainPassword" $keychains/Developer_ID_TheQtCompany.keychain -security set-keychain-settings $keychains/Developer_ID_TheQtCompany.keychain - -sha1Ios="aae58d00d0a1b179a09f21cfc67f9d16fb95ff36" -Install "$cacheSigningTools/ios_password.txt" "$targetFolder/ios_password.txt" $sha1Ios -iosPassword=$(cat "$targetFolder/ios_password.txt") - -iPhoneDeveloper="iosdevelopment.p12" -shaIPhoneDeveloper="f48f6827e8d0ccdc764cb987e401b9a6f7d3f10c" -Install "$cacheSigningTools/latest_ios_cert/$iPhoneDeveloper" "$targetFolder/$iPhoneDeveloper" $shaIPhoneDeveloper -echo "Importing $iPhoneDeveloper.." -security import $targetFolder/$iPhoneDeveloper -k $loginKeychain* -P "$iosPassword" -T /usr/bin/codesign - -iPhoneDistribution="iosdistribution.p12" -shaIPhoneDistribution="64b1174fc3ce0eca044fbc9fa144f6a2d4330171" -Install "$cacheSigningTools/latest_ios_cert/$iPhoneDistribution" "$targetFolder/$iPhoneDistribution" $shaIPhoneDistribution -echo "Importing $iPhoneDistribution.." -security import "$targetFolder/$iPhoneDistribution" -k $loginKeychain* -P "$iosPassword" -T /usr/bin/codesign - -# Mobileprovision -echo "Creating directory $targetFolder/Library/MobileDevice/Provisioning Profiles.." -mkdir "$targetFolder/Library/MobileDevice" -mkdir "$targetFolder/Library/MobileDevice/Provisioning Profiles" -shaMobileprovision="88c67c95a6f59e6463a00da0b5021f581db624bf" -Install "$cacheSigningTools/latest_ios_cert/iOS_Dev08112017.mobileprovision" "$targetFolder/Library/MobileDevice/Provisioning Profiles/iOS_Dev08112017.mobileprovision" $shaMobileprovision - -# Removing password files -rm -fr "$targetFolder/login_keychain_password.txt" - diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/90-squish.sh b/coin/provisioning/qtci-macos-10.12-x86_64/90-squish.sh deleted file mode 100755 index 17a0c38e..00000000 --- a/coin/provisioning/qtci-macos-10.12-x86_64/90-squish.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash -set -ex - -BASEDIR=$(dirname "$0") -"$BASEDIR/../common/unix/squishInstall.sh" - diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/99-mac-version.sh b/coin/provisioning/qtci-macos-10.12-x86_64/99-mac-version.sh deleted file mode 100755 index 99d94150..00000000 --- a/coin/provisioning/qtci-macos-10.12-x86_64/99-mac-version.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -set -ex - -BASEDIR=$(dirname "$0") -$BASEDIR/../common/macos/macos-version.sh diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/01-disable-notifications_and_warnings.sh b/coin/provisioning/qtci-macos-10.13-x86_64/01-disable-notifications_and_warnings.sh new file mode 100755 index 00000000..27efbb62 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.13-x86_64/01-disable-notifications_and_warnings.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +"$(dirname "$0")"/../common/macos/disable-notifications_and_warnings.sh diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/01-increase_limits.sh b/coin/provisioning/qtci-macos-10.13-x86_64/01-increase_limits.sh new file mode 100755 index 00000000..08669e52 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.13-x86_64/01-increase_limits.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +"$(dirname "$0")"/../common/macos/increase_limits.sh diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/01-install_telegraf.sh b/coin/provisioning/qtci-macos-10.13-x86_64/01-install_telegraf.sh new file mode 100755 index 00000000..729f9003 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.13-x86_64/01-install_telegraf.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +"$(dirname "$0")"/../common/unix/telegraf_install.sh diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/25-homebrew.sh b/coin/provisioning/qtci-macos-10.13-x86_64/25-homebrew.sh index 06e984ec..f7f9e214 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/25-homebrew.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/25-homebrew.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -set -ex +set -e BASEDIR=$(dirname "$0") "$BASEDIR/../common/macos/homebrew.sh" diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/26-p7zip.sh b/coin/provisioning/qtci-macos-10.13-x86_64/26-p7zip.sh index 15511332..1138ad3f 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/26-p7zip.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/26-p7zip.sh @@ -3,5 +3,5 @@ set -ex -brew update + brew install p7zip 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.12-x86_64/25-cmake.sh b/coin/provisioning/qtci-macos-10.13-x86_64/27-libusb.sh index 4f4d405e..acc7ad4f 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/25-cmake.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/27-libusb.sh @@ -1,6 +1,7 @@ #!/usr/bin/env bash +# Install libusb set -ex BASEDIR=$(dirname "$0") -"$BASEDIR/../common/macos/cmake.sh" +"$BASEDIR/../common/macos/libusb.sh" diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh b/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh index 544364b0..bc123111 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh @@ -37,7 +37,7 @@ # It also runs update for SDK API, latest SDK tools, latest platform-tools and build-tools version -set -ex +set -e # shellcheck source=../common/unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" @@ -51,7 +51,7 @@ toolsVersion="r26.1.1" # toolsFile dertermines tools version toolsFile="sdk-tools-darwin-4333796.zip" -ndkVersion="r19c" +ndkVersion="r20" ndkFile="android-ndk-$ndkVersion-darwin-x86_64.zip" sdkBuildToolsVersion="28.0.3" # this is compile sdk version @@ -68,8 +68,16 @@ sudo unzip -q "$toolsSourceFile" -d "$sdkTargetFolder" echo "Changing ownership of Android files." sudo chown -R qt:wheel "$targetFolder" +# Stop the sdkmanager from printing thousands of lines of #hashmarks. +# Run the following command under `eval` or `sh -c` so that the shell properly splits it. +sdkmanager_no_progress_bar_cmd="tr '\r' '\n' | grep -v '^\[[ =]*\]'" +# But don't let the pipeline hide sdkmanager failures. +set -o pipefail + echo "Running SDK manager for platforms;$sdkApiLevel, platform-tools and build-tools;$sdkBuildToolsVersion." -(echo "y"; echo "y") |"$sdkTargetFolder/tools/bin/sdkmanager" "platforms;$sdkApiLevel" "platform-tools" "build-tools;$sdkBuildToolsVersion" +(echo "y"; echo "y") | "$sdkTargetFolder/tools/bin/sdkmanager" \ + "platforms;$sdkApiLevel" "platform-tools" "build-tools;$sdkBuildToolsVersion" \ + | eval $sdkmanager_no_progress_bar_cmd echo "Checking the contents of Android SDK..." ls -l "$sdkTargetFolder" diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/36-emsdk.sh b/coin/provisioning/qtci-macos-10.13-x86_64/36-emsdk.sh new file mode 100644 index 00000000..7396d336 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.13-x86_64/36-emsdk.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +set -ex + +# shellcheck source=../common/unix/emsdk.sh +source "${BASH_SOURCE%/*}/../common/unix/emsdk.sh" diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/40-qnx700.sh b/coin/provisioning/qtci-macos-10.13-x86_64/40-qnx700.sh index a5547972..7552c5ad 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/40-qnx700.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/40-qnx700.sh @@ -36,13 +36,13 @@ # This script installs QNX 7. targetFolder="/opt/" -sourceFile="/net/ci-files01-hki.intra.qt.io/hdd/www/input/qnx/qnx700_mac.zip" +sourceFile="/net/ci-files01-hki.intra.qt.io/hdd/www/input/qnx/qnx700-20190325-2-macos.tar.xz" folderName="qnx700" sudo mkdir -p "$targetFolder" echo "Extracting QNX 7" -sudo unzip -q "$sourceFile" -d "$targetFolder" +sudo tar -C "$targetFolder" -Jxf $sourceFile sudo chown -R qt:wheel "$targetFolder"/"$folderName" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/30-fbx.sh b/coin/provisioning/qtci-macos-10.13-x86_64/90-python-modules.sh index 34eefeb6..8a2cbf64 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/30-fbx.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/90-python-modules.sh @@ -3,5 +3,5 @@ set -ex BASEDIR=$(dirname "$0") -"$BASEDIR/../common/macos/fbx_macos.sh" +"$BASEDIR/../common/unix/python_modules.sh" diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/01-disable-notifications_and_warnings.sh b/coin/provisioning/qtci-macos-10.14-x86_64/01-disable-notifications_and_warnings.sh new file mode 100755 index 00000000..27efbb62 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.14-x86_64/01-disable-notifications_and_warnings.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +"$(dirname "$0")"/../common/macos/disable-notifications_and_warnings.sh diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/01-increase_limits.sh b/coin/provisioning/qtci-macos-10.14-x86_64/01-increase_limits.sh new file mode 100755 index 00000000..08669e52 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.14-x86_64/01-increase_limits.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +"$(dirname "$0")"/../common/macos/increase_limits.sh diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/01-install_telegraf.sh b/coin/provisioning/qtci-macos-10.14-x86_64/01-install_telegraf.sh new file mode 100755 index 00000000..729f9003 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.14-x86_64/01-install_telegraf.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +"$(dirname "$0")"/../common/unix/telegraf_install.sh diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/20-xcode.sh b/coin/provisioning/qtci-macos-10.14-x86_64/20-xcode.sh index 2ee4dedf..25a53374 100755 --- a/coin/provisioning/qtci-macos-10.14-x86_64/20-xcode.sh +++ b/coin/provisioning/qtci-macos-10.14-x86_64/20-xcode.sh @@ -50,4 +50,4 @@ set -ex # shellcheck source=../common/macos/install_xcode.sh source "${BASH_SOURCE%/*}/../common/macos/install_xcode.sh" -InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/macos_10.14_mojave/Xcode_10.2.1_update.tar.gz 10.2.1 +InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/macos_10.14_mojave/Xcode_11.3.tar.gz 11.3 diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/21-install-commandlinetools.sh b/coin/provisioning/qtci-macos-10.14-x86_64/21-install-commandlinetools.sh index 09055ee6..9d38eb10 100755 --- a/coin/provisioning/qtci-macos-10.14-x86_64/21-install-commandlinetools.sh +++ b/coin/provisioning/qtci-macos-10.14-x86_64/21-install-commandlinetools.sh @@ -37,11 +37,10 @@ set -ex # shellcheck source=../common/macos/install-commandlinetools.sh source "${BASH_SOURCE%/*}/../common/macos/install-commandlinetools.sh" - -version="10.2.1" -packageName="Command_Line_Tools_macOS_10.14_for_Xcode_$version.dmg" +version="11.3" +packageName="Command_Line_Tools_for_Xcode_$version.dmg" url="http://ci-files01-hki.intra.qt.io/input/mac/macos_10.14_mojave/$packageName" -sha1="18fea89bb743107aee372a212be608d6e35fdecf" +sha1="b42a0fdf69ac46de04812cd23f0eefa141371253" InstallCommandLineTools $url $url $sha1 $packageName $version diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/25-homebrew.sh b/coin/provisioning/qtci-macos-10.14-x86_64/25-homebrew.sh index 06e984ec..f7f9e214 100755 --- a/coin/provisioning/qtci-macos-10.14-x86_64/25-homebrew.sh +++ b/coin/provisioning/qtci-macos-10.14-x86_64/25-homebrew.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -set -ex +set -e BASEDIR=$(dirname "$0") "$BASEDIR/../common/macos/homebrew.sh" diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/30-android.sh b/coin/provisioning/qtci-macos-10.14-x86_64/30-android.sh index cc7974e6..aa0935f0 100755 --- a/coin/provisioning/qtci-macos-10.14-x86_64/30-android.sh +++ b/coin/provisioning/qtci-macos-10.14-x86_64/30-android.sh @@ -51,7 +51,7 @@ toolsVersion="r26.1.1" # toolsFile dertermines tools version toolsFile="sdk-tools-darwin-4333796.zip" -ndkVersion="r18b" +ndkVersion="r20" ndkFile="android-ndk-$ndkVersion-darwin-x86_64.zip" sdkBuildToolsVersion="28.0.3" # this is compile sdk version @@ -68,8 +68,13 @@ sudo unzip -q "$toolsSourceFile" -d "$sdkTargetFolder" echo "Changing ownership of Android files." sudo chown -R qt:wheel "$targetFolder" +# Run the following command under `eval` or `sh -c` so that the shell properly splits it +sdkmanager_no_progress_bar_cmd="tr '\r' '\n' | grep -v '^\[[ =]*\]'" + echo "Running SDK manager for platforms;$sdkApiLevel, platform-tools and build-tools;$sdkBuildToolsVersion." -(echo "y"; echo "y") |"$sdkTargetFolder/tools/bin/sdkmanager" "platforms;$sdkApiLevel" "platform-tools" "build-tools;$sdkBuildToolsVersion" +(echo "y"; echo "y") | "$sdkTargetFolder/tools/bin/sdkmanager" \ + "platforms;$sdkApiLevel" "platform-tools" "build-tools;$sdkBuildToolsVersion" \ + | eval $sdkmanager_no_progress_bar_cmd echo "Checking the contents of Android SDK..." ls -l "$sdkTargetFolder" diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/36-emsdk.sh b/coin/provisioning/qtci-macos-10.14-x86_64/36-emsdk.sh new file mode 100755 index 00000000..7396d336 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.14-x86_64/36-emsdk.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +set -ex + +# shellcheck source=../common/unix/emsdk.sh +source "${BASH_SOURCE%/*}/../common/unix/emsdk.sh" diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/40-qnx700.sh b/coin/provisioning/qtci-macos-10.14-x86_64/40-qnx700.sh index a5547972..7552c5ad 100755 --- a/coin/provisioning/qtci-macos-10.14-x86_64/40-qnx700.sh +++ b/coin/provisioning/qtci-macos-10.14-x86_64/40-qnx700.sh @@ -36,13 +36,13 @@ # This script installs QNX 7. targetFolder="/opt/" -sourceFile="/net/ci-files01-hki.intra.qt.io/hdd/www/input/qnx/qnx700_mac.zip" +sourceFile="/net/ci-files01-hki.intra.qt.io/hdd/www/input/qnx/qnx700-20190325-2-macos.tar.xz" folderName="qnx700" sudo mkdir -p "$targetFolder" echo "Extracting QNX 7" -sudo unzip -q "$sourceFile" -d "$targetFolder" +sudo tar -C "$targetFolder" -Jxf $sourceFile sudo chown -R qt:wheel "$targetFolder"/"$folderName" diff --git a/coin/provisioning/qtci-windows-10-x86/03-install-sevenzip.ps1 b/coin/provisioning/qtci-windows-10-x86/00-install-sevenzip.ps1 index a9044256..a9044256 100644 --- a/coin/provisioning/qtci-windows-10-x86/03-install-sevenzip.ps1 +++ b/coin/provisioning/qtci-windows-10-x86/00-install-sevenzip.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86/01-disable-notifications.ps1 b/coin/provisioning/qtci-windows-10-x86/01-disable-notifications.ps1 new file mode 100644 index 00000000..ada20147 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/01-disable-notifications.ps1 @@ -0,0 +1,9 @@ +# Windows 'Notifications & actions' +# Disable 'Get notifications from apps and other senders' +reg.exe ADD "HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\PushNotifications" /V ToastEnabled /T REG_dWORD /D 0 /F + +# Disable 'Show me the Windows welcome experience after udpates and occasionally when I sign in to highlight what's new and suggested' +reg.exe ADD "HKEY_CURRENT_USER\SOFTWARE\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" /V SubscribedContent-310093Enabled /T REG_dWORD /D 0 /F + +# Disable 'Get tips, tricks and suggestions as you use Windows' +reg.exe ADD "HKEY_CURRENT_USER\SOFTWARE\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" /V SubscribedContent-338389Enabled /T REG_dWORD /D 0 /F diff --git a/coin/provisioning/qtci-windows-10-x86/01-disable-windows-telemetry.ps1 b/coin/provisioning/qtci-windows-10-x86/01-disable-windows-telemetry.ps1 new file mode 100644 index 00000000..3f5a75f4 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/01-disable-windows-telemetry.ps1 @@ -0,0 +1,7 @@ +# Disable Connected User Experiences and Telemetry service +# The Connected User Experiences and Telemetry service enables features that support in-application and connected user experiences. +# Additionally, this service manages the event driven collection and transmission of diagnostic and usage information +# (used to improve the experience and quality of the Windows Platform) when the diagnostics and usage privacy option settings are enabled under Feedback and Diagnostics. +reg.exe ADD "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\Data Collection" /V AllowTelemetry /T REG_dWORD /D 0 /F +stop-service diagtrack +set-service diagtrack -startuptype disabled diff --git a/coin/provisioning/qtci-windows-10-x86/01-install_telegraf.ps1 b/coin/provisioning/qtci-windows-10-x86/01-install_telegraf.ps1 new file mode 100644 index 00000000..77fa8cbf --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/01-install_telegraf.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\install_telegraf.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86/02-disable-defragment.ps1 b/coin/provisioning/qtci-windows-10-x86/02-disable-defragment.ps1 deleted file mode 100644 index 10518401..00000000 --- a/coin/provisioning/qtci-windows-10-x86/02-disable-defragment.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\disable-defragment.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86/02-disable-ntp.ps1 b/coin/provisioning/qtci-windows-10-x86/02-disable-ntp.ps1 deleted file mode 100644 index ee3b3b7d..00000000 --- a/coin/provisioning/qtci-windows-10-x86/02-disable-ntp.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\disable-ntp.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86/04-disable-windows-updates.ps1 b/coin/provisioning/qtci-windows-10-x86/04-disable-windows-updates.ps1 deleted file mode 100644 index 57428310..00000000 --- a/coin/provisioning/qtci-windows-10-x86/04-disable-windows-updates.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\disable-windows-updates.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86/08-install-git.ps1 b/coin/provisioning/qtci-windows-10-x86/08-install-git.ps1 new file mode 100644 index 00000000..38106de7 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/08-install-git.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\install-git.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86/99-version.ps1 b/coin/provisioning/qtci-windows-10-x86/99-version.ps1 new file mode 100644 index 00000000..36e498bc --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/99-version.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\version.ps1" 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/03-install-sevenzip.ps1 b/coin/provisioning/qtci-windows-10-x86_64/00-install-sevenzip.ps1 index a9044256..a9044256 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/03-install-sevenzip.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/00-install-sevenzip.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86_64/01-disable-notifications.ps1 b/coin/provisioning/qtci-windows-10-x86_64/01-disable-notifications.ps1 new file mode 100644 index 00000000..ada20147 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/01-disable-notifications.ps1 @@ -0,0 +1,9 @@ +# Windows 'Notifications & actions' +# Disable 'Get notifications from apps and other senders' +reg.exe ADD "HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\PushNotifications" /V ToastEnabled /T REG_dWORD /D 0 /F + +# Disable 'Show me the Windows welcome experience after udpates and occasionally when I sign in to highlight what's new and suggested' +reg.exe ADD "HKEY_CURRENT_USER\SOFTWARE\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" /V SubscribedContent-310093Enabled /T REG_dWORD /D 0 /F + +# Disable 'Get tips, tricks and suggestions as you use Windows' +reg.exe ADD "HKEY_CURRENT_USER\SOFTWARE\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" /V SubscribedContent-338389Enabled /T REG_dWORD /D 0 /F diff --git a/coin/provisioning/qtci-windows-10-x86_64/01-disable-windows-telemetry.ps1 b/coin/provisioning/qtci-windows-10-x86_64/01-disable-windows-telemetry.ps1 new file mode 100644 index 00000000..3f5a75f4 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/01-disable-windows-telemetry.ps1 @@ -0,0 +1,7 @@ +# Disable Connected User Experiences and Telemetry service +# The Connected User Experiences and Telemetry service enables features that support in-application and connected user experiences. +# Additionally, this service manages the event driven collection and transmission of diagnostic and usage information +# (used to improve the experience and quality of the Windows Platform) when the diagnostics and usage privacy option settings are enabled under Feedback and Diagnostics. +reg.exe ADD "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\Data Collection" /V AllowTelemetry /T REG_dWORD /D 0 /F +stop-service diagtrack +set-service diagtrack -startuptype disabled diff --git a/coin/provisioning/qtci-windows-10-x86_64/01-install_telegraf.ps1 b/coin/provisioning/qtci-windows-10-x86_64/01-install_telegraf.ps1 new file mode 100644 index 00000000..77fa8cbf --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/01-install_telegraf.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\install_telegraf.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/01-remove-ms-zune.ps1 b/coin/provisioning/qtci-windows-10-x86_64/01-remove-ms-zune.ps1 deleted file mode 100644 index 6a398725..00000000 --- a/coin/provisioning/qtci-windows-10-x86_64/01-remove-ms-zune.ps1 +++ /dev/null @@ -1,2 +0,0 @@ -Remove-AppxPackage Microsoft.ZuneVideo_10.17092.13511.0_x64__8wekyb3d8bbwe -Remove-AppxPackage Microsoft.ZuneMusic_10.17083.18321.0_x64__8wekyb3d8bbwe diff --git a/coin/provisioning/qtci-windows-10-x86_64/02-disable-defragment.ps1 b/coin/provisioning/qtci-windows-10-x86_64/02-disable-defragment.ps1 deleted file mode 100644 index 10518401..00000000 --- a/coin/provisioning/qtci-windows-10-x86_64/02-disable-defragment.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\disable-defragment.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/02-disable-ntp.ps1 b/coin/provisioning/qtci-windows-10-x86_64/02-disable-ntp.ps1 deleted file mode 100644 index ee3b3b7d..00000000 --- a/coin/provisioning/qtci-windows-10-x86_64/02-disable-ntp.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\disable-ntp.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/04-disable-windows-updates.ps1 b/coin/provisioning/qtci-windows-10-x86_64/04-disable-windows-updates.ps1 deleted file mode 100644 index 57428310..00000000 --- a/coin/provisioning/qtci-windows-10-x86_64/04-disable-windows-updates.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\disable-windows-updates.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/05-msvc.ps1 b/coin/provisioning/qtci-windows-10-x86_64/05-msvc.ps1 index d019fc92..72ac1ca7 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/05-msvc.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/05-msvc.ps1 @@ -34,10 +34,10 @@ # Visual Studios are pre-provisioned to tier1 images # MSVC 2015 Update 3 -Write-Output "Visual Studio 2015 = Version 14.0.25421.3 Update 3" >> ~\versions.txt +Write-Output "Visual Studio 2015 = Version 14.0.25431.01 Update 3" >> ~\versions.txt # MSVC 2017 -Write-Output "Visual Studio 2017 = Version 15.1 (26403.7)" >> ~\versions.txt +Write-Output "Visual Studio 2017 = Version 15.8.5" >> ~\versions.txt # MSVC 2017 Build Tools Write-Output "Visual Studio 2017 Build Tools = Version 15.1 (26403.7)" >> ~\versions.txt diff --git a/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 b/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 index 74c8dc6b..49b71837 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 @@ -36,10 +36,10 @@ # This script installs QNX SDP 7.0 $zip = Get-DownloadLocation "qnx700.7z" -$url = "http://ci-files01-hki.intra.qt.io/input/windows/qnx700-20180801-windows.7z" +$url = "http://ci-files01-hki.intra.qt.io/input/qnx/qnx700-20190325-2-windows.7z" Download $url $url $zip -Verify-Checksum $zip "E281897C957B5FAB249BABB2DEB77EEBB9BA75E6" +Verify-Checksum $zip "1f10e9660efc81b18cb897871ba2b0384cf0fc6d" Extract-7Zip $zip C:\ Set-EnvironmentVariable "QNX_700" "C:\QNX700" 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-10-x86_64/11-conan.ps1 b/coin/provisioning/qtci-windows-10-x86_64/11-conan.ps1 index a651bb0c..71abc7e1 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/11-conan.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/11-conan.ps1 @@ -34,6 +34,22 @@ Run-Conan-Install ` Run-Conan-Install ` -ConanfilesDir "$PSScriptRoot\conanfiles" ` + -BuildinfoDir MSVC2019-x86_64 ` + -Arch x86_64 ` + -Compiler "Visual Studio" ` + -CompilerVersion 16 ` + -CompilerRuntime MD + +Run-Conan-Install ` + -ConanfilesDir "$PSScriptRoot\conanfiles" ` + -BuildinfoDir MSVC2019-x86 ` + -Arch x86 ` + -Compiler "Visual Studio" ` + -CompilerVersion 16 ` + -CompilerRuntime MD + +Run-Conan-Install ` + -ConanfilesDir "$PSScriptRoot\conanfiles" ` -BuildinfoDir Mingw73-x86 ` -Arch x86 ` -Compiler "gcc" ` diff --git a/coin/provisioning/qtci-windows-10-x86_64/80-emsdk.ps1 b/coin/provisioning/qtci-windows-10-x86_64/80-emsdk.ps1 new file mode 100755 index 00000000..b72470a2 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/80-emsdk.ps1 @@ -0,0 +1,2 @@ +. "$PSScriptRoot\..\common\windows\emsdk.ps1" + diff --git a/coin/provisioning/qtci-windows-10-x86_64/90-python-modules.ps1 b/coin/provisioning/qtci-windows-10-x86_64/90-python-modules.ps1 new file mode 100644 index 00000000..3646d826 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/90-python-modules.ps1 @@ -0,0 +1,3 @@ +# Needed by packaging scripts +C:\Python36\Scripts\pip3 install bs4 +C:\Python36\Scripts\pip3 install sh diff --git a/coin/provisioning/qtci-windows-10-x86_64/98-disable-file-protector.ps1 b/coin/provisioning/qtci-windows-10-x86_64/98-disable-file-protector.ps1 deleted file mode 100644 index 79802f24..00000000 --- a/coin/provisioning/qtci-windows-10-x86_64/98-disable-file-protector.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\disable-windows-file-protector.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/98-disable-schedule-tasks.ps1 b/coin/provisioning/qtci-windows-10-x86_64/98-disable-schedule-tasks.ps1 deleted file mode 100644 index 9134a735..00000000 --- a/coin/provisioning/qtci-windows-10-x86_64/98-disable-schedule-tasks.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\disable-schedule-tasks.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/98-disable-update-orchestrator.ps1 b/coin/provisioning/qtci-windows-10-x86_64/98-disable-update-orchestrator.ps1 deleted file mode 100644 index 67dcce60..00000000 --- a/coin/provisioning/qtci-windows-10-x86_64/98-disable-update-orchestrator.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\disable-update-orchestrator.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/98-disable-windows-update-assessment.ps1 b/coin/provisioning/qtci-windows-10-x86_64/98-disable-windows-update-assessment.ps1 deleted file mode 100644 index e54081fd..00000000 --- a/coin/provisioning/qtci-windows-10-x86_64/98-disable-windows-update-assessment.ps1 +++ /dev/null @@ -1,2 +0,0 @@ -. "$PSScriptRoot\..\common\windows\disable-windows-update-assessment.ps1" - diff --git a/coin/provisioning/qtci-windows-10-x86_64/99-version.ps1 b/coin/provisioning/qtci-windows-10-x86_64/99-version.ps1 new file mode 100644 index 00000000..36e498bc --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/99-version.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\version.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86/04-disable-windefender.ps1 b/coin/provisioning/qtci-windows-7-x86/00-disable-windefender.ps1 index 8f94b3d5..8f94b3d5 100644 --- a/coin/provisioning/qtci-windows-10-x86/04-disable-windefender.ps1 +++ b/coin/provisioning/qtci-windows-7-x86/00-disable-windefender.ps1 diff --git a/coin/provisioning/qtci-windows-7-x86/03-install-sevenzip.ps1 b/coin/provisioning/qtci-windows-7-x86/00-install-sevenzip.ps1 index a9044256..a9044256 100644 --- a/coin/provisioning/qtci-windows-7-x86/03-install-sevenzip.ps1 +++ b/coin/provisioning/qtci-windows-7-x86/00-install-sevenzip.ps1 diff --git a/coin/provisioning/qtci-windows-7-x86/01-install_telegraf.ps1 b/coin/provisioning/qtci-windows-7-x86/01-install_telegraf.ps1 new file mode 100644 index 00000000..77fa8cbf --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86/01-install_telegraf.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\install_telegraf.ps1" 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/coin/provisioning/qtci-windows-7-x86/99-version.ps1 b/coin/provisioning/qtci-windows-7-x86/99-version.ps1 new file mode 100644 index 00000000..36e498bc --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86/99-version.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\version.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/01-disable-windefender.ps1 b/coin/provisioning/qtci-windows-7-x86_64/00-disable-windefender.ps1 index 8f94b3d5..8f94b3d5 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/01-disable-windefender.ps1 +++ b/coin/provisioning/qtci-windows-7-x86_64/00-disable-windefender.ps1 diff --git a/coin/provisioning/qtci-windows-7-x86_64/03-install-sevenzip.ps1 b/coin/provisioning/qtci-windows-7-x86_64/00-install-sevenzip.ps1 index a9044256..a9044256 100644 --- a/coin/provisioning/qtci-windows-7-x86_64/03-install-sevenzip.ps1 +++ b/coin/provisioning/qtci-windows-7-x86_64/00-install-sevenzip.ps1 diff --git a/coin/provisioning/qtci-windows-7-x86_64/01-install_telegraf.ps1 b/coin/provisioning/qtci-windows-7-x86_64/01-install_telegraf.ps1 new file mode 100644 index 00000000..77fa8cbf --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86_64/01-install_telegraf.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\install_telegraf.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86_64/99-version.ps1 b/coin/provisioning/qtci-windows-7-x86_64/99-version.ps1 new file mode 100644 index 00000000..36e498bc --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86_64/99-version.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\version.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86/04-disable-windefender.ps1 b/coin/provisioning/qtci-windows-8.1-x86/00-disable-windefender.ps1 index 8f94b3d5..8f94b3d5 100644 --- a/coin/provisioning/qtci-windows-7-x86/04-disable-windefender.ps1 +++ b/coin/provisioning/qtci-windows-8.1-x86/00-disable-windefender.ps1 diff --git a/coin/provisioning/qtci-windows-8.1-x86/03-install-sevenzip.ps1 b/coin/provisioning/qtci-windows-8.1-x86/00-install-sevenzip.ps1 index a9044256..a9044256 100644 --- a/coin/provisioning/qtci-windows-8.1-x86/03-install-sevenzip.ps1 +++ b/coin/provisioning/qtci-windows-8.1-x86/00-install-sevenzip.ps1 diff --git a/coin/provisioning/qtci-windows-8.1-x86/01-install_telegraf.ps1 b/coin/provisioning/qtci-windows-8.1-x86/01-install_telegraf.ps1 new file mode 100644 index 00000000..77fa8cbf --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86/01-install_telegraf.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\install_telegraf.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/04-disable-windefender.ps1 b/coin/provisioning/qtci-windows-8.1-x86/04-disable-windefender.ps1 deleted file mode 100644 index 8f94b3d5..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86/04-disable-windefender.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\disable-windefender.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/99-version.ps1 b/coin/provisioning/qtci-windows-8.1-x86/99-version.ps1 new file mode 100644 index 00000000..36e498bc --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86/99-version.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\version.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86_64/04-disable-windefender.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/00-disable-windefender.ps1 index 8f94b3d5..8f94b3d5 100644 --- a/coin/provisioning/qtci-windows-7-x86_64/04-disable-windefender.ps1 +++ b/coin/provisioning/qtci-windows-8.1-x86_64/00-disable-windefender.ps1 diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/03-install-sevenzip.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/00-install-sevenzip.ps1 index a9044256..a9044256 100644 --- a/coin/provisioning/qtci-windows-8.1-x86_64/03-install-sevenzip.ps1 +++ b/coin/provisioning/qtci-windows-8.1-x86_64/00-install-sevenzip.ps1 diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/01-install_telegraf.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/01-install_telegraf.ps1 new file mode 100644 index 00000000..77fa8cbf --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86_64/01-install_telegraf.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\install_telegraf.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/04-disable-windefender.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/04-disable-windefender.ps1 deleted file mode 100644 index 8f94b3d5..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86_64/04-disable-windefender.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\disable-windefender.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/99-version.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/99-version.ps1 new file mode 100644 index 00000000..36e498bc --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86_64/99-version.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\version.ps1" diff --git a/qt3d b/qt3d -Subproject f965d4712a97b69b2d4b43178f8e523668d97a8 +Subproject 5e16aa067ac6a8b5f031ffcefc356777a0da34a diff --git a/qtactiveqt b/qtactiveqt -Subproject ad555db81de1568276b6bb0531cc435d0f9b9aa +Subproject 0aa2b1ac1d51d7af60a61d5c3a48fc6905cb1b1 diff --git a/qtandroidextras b/qtandroidextras -Subproject 083ab46f4a3e2b80737a2f413ef6130099e37fe +Subproject 455cddd68ff84ba54509bf7676f9b02bddb7d21 diff --git a/qtbase b/qtbase -Subproject 08d6cb7673aa51bc0532d71db4134f4912e1476 +Subproject ba3b53cb501a77144aa6259e48a8e0edc3d1481 diff --git a/qtcanvas3d b/qtcanvas3d -Subproject abab2cc31b49d78d40cd52d4ac3bf3251039052 +Subproject 1319e0965f6008f44f9216a7bb76e106a171076 diff --git a/qtcharts b/qtcharts -Subproject 76cf047c29a9ae80f712906257f93a0e447bca4 +Subproject 785a8d7118c4dd6117dd085bbe2da6e4bc71765 diff --git a/qtconnectivity b/qtconnectivity -Subproject a526644f2f2c7359cbe7d50bea09ded3e6c65e4 +Subproject eb908370e0c8212cf81f080f4bdbf663273b806 diff --git a/qtdatavis3d b/qtdatavis3d -Subproject 6c6a7eb15b490e59119b7262337dd2c6b8eb65e +Subproject d15ace0300d035283a7137e3a6e9a412ff53d01 diff --git a/qtdeclarative b/qtdeclarative -Subproject 101799f8acdbfc4ebd05f37a7c09544d24b41af +Subproject 5a3d9309ec018445a3471d40366f41ee2f6ebef diff --git a/qtdoc b/qtdoc -Subproject 666831a863ba96c4a7401615968e109bddc6f09 +Subproject c09aafd6359c51d20c0504395bafc544a38b59a diff --git a/qtgamepad b/qtgamepad -Subproject a047498b16dc6c7abfdd1da5a0385e093b4520c +Subproject b036b587216d89a0bf27f4e11ae4f453e8cce76 diff --git a/qtgraphicaleffects b/qtgraphicaleffects -Subproject 4cab303c83f034cc926e32ec80dae03855a3ab2 +Subproject 18f17fed89e1fd381ba9c3bf9a7b64d88cb62ad diff --git a/qtimageformats b/qtimageformats -Subproject 6c75b54d3350161efb218bd357ff07bc61a421c +Subproject b26e5fbf4c50b70ec773a0265c27bb3b262c71e diff --git a/qtlocation b/qtlocation -Subproject 8a7d656a77138a276d4079f54b888d049097ffc +Subproject b2d0a90961089057acf199119afa8235e9e926b diff --git a/qtlottie b/qtlottie new file mode 160000 +Subproject eeac38075b17ae74821e9976d3dd37346a4f822 diff --git a/qtmacextras b/qtmacextras -Subproject 14c9ce986a1de189aa2cfc71b6102efea0fba5a +Subproject 52e2485ef1a10e6974f9603df414a4d64966924 diff --git a/qtmultimedia b/qtmultimedia -Subproject 194b584ca1381ab5c5bdebfb455901cf2b0bad6 +Subproject 83f0038fa7fd090840fdd19fd30652bd7bbb6fd diff --git a/qtnetworkauth b/qtnetworkauth -Subproject a282f5d49362a63d9637c69768b8283c5f85e0b +Subproject 8e6e45b990a0ad9bc0d43f1f5387d34a212441b diff --git a/qtpurchasing b/qtpurchasing -Subproject 2191ec56a32cd1c1d6e49e54c5974562ebf3707 +Subproject 231e7e55e9bb8a70bbb2c43ed3e92804ff5577b diff --git a/qtqa b/qtqa -Subproject af377a33104ccaed85e15f8cc0069c6d35269ca +Subproject 62e2b16e1788fe4d5ea47480b130074a7eb38ae diff --git a/qtquick3d b/qtquick3d new file mode 160000 +Subproject c9073f11ba540353aa5e3a6f8653569daf9ed60 diff --git a/qtquickcontrols b/qtquickcontrols -Subproject 4687a1dbef006cbffe014b50c4bbd0edf912334 +Subproject c9b0270985a64c9682ddf304d18a18dfb18c894 diff --git a/qtquickcontrols2 b/qtquickcontrols2 -Subproject 3c7be4a9911ede96613ffa30f83e1fa5c3d173d +Subproject e2768b6d054c62c21a343fe25557d3ff9e45d1d diff --git a/qtquicktimeline b/qtquicktimeline new file mode 160000 +Subproject e40206c703c57f3c98263a7481597dfced5db6c diff --git a/qtremoteobjects b/qtremoteobjects -Subproject e978116774163e6f6f36cbe62be2d9ad797ce9d +Subproject f68928c439fac00b27e85c9ae3f7e3ec0dca222 diff --git a/qtrepotools b/qtrepotools -Subproject fbe6d232ba331f08c154465da64a2d256077442 +Subproject 062a16545b7c870e392ad9e6f0ce7976659d259 diff --git a/qtscript b/qtscript -Subproject 98e65d35112183bb608f14b3166637ada48c041 +Subproject ebd4605c712941030edac8f5b7c32971e9541f7 diff --git a/qtscxml b/qtscxml -Subproject 5b97c163b3206aca5da15e8296529734d9c0021 +Subproject e72ad1f088d054678b7d70133fe702d91ae6b36 diff --git a/qtsensors b/qtsensors -Subproject 37fa5756b09afad4ad6323293a51a52cbaa5a48 +Subproject b084dc36e39d74e1e1039ecfac345c9b54964f4 diff --git a/qtserialbus b/qtserialbus -Subproject 4a47ea4e53e4e245d8fbced7b1b91bde04d564d +Subproject b12bc31046b29d67a59ab6b28cbc61e03dea071 diff --git a/qtserialport b/qtserialport -Subproject c9fd06130537d751edc36a377f7a9a842585167 +Subproject 1c736fefa6dd8868610ff9ae59cd7552f1c7a89 diff --git a/qtspeech b/qtspeech -Subproject 1cd9809cdeefb97b2dceee55a1a7b0ed3de6f66 +Subproject d9dbe04ce445b93c36ccfab4b5145d41cd4a58f diff --git a/qtsvg b/qtsvg -Subproject 91a4369b99a551779ced748cdb6eb67f6c6f7ac +Subproject e12485f69e12fc382174a8d081fcb88c3567a4d diff --git a/qttools b/qttools -Subproject 64280d563ed9dd7f61786eb3d07a368b22828aa +Subproject 94e861104a1d689dfd12018e7be377699ab2491 diff --git a/qttranslations b/qttranslations -Subproject 74d8329bf6bbda2b925dd8bfc816b0577254526 +Subproject b0be8ca652f732439e562f75be372730e245204 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard -Subproject 0c71f71a28d61ba376ac2241c082f8ca2262fe4 +Subproject 4286d326885d629421c6d5511db8f9f619cc83f diff --git a/qtwayland b/qtwayland -Subproject 27c3046fd9caf7d654b81cc7c8fb1d9423377bb +Subproject efc94a48526baf92b8a78916e03e1fef5993fa9 diff --git a/qtwebchannel b/qtwebchannel -Subproject bf986e4111ed03bd157e868d33dd8f1e6fab2d0 +Subproject bb144ebca2ea2fda8f2ee75e233979e6df2d37c diff --git a/qtwebengine b/qtwebengine -Subproject 175b8129d1b0e6d9372de8ce9e1b45ab49fef33 +Subproject 387fb9377d61683bcd0f59a637afffdd9a16912 diff --git a/qtwebglplugin b/qtwebglplugin -Subproject 07074154be0733ca678d0ce684e8f0cfd492546 +Subproject f1327aa34c68b1536247c37925a3cbb255f6f27 diff --git a/qtwebsockets b/qtwebsockets -Subproject 051a396183f7313d15ad444f9ece4b96fb8995d +Subproject 6efa2ea5fd6eb35fd07b97f643d1e8e376f2eda diff --git a/qtwebview b/qtwebview -Subproject 30edb647a64542c0f4432bd3909e3b6ae5ddcd5 +Subproject d2e2dbeaf681a5a1b79808e1ed982ae6e4563ae diff --git a/qtwinextras b/qtwinextras -Subproject c787811c72fcf552ab47b4507462214bbd965fa +Subproject 41f8d34efdf0113e774914db8e63d9e880f8264 diff --git a/qtx11extras b/qtx11extras -Subproject 40b30b47188c20c6b64e6d0fe29f82a65383678 +Subproject 306a2b20a8792079faf6dae864161f1b5cc6646 diff --git a/qtxmlpatterns b/qtxmlpatterns -Subproject 9a88ab0974c7beaadacc1865f53ea526049c622 +Subproject af8b0cfdc85d593eb63eb9fe4d61b61ba6382e9 |