diff options
Diffstat (limited to 'coin')
101 files changed, 1012 insertions, 511 deletions
diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index 296fdf52..4a3d06aa 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -1,7 +1,7 @@ Version: 2 Configurations: - - Template: 'qtci-windows-10-x86_64-17' + Template: 'qtci-windows-10-x86_64-52' Compiler: 'MSVC2015' Features: ['DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -developer-build -release -angle -qtnamespace TestNamespace -qtlibinfix TestInfix -nomake tests -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -qt-zlib' @@ -11,32 +11,32 @@ Configurations: 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-17' + Template: 'qtci-windows-10-x86_64-52' Target arch: 'x86' 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% -qt-zlib' - - Template: 'qtci-windows-10-x86_64-17' + Template: 'qtci-windows-10-x86_64-52' Compiler: 'MSVC2015' Features: ['Packaging', 'DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -qt-zlib' - - Template: 'qtci-windows-10-x86_64-17' + Template: 'qtci-windows-10-x86_64-52' 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-17' + Template: 'qtci-windows-10-x86_64-52' 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-17' + Template: 'qtci-windows-10-x86_64-52' 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% -qt-zlib' @@ -51,6 +51,11 @@ Configurations: - Template: 'qtci-linux-Ubuntu-18.04-x86_64' Compiler: 'GCC' + Features: ['DisableTests'] + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -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: ['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' @@ -73,7 +78,7 @@ Configurations: - Template: 'qtci-linux-SLES-15-x86_64' Compiler: 'GCC' - Features: ['DisableTests'] + Features: ['Insignificant'] 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.6-x86_64' @@ -81,7 +86,7 @@ Configurations: Features: ['Packaging'] Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -force-debug-info -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' + Template: 'qtci-macos-10.13-x86_64-3' Compiler: 'Clang' Features: ['Packaging'] 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' @@ -108,7 +113,7 @@ Configurations: Compiler: 'Clang' Target compiler: 'Clang' Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-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' + 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 -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' diff --git a/coin/platform_configs/flashing-wizard.yaml b/coin/platform_configs/flashing-wizard.yaml index eff6e9f6..25e71ccf 100644 --- a/coin/platform_configs/flashing-wizard.yaml +++ b/coin/platform_configs/flashing-wizard.yaml @@ -2,12 +2,12 @@ Version: 2 Module only: True Configurations: - - Template: 'qtci-windows-10-x86_64-17' + Template: 'qtci-windows-10-x86_64-52' 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' + Template: 'qtci-windows-10-x86_64-52' Compiler: 'MSVC2019' Target arch: 'x86' Features: ['Packaging'] diff --git a/coin/platform_configs/qdb.yaml b/coin/platform_configs/qdb.yaml index 544a1b90..0b16b11a 100644 --- a/coin/platform_configs/qdb.yaml +++ b/coin/platform_configs/qdb.yaml @@ -2,13 +2,13 @@ Version: 2 Module only: True Configurations: - - Template: 'qtci-windows-10-x86_64-17' + Template: 'qtci-windows-10-x86_64-52' 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' + Template: 'qtci-windows-10-x86_64-52' Compiler: 'MSVC2015' Features: ['Packaging'] Configure arguments: '-opensource -confirm-license -nomake tests -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -opengl dynamic -static -no-icu -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64%' @@ -18,7 +18,7 @@ Configurations: Features: ['Packaging'] Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -force-debug-info -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -qt-xcb -sysconfdir /etc/xdg -qt-pcre -qt-harfbuzz -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib QMAKE_LFLAGS_APP+=-s -static -no-icu' - - Template: 'qtci-macos-10.13-x86_64-2' + Template: 'qtci-macos-10.13-x86_64-3' 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' diff --git a/coin/platform_configs/qt5.yaml b/coin/platform_configs/qt5.yaml index e467497f..fe4e5b96 100644 --- a/coin/platform_configs/qt5.yaml +++ b/coin/platform_configs/qt5.yaml @@ -1,13 +1,13 @@ Version: 2 Configurations: - - Template: 'qtci-windows-10-x86_64-17' + Template: 'qtci-windows-10-x86_64-52' 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-17' + Template: 'qtci-windows-10-x86_64-52' Target os: 'WinRT_10' Target arch: 'x86' Compiler: 'MSVC2019' @@ -17,29 +17,29 @@ Configurations: Template: 'qtci-windows-7-x86-3' Compiler: 'Mingw' Environment variables: ['PATH=C:\MINGW810_i686\mingw32\bin;$PATH'] - Features: ['Packaging', 'DisableTests'] + Features: ['Packaging'] 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-17' + Template: 'qtci-windows-10-x86_64-52' Compiler: 'Mingw' Environment variables: ['PATH=C:\MINGW810\mingw64\bin;$PATH'] - Features: ['Packaging', 'DisableTests'] + Features: ['Packaging'] 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-17' + Template: 'qtci-windows-10-x86_64-52' Target os: 'WinRT_10' Target arch: 'armv7' 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-msvc2019 -xplatform winrt-arm-msvc2019' - - Template: 'qtci-windows-10-x86_64-17' + Template: 'qtci-windows-10-x86_64-52' Target os: 'WinRT_10' 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-msvc2019 -xplatform winrt-x64-msvc2019' - - Template: 'qtci-windows-10-x86_64-17' + Template: 'qtci-windows-10-x86_64-52' Target os: 'Android_ANY' Target arch: 'multi' Compiler: 'Mingw' @@ -48,7 +48,7 @@ Configurations: Features: ['Packaging', 'DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -opengl es2 -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r20' - - Template: 'qtci-macos-10.13-x86_64-2' + Template: 'qtci-macos-10.13-x86_64-3' Target os: 'Android_ANY' Target arch: 'multi' Compiler: 'Clang' @@ -56,14 +56,14 @@ Configurations: Features: ['Packaging', 'DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r20 -android-ndk-host darwin-x86_64' - - Template: 'qtci-macos-10.13-x86_64-2' + Template: 'qtci-macos-10.13-x86_64-3' Target os: 'QNX_700' Target arch: 'x86' Compiler: 'GCC' Features: ['DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -extprefix /Users/qt/work/install -release -nomake tests -nomake examples -no-use-gold-linker -opengl es2 -qpa qnx -xplatform qnx-x86-qcc -I /opt/qnx700/target/qnx7/usr/include/openssl1_1' - - Template: 'qtci-windows-10-x86_64-17' + Template: 'qtci-windows-10-x86_64-52' Target os: 'QNX_700' Target arch: 'armv7' Compiler: 'Mingw' @@ -71,7 +71,7 @@ Configurations: Features: ['Packaging', 'DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -extprefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -opengl es2 -xplatform qnx-armle-v7-qcc -Ic:\qnx700\target\qnx7\usr\include\openssl1_1' - - Template: 'qtci-windows-10-x86_64-17' + Template: 'qtci-windows-10-x86_64-52' Target os: 'QNX_700' Target arch: 'armv8' Compiler: 'Mingw' @@ -79,7 +79,7 @@ Configurations: Features: ['Packaging', 'DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -extprefix c:\Users\qt\work\install -release -opengl es2 -nomake tests -nomake examples -no-sql-mysql -xplatform qnx-aarch64le-qcc -Ic:\qnx700\target\qnx7\usr\include\openssl1_1' - - Template: 'qtci-windows-10-x86_64-17' + Template: 'qtci-windows-10-x86_64-52' Target os: 'QNX_700' Target arch: 'x86_64' Compiler: 'Mingw' @@ -101,14 +101,14 @@ Configurations: Features: ['Packaging', 'DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -extprefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-use-gold-linker -opengl es2 -qpa qnx -xplatform qnx-x86-64-qcc -I /opt/qnx700/target/qnx7/usr/include/openssl1_1' - - Template: 'qtci-windows-10-x86_64-17' + Template: 'qtci-windows-10-x86_64-52' 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' + Template: 'qtci-macos-10.13-x86_64-3' Target os: 'WebAssembly' Compiler: 'Clang' Features: ['Packaging', 'DisableTests'] diff --git a/coin/platform_configs/qtbase.yaml b/coin/platform_configs/qtbase.yaml index a520e6ca..8ad2a8b1 100644 --- a/coin/platform_configs/qtbase.yaml +++ b/coin/platform_configs/qtbase.yaml @@ -13,7 +13,7 @@ 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-17' + Template: 'qtci-windows-10-x86_64-52' Target os: 'WinRT_10' Target arch: 'x86_64' Compiler: 'MSVC2015' diff --git a/coin/platform_configs/qtconnectivity.yaml b/coin/platform_configs/qtconnectivity.yaml index 6c232f2a..5e2d5c7e 100644 --- a/coin/platform_configs/qtconnectivity.yaml +++ b/coin/platform_configs/qtconnectivity.yaml @@ -1,5 +1,5 @@ - - Template: 'qtci-windows-10-x86_64-17' + Template: 'qtci-windows-10-x86_64-52' Target os: 'WinRT_10' Target arch: 'x86_64' Compiler: 'MSVC2015' diff --git a/coin/platform_configs/qtsaferenderer.yaml b/coin/platform_configs/qtsaferenderer.yaml index 246925fb..e9c2be74 100644 --- a/coin/platform_configs/qtsaferenderer.yaml +++ b/coin/platform_configs/qtsaferenderer.yaml @@ -1,12 +1,12 @@ Version: 2 Configurations: - - Template: 'qtci-windows-10-x86_64-17' + Template: 'qtci-windows-10-x86_64-52' 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-17' + Template: 'qtci-windows-10-x86_64-52' Compiler: 'Mingw' Environment variables: ['PATH=C:\MINGW810\mingw64\bin;$PATH'] Features: ['Packaging', 'DisableTests'] diff --git a/coin/platform_configs/tqtc-qt-config-gui.yaml b/coin/platform_configs/tqtc-qt-config-gui.yaml index ad35fc2c..073ef562 100644 --- a/coin/platform_configs/tqtc-qt-config-gui.yaml +++ b/coin/platform_configs/tqtc-qt-config-gui.yaml @@ -2,12 +2,12 @@ Version: 2 Module only: True Configurations: - - Template: 'qtci-windows-10-x86_64-17' + Template: 'qtci-windows-10-x86_64-52' 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' + Template: 'qtci-windows-10-x86_64-52' Compiler: 'MSVC2019' Target arch: 'x86' Features: ['Packaging'] @@ -18,7 +18,7 @@ Configurations: Features: ['Packaging'] Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -force-debug-info -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -qt-xcb -sysconfdir /etc/xdg -qt-pcre -qt-harfbuzz -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib QMAKE_LFLAGS_APP+=-s -static -no-icu' - - Template: 'qtci-macos-10.13-x86_64-2' + Template: 'qtci-macos-10.13-x86_64-3' 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' diff --git a/coin/pre-provisioning/qtci-windows-10-x86_64/README_MANUAL_INSTALLATIONS b/coin/pre-provisioning/qtci-windows-10-x86_64/README_MANUAL_INSTALLATIONS index fd646cbf..0b0c89fd 100644 --- a/coin/pre-provisioning/qtci-windows-10-x86_64/README_MANUAL_INSTALLATIONS +++ b/coin/pre-provisioning/qtci-windows-10-x86_64/README_MANUAL_INSTALLATIONS @@ -1,21 +1,23 @@ # 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 +Language to install: English UK +Time and currency format: English UK +Keyboard or input method: United Kingdom location: finnish Windows 10 Enterprise Region: Finland -Keyboard layout: Finnish +Keyboard layout: United Kingdom + +* Don't use online speech recognition +* Let Microsoft and apps use your location: no +* Find my devicer: no +* Send diagnostic data to Microsoft: Send required diagnostic data +* Imporve inking & typing: no +* Get tailored expreriences with diagnostic data: no +* Let apps use advertising ID: no * VMware tools (complete) installed * Resolution set to 1280x800 @@ -27,24 +29,24 @@ Keyboard layout: Finnish - 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' +* Microsoft Defender Antivirus turned off: Open 'gpedit.msc': 'Computer Configuration' - 'Administrative Templates' - 'Windows Components' - 'Microsoft Defender Antivirus' + - Edit 'Turn off Microsoft 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" +* 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 +* Time zone: 'Co-ordinated 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' +* Power saver disabled: Open 'Power & sleep settings' + - set 'Screen' to 'never' + - set 'Sleep' to 'never' * Turn windows features on or off -> Check the "SMB 1.0/CIFS File Sharing Support +* (Restart Windows) * 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 +* Virus & threat protection settings: + * Check that there's no active antivirus providers +* From 'Region Settings' + * Set Regional format: English (United States) * 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-update-orchestrator.ps1 b/coin/pre-provisioning/qtci-windows-10-x86_64/disable-update-orchestrator.ps1 index c7f23470..1022c798 100644 --- a/coin/pre-provisioning/qtci-windows-10-x86_64/disable-update-orchestrator.ps1 +++ b/coin/pre-provisioning/qtci-windows-10-x86_64/disable-update-orchestrator.ps1 @@ -5,7 +5,6 @@ $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" diff --git a/coin/pre-provisioning/qtci-windows-10-x86_64/disable-windefender.ps1 b/coin/pre-provisioning/qtci-windows-10-x86_64/disable-windefender.ps1 index 21938f7f..08dfb88e 100644 --- a/coin/pre-provisioning/qtci-windows-10-x86_64/disable-windefender.ps1 +++ b/coin/pre-provisioning/qtci-windows-10-x86_64/disable-windefender.ps1 @@ -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. @@ -44,18 +44,6 @@ 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" diff --git a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2015_update.txt b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2015_update.txt new file mode 100644 index 00000000..c4714602 --- /dev/null +++ b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2015_update.txt @@ -0,0 +1,18 @@ +# Visual Studio $version was installed manually using $installer. +$version = "2015 update 3" +$version_number ="14.0.25420.1" +$installer = "en_visual_studio_professional_2015_with_update_3_x86_x64_web_installer_8922978.exe" + +# default plus following components were selected: +# * Programming Languages +# * Visual C++ +# - Common Tools for Visual C++ 2015 +# * 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 + +# 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" diff --git a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2019.txt b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2019.txt index 28f63762..163621c5 100644 --- a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2019.txt +++ b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2019.txt @@ -2,13 +2,13 @@ $version = "2019" # Current version was manually upgraded from the installer -$version_number = "16.4.4" +$version_number = "16.8.1" $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 + * Version: 16.8.1 Installed MSVC-2019 Components: @@ -38,14 +38,14 @@ 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) +C++/CLI support for v142 build tools /14.28) 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++ ARM build tools (v14.28) 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++ ARM64 build tools (v14.26) MSVC v142 - VS 2019 C++ x64/x86 build tools (v14.20) -MSVC v142 - VS 2019 C++ x64/x86 build tools (v14.24) +MSVC v142 - VS 2019 C++ x64/x86 build tools (v14.26) .NET profiling tools C++ profiling tools JavaScript diagnostics @@ -57,11 +57,14 @@ 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 +TypeScript 4.0 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) +Windows 10 SDK (10.0.19041.0) # NOTE! Work loads were added during installation! +* 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/virtio.txt b/coin/pre-provisioning/qtci-windows-10-x86_64/virtio.txt new file mode 100644 index 00000000..61c89933 --- /dev/null +++ b/coin/pre-provisioning/qtci-windows-10-x86_64/virtio.txt @@ -0,0 +1,31 @@ +Install virtio + +Our vanilla images are pre-installed in VMware where we have networking available. In KVM we can +use the VMware installed vmxnet3 NIC to fetch VirtIO drivers, install them, and only then switch +to using the VirtIO NIC in KVM. + +NOTE! Install these Virtio drivers in Opennebula when using Windows 10 20H2 +* Download https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/archive-virtio/virtio-win-0.1.185-2/virtio-win-0.1.185.iso + cache: http://ci-files01-hki.ci.local/input/windows/virtio/virtio-win-0.1.185.iso +* Mount virtio-win-0.1.185.iso by double clicking it. +* Right click 'E:\NetKVM\w10\amd64\netkvm.inf' and select Install +* Right click 'E:\Balloon\w10\amd64\balloon.inf' and select Install +* Right click 'E:\vioscsi\w10\amd64\vioscsi.inf' and select Install +* Right click 'E:\vioserial\w10\amd64\vioser.inf' and select Install +* Navigate to E:\guest-agent directory and double click qemu-ga-x86_64 + +Because vioscsi does not install the entries in windows registry before we actually +have a VirtIO device installed, and we can't boot with a VirtIO device before +the driver is installed, we have to blindly install the registry entries: + +* Download https://bugreports.qt.io/secure/attachment/95685/95685_vioscsi.reg + cache: http://ci-files01-hki.intra.qt.io/input/windows/virtio/vioscsi.reg + +However, we've seen that the Owner in the registry can be wrong. This entry +sets it to oem11.inf, but we've seen it be oem10.inf in one case and it has +to be corrected so that it will boot from the VirtIO driver. This was found out +by having 2 devices installed simultaneously and having the drivers install +properly into the registry. + +* Eject the mounting +* Remove downloaded virtio-win-0.1.171.iso diff --git a/coin/provisioning/common/linux/android_linux.sh b/coin/provisioning/common/linux/android_linux.sh index ca9110b8..01de5f07 100755 --- a/coin/provisioning/common/linux/android_linux.sh +++ b/coin/provisioning/common/linux/android_linux.sh @@ -55,8 +55,8 @@ toolsVersion="r26.1.1" toolsFile="sdk-tools-linux-4333796.zip" ndkVersion="r20" ndkFile="android-ndk-$ndkVersion-linux-x86_64.zip" -sdkBuildToolsVersion="28.0.3" -sdkApiLevel="android-28" +sdkBuildToolsVersion="29.0.3" +sdkApiLevel="android-29" toolsSha1="8c7c28554a32318461802c1291d76fccfafde054" ndkSha1="8665fc84a1b1f0d6ab3b5fdd1e30200cc7b9adff" diff --git a/coin/provisioning/common/linux/gcc.sh b/coin/provisioning/common/linux/gcc.sh index 06fe8bf7..deb29ea6 100755 --- a/coin/provisioning/common/linux/gcc.sh +++ b/coin/provisioning/common/linux/gcc.sh @@ -1,8 +1,9 @@ + #!/usr/bin/env bash ############################################################################# ## -## 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. @@ -93,10 +94,10 @@ function InstallGCC() { --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/openssl_for_android_linux.sh b/coin/provisioning/common/linux/openssl_for_android_linux.sh index 4860c01f..65e3b022 100755 --- a/coin/provisioning/common/linux/openssl_for_android_linux.sh +++ b/coin/provisioning/common/linux/openssl_for_android_linux.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. @@ -53,11 +53,11 @@ else rm -rf "$exports_file" fi -version="1.1.1d" +version="1.1.1g" officialUrl="https://www.openssl.org/source/openssl-$version.tar.gz" cachedUrl="http://ci-files01-hki.intra.qt.io/input/openssl/openssl-$version.tar.gz" targetFile="/tmp/openssl-$version.tar.gz" -sha="056057782325134b76d1931c48f2c7e6595d7ef4" +sha="b213a293f2127ec3e323fb3cfc0c9807664fd997" opensslHome="${HOME}/openssl/android/openssl-${version}" DownloadURL "$cachedUrl" "$officialUrl" "$sha" "$targetFile" mkdir -p "${HOME}/openssl/android/" diff --git a/coin/provisioning/common/macos/libusb.sh b/coin/provisioning/common/macos/libusb.sh index cf9e7150..0022d209 100755 --- a/coin/provisioning/common/macos/libusb.sh +++ b/coin/provisioning/common/macos/libusb.sh @@ -37,7 +37,7 @@ set -ex source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" -brew install libusb +brew install --build-from-source libusb read -r -a arr <<< $(brew list --versions libusb) version=${arr[1]} echo "libusb = $version" >> ~/versions.txt diff --git a/coin/provisioning/common/macos/macos-version.sh b/coin/provisioning/common/macos/macos-version.sh index 9f357b8c..c88cd9b8 100755 --- a/coin/provisioning/common/macos/macos-version.sh +++ b/coin/provisioning/common/macos/macos-version.sh @@ -44,8 +44,6 @@ sw_vers >> ~/versions.txt echo "***** All installed packages *****" >> ~/versions.txt echo "***** HomeBrew *****" >> ~/versions.txt brew list --versions >> ~/versions.txt -echo "***** HomeBrew Casks*****" >> ~/versions.txt -brew cask list --versions >> ~/versions.txt echo "***** Apple's installer *****" >> ~/versions.txt pkgutil --pkgs >> ~/versions.txt echo "*********************************************" >> ~/versions.txt diff --git a/coin/provisioning/common/unix/install-openssl.sh b/coin/provisioning/common/unix/install-openssl.sh index 08a3390b..75b7edbc 100755 --- a/coin/provisioning/common/unix/install-openssl.sh +++ b/coin/provisioning/common/unix/install-openssl.sh @@ -2,7 +2,7 @@ ############################################################################# ## -## 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. @@ -42,11 +42,11 @@ source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh" # shellcheck source=../unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" -version="1.1.1d" +version="1.1.1g" officialUrl="https://www.openssl.org/source/openssl-$version.tar.gz" cachedUrl="http://ci-files01-hki.intra.qt.io/input/openssl/openssl-$version.tar.gz" targetFile="/tmp/openssl-$version.tar.gz" -sha="056057782325134b76d1931c48f2c7e6595d7ef4" +sha="b213a293f2127ec3e323fb3cfc0c9807664fd997" opensslHome="${HOME}/openssl-${version}" opensslSource="${opensslHome}-src" DownloadURL "$cachedUrl" "$officialUrl" "$sha" "$targetFile" diff --git a/coin/provisioning/common/unix/libclang-v100-dyn.sh b/coin/provisioning/common/unix/libclang-v100-dyn.sh new file mode 100755 index 00000000..d6609429 --- /dev/null +++ b/coin/provisioning/common/unix/libclang-v100-dyn.sh @@ -0,0 +1,83 @@ +#!/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$ +## +############################################################################# + +# PySide versions following 5.6 use a C++ parser based on Clang (http://clang.org/). +# The Clang library (C-bindings), version 3.9 or higher is required for building. + +# This same script is used to provision libclang to Linux and macOS. +# In case of Linux, we expect to get the values as args +set -e + +# shellcheck source=./check_and_set_proxy.sh +source "${BASH_SOURCE%/*}/check_and_set_proxy.sh" +# shellcheck source=./SetEnvVar.sh +source "${BASH_SOURCE%/*}/SetEnvVar.sh" +# shellcheck source=./DownloadURL.sh +source "${BASH_SOURCE%/*}/DownloadURL.sh" + +libclang_version=10.0 + +if uname -a |grep -q Darwin; then + version=$libclang_version + url="https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_${version//\./}-based-mac.7z" + sha1="0fe1fa50b1b469d2c05acc3a3468bc93a66f1e5a" + url_cached="http://ci-files01-hki.intra.qt.io/input/libclang/qt/libclang-release_${version//\./}-based-mac.7z" +elif test -f /etc/redhat-release || /etc/centos-release; then + version=$libclang_version + url="https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_${version//\./}-based-linux-Rhel7.6-gcc5.3-x86_64.7z" + sha1="1d2e265502fc0832a854f989d757105833fbd179" + url_cached="http://ci-files01-hki.intra.qt.io/input/libclang/libclang-release_${version//\./}-based-linux-Rhel7.6-gcc5.3-x86_64.7z" +else + version=$libclang_version + url="https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_${version//\./}-based-linux-Ubuntu18.04-gcc9.2-x86_64.7z" + sha1="c1580acb3a82e193acf86f18afb52427c5e67de8" + url_cached="http://ci-files01-hki.intra.qt.io/input/libclang/libclang-release_${version//\./}-based-linux-Ubuntu18.04-gcc9.2-x86_64.7z" +fi + +zip="/tmp/libclang.7z" +destination="/usr/local/libclang-dynlibs-$version" + +DownloadURL $url_cached $url $sha1 $zip +if command -v 7zr &> /dev/null; then + sudo 7zr x $zip -o/usr/local/ +else + sudo 7z x $zip -o/usr/local/ +fi +sudo mv /usr/local/libclang "$destination" +rm -rf $zip + + +echo "export LLVM_DYNAMIC_LIBS_100=$destination" >> ~/.bash_profile +echo "libClang for QtForPython= $version" >> ~/versions.txt diff --git a/coin/provisioning/common/unix/squishInstall.sh b/coin/provisioning/common/unix/squishInstall.sh index 7592814b..bce68549 100755 --- a/coin/provisioning/common/unix/squishInstall.sh +++ b/coin/provisioning/common/unix/squishInstall.sh @@ -41,18 +41,19 @@ set -ex # This script will fetch and extract pre-buildt squish package for Linux and Mac. # Squish is need by Release Test Automation (RTA) -version="6.5.2" -qtBranch="514x" +version="6.6.1" +qtBranch="515x" installFolder="/opt" squishFolder="$installFolder/squish" preBuildCacheUrl="ci-files01-hki.intra.qt.io:/hdd/www/input/squish/jenkins_build/stable" -licenseUrl="http://ci-files01-hki.intra.qt.io/input/squish/coin/.squish-3-license" +licenseUrl="http://ci-files01-hki.intra.qt.io/input/squish/coin/$qtBranch/.squish-3-license" +licenseSHA="e000d2f95b30b82f405b9dcbeb233cd43710a41a" if uname -a |grep -q Darwin; then compressedFolder="prebuild-squish-$version-$qtBranch-macx86_64.tar.gz" - sha1="91a1d7228dc4b4bd64f93191c33d2642abc97e14" + sha1="9fff9a7cb037214d21f47f2cc53747885fd1f2ae" else compressedFolder="prebuild-squish-$version-$qtBranch-linux64.tar.gz" - sha1="63f33de55770e2588dd9f482546900e33d20f8ec" + sha1="3a50052caafa3ca583b7edf754227999d7185ffa" fi mountFolder="/tmp/squish" @@ -95,11 +96,11 @@ sudo mv "$installFolder/rta_squish_$version" "$squishFolder" if uname -a |grep -q "Ubuntu"; then if [ ! -e "/usr/lib/tcl8.6" ]; then sudo mkdir /usr/lib/tcl8.6 - sudo cp "$squishFolder/package/tcl/lib/tcl8.6/init.tcl" /usr/lib/tcl8.6/ + sudo cp "$squishFolder/squish_for_qt/tcl/lib/tcl8.6/init.tcl" /usr/lib/tcl8.6/ fi fi -DownloadURL "$licenseUrl" "$licenseUrl" "3c6b2b3ca047f68e20f697afcc3a9d376f01b376" "$HOME/.squish-3-license" +DownloadURL "$licenseUrl" "$licenseUrl" "$licenseSHA" "$HOME/.squish-3-license" echo "Changing ownerships" sudo chown -R qt:$usersGroup "$squishFolder" @@ -107,18 +108,18 @@ sudo chown qt:$usersGroup "$HOME/.squish-3-license" echo "Set commands for environment variables in .bashrc" if uname -a |grep -q "Ubuntu"; then - echo "export SQUISH_PATH=$squishFolder/package" >> ~/.profile - echo "export PATH=\$PATH:$squishFolder/squish-$version/bin" >> ~/.profile + echo "export SQUISH_PATH=$squishFolder/squish_for_qt" >> ~/.profile + echo "export PATH=\$PATH:$squishFolder/squish_for_qt/bin" >> ~/.profile else - echo "export SQUISH_PATH=$squishFolder/package" >> ~/.bashrc - echo "export PATH=\$PATH:$squishFolder/squish-$version/bin" >> ~/.bashrc + echo "export SQUISH_PATH=$squishFolder/squish_for_qt" >> ~/.bashrc + echo "export PATH=\$PATH:$squishFolder/squish_for_qt/bin" >> ~/.bashrc fi echo "Verifying Squish" -if "$squishFolder/package/bin/squishrunner" --testsuite "$squishFolder/suite_test_squish" | grep "Squish test run successfully" ; then - echo "Squish installation tested successfully" +if "$squishFolder/squish_for_qt/bin/squishrunner" --testsuite "$squishFolder/suite_test_squish" | grep "Squish test run successfully" ; then + echo "Squish for Qt installation tested successfully" else - echo "Squish test failed! Package wasn't installed correctly." + echo "Squish for Qt test failed! Package wasn't installed correctly." exit 1 fi diff --git a/coin/provisioning/common/windows/android-openssl.ps1 b/coin/provisioning/common/windows/android-openssl.ps1 index d1877b64..010e7e76 100644 --- a/coin/provisioning/common/windows/android-openssl.ps1 +++ b/coin/provisioning/common/windows/android-openssl.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. @@ -45,9 +45,9 @@ if (Is64BitWinHost) { # Msys need to be installed to target machine # More info and building instructions can be found from http://doc.qt.io/qt-5/opensslsupport.html -$version = "1.1.1d" +$version = "1.1.1g" $zip = Get-DownloadLocation ("openssl-$version.tar.gz") -$sha1 = "056057782325134b76d1931c48f2c7e6595d7ef4" +$sha1 = "b213a293f2127ec3e323fb3cfc0c9807664fd997" $destination = "C:\Utils\openssl-android-master" # msys unix style paths diff --git a/coin/provisioning/common/windows/conan.ps1 b/coin/provisioning/common/windows/conan.ps1 index e7e0de22..8b22ab1d 100644 --- a/coin/provisioning/common/windows/conan.ps1 +++ b/coin/provisioning/common/windows/conan.ps1 @@ -37,7 +37,7 @@ $scriptsPath = "C:\Python36\Scripts" Run-Executable "$scriptsPath\pip3.exe" "install -r $PSScriptRoot\conan_requirements.txt" -Write-Output "Conan = 1.22.2" >> ~\versions.txt +Write-Output "Conan = 1.29.0" >> ~\versions.txt # Use Qt Project repository by default Run-Executable "$scriptsPath\conan.exe" "remote add qtproject https://api.bintray.com/conan/qtproject/conan --insert --force" diff --git a/coin/provisioning/common/windows/conan_manifests/icu/65.1/qtproject/stable/package/e493e4ecb2fa207a4d212307e7d30a35fc0dde29/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/icu/65.1/qtproject/stable/package/5a523494e1f78e9c3900ce2f09380672c297a203/conanmanifest.txt index b8dd8f97..2640cf1e 100644 --- a/coin/provisioning/common/windows/conan_manifests/icu/65.1/qtproject/stable/package/e493e4ecb2fa207a4d212307e7d30a35fc0dde29/conanmanifest.txt +++ b/coin/provisioning/common/windows/conan_manifests/icu/65.1/qtproject/stable/package/5a523494e1f78e9c3900ce2f09380672c297a203/conanmanifest.txt @@ -1,33 +1,33 @@ -1582256998 -bin/derb.exe: db2e978367ccf635ff7ecc7d1514778e -bin/escapesrc.exe: 647ffe2234275d13cffef8b84f052700 -bin/genbrk.exe: fceaae69a437fdcd4ed1f79bdeac6f13 -bin/genccode.exe: 81e45377e293edabeb321ba3ab339abb -bin/gencfu.exe: 78036b67e099cc312da25d80f9c8b6cf -bin/gencmn.exe: 4f73ec63d48e3935e0fa67313a7d8f8f -bin/gencnval.exe: 38519687874be469d38e8aadc74d5dc7 -bin/gendict.exe: be263dfa3e3267340bb4a8815bd4f72e -bin/gennorm2.exe: 8e51f5820ec15ed33edb293d5d154138 -bin/genrb.exe: 0a911668227dec1fca18e7299d737d59 -bin/gensprep.exe: a96ab9a47ea6e80869c2f732d66296e6 -bin/icu-config: 4d315b6fa7b53efaf8974aaceb0c7a18 -bin/icudt.dll: a8b8ce26bbfb30b99d97a5ced4d016ed -bin/icudt65.dll: d134d26eb54ba7d5b637c16c974737fb -bin/icuin.dll: 5bb19d323881787da00a706f86b7a77a -bin/icuin65.dll: 5bb19d323881787da00a706f86b7a77a -bin/icuinfo.exe: d9e0c244e7a939c48c2fa2536ea3c836 -bin/icuio.dll: 98c919ca7fc813e8dc5f645fcc914e5b -bin/icuio65.dll: 98c919ca7fc813e8dc5f645fcc914e5b -bin/icupkg.exe: 5b9542ec3f054880d2ec484516fae931 -bin/icutest.dll: e94878f59e7de6f7b2cc52476540c578 -bin/icutest65.dll: e94878f59e7de6f7b2cc52476540c578 -bin/icutu.dll: 22d3955eeabe583ef8f339d43ee32e3f -bin/icutu65.dll: 22d3955eeabe583ef8f339d43ee32e3f -bin/icuuc.dll: 7871b100e82744b16a608d01df837485 -bin/icuuc65.dll: 7871b100e82744b16a608d01df837485 -bin/makeconv.exe: 3fae3578534581895353052e4268c8e8 -bin/pkgdata.exe: 3a91ebe880d28e02b72b69bef2508337 -conaninfo.txt: 81e378c465132a1385850c1d3d4394ed +1599824441 +bin/derb.exe: bdf63b2f5b550979a89e67cffc8825dc +bin/escapesrc.exe: 137b889673457a447f351f5e874eac3d +bin/genbrk.exe: bb3294c7064cb973f2ca07ee553f0420 +bin/genccode.exe: 820b92ed20fb38886dea4447f12911af +bin/gencfu.exe: aa4365ba9562fa1bbc4416fbbac63fb2 +bin/gencmn.exe: 178c5b5cff63d0e0fe9b47a4a0afb5a2 +bin/gencnval.exe: 71a8bdcb6532c752fb4e106fa602c200 +bin/gendict.exe: 420fcd1d350c9ed1ef451c8e77f023dc +bin/gennorm2.exe: 85cd1fa266ff3a0455760b12a9689fc1 +bin/genrb.exe: 480231b78483ccb146b6815a811efac3 +bin/gensprep.exe: 0abbaf32db163eab36b6fdb6930c1532 +bin/icu-config: 524e7418a34b9f37fa3d720538887dcf +bin/icudt.dll: 56532bd6f97572f1ff2f5c269c200cfa +bin/icudt65.dll: 09337a242c43e958c75c630e76f58626 +bin/icuin.dll: ccf458a6762ea1248b633f260f60570b +bin/icuin65.dll: ccf458a6762ea1248b633f260f60570b +bin/icuinfo.exe: 4274c1a2507c370533ce1151533d5e20 +bin/icuio.dll: 5c92afa27046b497ea879c5bf4d10577 +bin/icuio65.dll: 5c92afa27046b497ea879c5bf4d10577 +bin/icupkg.exe: d679b1024f2e26c1f8a1b77e7258e98f +bin/icutest.dll: 562c79d8df0fc5048f4546917b2738f2 +bin/icutest65.dll: 562c79d8df0fc5048f4546917b2738f2 +bin/icutu.dll: e45504e5c6ccde54658a7df8bd88108d +bin/icutu65.dll: e45504e5c6ccde54658a7df8bd88108d +bin/icuuc.dll: d8e8d4d51a9fd6a9849fa4ca5812f0bb +bin/icuuc65.dll: d8e8d4d51a9fd6a9849fa4ca5812f0bb +bin/makeconv.exe: 6b4805b126655a2b95428b10cf08b25f +bin/pkgdata.exe: 6455bddfee736917790fcad7d326f8c1 +conaninfo.txt: 411145de18abdd9c818ab023e965129b include/unicode/alphaindex.h: 1be039746e3da3f7baa9421062373468 include/unicode/appendable.h: 48b3a0a4c3044ad5f2af18f1ab48c8ff include/unicode/basictz.h: 57fe3c53d6b1a2bf5d1f40ec51efd7a1 @@ -215,21 +215,21 @@ 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: dfca695719fce3f4802048877b7e5ef5 -lib/icu/65.1/pkgdata.inc: 8a01d365fe1a225f3168d4659ea48705 -lib/icu/Makefile.inc: dfca695719fce3f4802048877b7e5ef5 -lib/icu/current/Makefile.inc: dfca695719fce3f4802048877b7e5ef5 -lib/icu/current/pkgdata.inc: 8a01d365fe1a225f3168d4659ea48705 -lib/icu/pkgdata.inc: 8a01d365fe1a225f3168d4659ea48705 -lib/libicudt.dll.a: 4297604f481c4f41cd69f1c0d41544a8 -lib/libicuin.dll.a: 78136e54cf3ad942dddc32b3d8c42aab -lib/libicuio.dll.a: 681e068e1ebbb2665b222bd3894c8f96 -lib/libicutest.dll.a: 2d7d50cebf7a15c2bd05995ff9dc2e38 -lib/libicutu.dll.a: e08a3d12905cb703179a11e250fe4f61 -lib/libicuuc.dll.a: e92fdef67e56c164ec5c6d47ae97be6b -lib/pkgconfig/icu-i18n.pc: eed957ffe006f4fb042981c0f7e0451a -lib/pkgconfig/icu-io.pc: 43c8fc7b90303c819b1669ca99e10dde -lib/pkgconfig/icu-uc.pc: 3e8708649f2ea8ebd74f0c75655bdd66 +lib/icu/65.1/Makefile.inc: 82a9c670eb96bb7e73a660f769fb3503 +lib/icu/65.1/pkgdata.inc: 2d256010da2bbf625c500da0c9826d93 +lib/icu/Makefile.inc: 82a9c670eb96bb7e73a660f769fb3503 +lib/icu/current/Makefile.inc: 82a9c670eb96bb7e73a660f769fb3503 +lib/icu/current/pkgdata.inc: 2d256010da2bbf625c500da0c9826d93 +lib/icu/pkgdata.inc: 2d256010da2bbf625c500da0c9826d93 +lib/libicudt.dll.a: 2c21378a274a52b0cfc497029e57fc32 +lib/libicuin.dll.a: 36ed05dc4117699bf26d988dedab065e +lib/libicuio.dll.a: 194a2f912ad715fa5a5ff70186c2809e +lib/libicutest.dll.a: ff4d7834bd6190801772795c206fb9bf +lib/libicutu.dll.a: d3e8cae651dddd4da2f960fdbde04c1f +lib/libicuuc.dll.a: b371571253da468a123ad696382d9bef +lib/pkgconfig/icu-i18n.pc: 7f34faeff3f9ad63e1ffd6526897f8d9 +lib/pkgconfig/icu-io.pc: 50afb654ad3f618eef1052195687b7cb +lib/pkgconfig/icu-uc.pc: 2bc7002eccc3f2c53a1270cdc04a30d6 licenses/LICENSE: 8bc5d32052a96f214cbdd1e53dfc935d share/icu/65.1/LICENSE: 8bc5d32052a96f214cbdd1e53dfc935d share/icu/65.1/config/mh-mingw: 95446b7c74bc210a824c787c9bd47a93 diff --git a/coin/provisioning/common/windows/conan_manifests/icu/65.1/qtproject/stable/package/1fab1e9a646ef41ee7e947ef7a9524b08e3ef34d/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/icu/65.1/qtproject/stable/package/5df173d8cb73784907692ca167e7d2e8316b10c7/conanmanifest.txt index afff694d..04612903 100644 --- a/coin/provisioning/common/windows/conan_manifests/icu/65.1/qtproject/stable/package/1fab1e9a646ef41ee7e947ef7a9524b08e3ef34d/conanmanifest.txt +++ b/coin/provisioning/common/windows/conan_manifests/icu/65.1/qtproject/stable/package/5df173d8cb73784907692ca167e7d2e8316b10c7/conanmanifest.txt @@ -1,33 +1,33 @@ -1582257415 -bin/derb.exe: 430c27da15e7c5d4c6eb60e0b1e6fb8f -bin/escapesrc.exe: 9a59fded291dd4ea4cbfe3b7a1c80080 -bin/genbrk.exe: 56897185781522cd685e4af4ca102a3b -bin/genccode.exe: c99c94069e8a0098bc4db9914a7f6e7a -bin/gencfu.exe: e23c79026bb78c1991c7f7a8425fad13 -bin/gencmn.exe: 8fba64b78d2ab6f5bcd6c723da1f57ad -bin/gencnval.exe: 14c87059b1c39a72879837cabb3eb84d -bin/gendict.exe: 1380f639d83e4d1f21b55ba2495d4a41 -bin/gennorm2.exe: 914fa6268d94fe08969d7104dc55218f -bin/genrb.exe: 22e6461a351f1bf391d181f78a6ef54b -bin/gensprep.exe: 4bccca6db929a0b19fff1c5a37873b16 -bin/icu-config: 9250dfdf7faa8c4d08dfa6cf4f40e2d1 -bin/icudt.dll: 8a2d4864a89ed94a0e16eaab44d3a4c2 -bin/icudt65.dll: aa62d2fd6b59bd61116910583e3dd41d -bin/icuin.dll: 05cc7ab8708577d53395eb242a0dcc6d -bin/icuin65.dll: 05cc7ab8708577d53395eb242a0dcc6d -bin/icuinfo.exe: 3700aeeae9229fff4fe501ae415b5c36 -bin/icuio.dll: f2c286ef97baf5ddc7c8110dbd9e6b4c -bin/icuio65.dll: f2c286ef97baf5ddc7c8110dbd9e6b4c -bin/icupkg.exe: c03f0c24917039bc98a3b7616c9b141e -bin/icutest.dll: 9db214eb296a087b0385f07c21e15b6f -bin/icutest65.dll: 9db214eb296a087b0385f07c21e15b6f -bin/icutu.dll: f8df0b65efc4fffc30850b6fd6513eeb -bin/icutu65.dll: f8df0b65efc4fffc30850b6fd6513eeb -bin/icuuc.dll: 81bebc9772571cf4c591512707de7f6f -bin/icuuc65.dll: 81bebc9772571cf4c591512707de7f6f -bin/makeconv.exe: ef7aa77bd42300c98ea2676e095356d0 -bin/pkgdata.exe: 4f957c0e9d26523d6977c47879ccb20a -conaninfo.txt: 87f571b59f21d0be18bbbb1a53c6b2f2 +1599824772 +bin/derb.exe: 68f722afeee75e9e4ea733789eba324d +bin/escapesrc.exe: 5ad48603ddefa7d75f9589db693311a0 +bin/genbrk.exe: cb5487bd37da74c470576d584803a0fd +bin/genccode.exe: 80d139a2b22c5c6a7c2ae6801cd8a3ee +bin/gencfu.exe: a9f417b50cd8237299100d349d78758e +bin/gencmn.exe: cf1a794d018ea5a93db501c4a17d0945 +bin/gencnval.exe: 2f9cf00a1c6d6ff40f6cc1d2420f2ac9 +bin/gendict.exe: bda284e8eb469caad6ff4320060bd63d +bin/gennorm2.exe: 643cc388bf9f49a1c22274070237e4b5 +bin/genrb.exe: 900294bcf2ba376e8a53dd0681efba84 +bin/gensprep.exe: f04c5265bb68e10eb86bbe812348a18a +bin/icu-config: 7ff0a51957bda1eec9b2ea457e7bacab +bin/icudt.dll: 1e1a6b8fbf1093c1b4fab982c4b62c39 +bin/icudt65.dll: 91e49d019e10d91cccada5b136f68dec +bin/icuin.dll: a67701e7309fae5371c5f656f0deabea +bin/icuin65.dll: a67701e7309fae5371c5f656f0deabea +bin/icuinfo.exe: 7fd856803068da1b6d736f88d5578444 +bin/icuio.dll: e53d31b6899dbcec1eb77da207c8e1cc +bin/icuio65.dll: e53d31b6899dbcec1eb77da207c8e1cc +bin/icupkg.exe: 26c99ac9bf0aef675b6be3d0e4ec1f96 +bin/icutest.dll: 29acd15f69048c04adc7350ea2f7422a +bin/icutest65.dll: 29acd15f69048c04adc7350ea2f7422a +bin/icutu.dll: 4b0c32dd74735e9cd2421026fd5a26d9 +bin/icutu65.dll: 4b0c32dd74735e9cd2421026fd5a26d9 +bin/icuuc.dll: ff8cfb1cb4360f103f0ab37a21b0f565 +bin/icuuc65.dll: ff8cfb1cb4360f103f0ab37a21b0f565 +bin/makeconv.exe: 2f22caee13d695a9c596aa97eb581cf7 +bin/pkgdata.exe: 49ebcb66931fd627061de5683646d511 +conaninfo.txt: c04d7a669f242e429c8cd6c4c9f9b250 include/unicode/alphaindex.h: 1be039746e3da3f7baa9421062373468 include/unicode/appendable.h: 48b3a0a4c3044ad5f2af18f1ab48c8ff include/unicode/basictz.h: 57fe3c53d6b1a2bf5d1f40ec51efd7a1 @@ -215,21 +215,21 @@ 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: 578a604f57dc0000c3e4272ac5159ced -lib/icu/65.1/pkgdata.inc: 9f94a807fa04d65b45bb04114c74fc8f -lib/icu/Makefile.inc: 578a604f57dc0000c3e4272ac5159ced -lib/icu/current/Makefile.inc: 578a604f57dc0000c3e4272ac5159ced -lib/icu/current/pkgdata.inc: 9f94a807fa04d65b45bb04114c74fc8f -lib/icu/pkgdata.inc: 9f94a807fa04d65b45bb04114c74fc8f -lib/libicudt.dll.a: 6d19c78195cbf2af4f68b3a1ff93f612 -lib/libicuin.dll.a: dc5b0188be79d786a1612ab4fe8ee105 -lib/libicuio.dll.a: a995de8310f252cd356949a19ace1fc9 -lib/libicutest.dll.a: 4017504bf0e1cbc71fa05c5fda30fcc8 -lib/libicutu.dll.a: aca996f2762328e3a3125c52582d4c19 -lib/libicuuc.dll.a: 45c324a2b53e0860672f73a13dd0eaed -lib/pkgconfig/icu-i18n.pc: b86403e2cbd81f2559f01cda101d5181 -lib/pkgconfig/icu-io.pc: f7bf176168b2c48bbf9d5b3ab3513420 -lib/pkgconfig/icu-uc.pc: b939d24910a7545f0dd199b79e60a1a0 +lib/icu/65.1/Makefile.inc: ae4b3c0b2dcf1a107c37da529a5a572d +lib/icu/65.1/pkgdata.inc: 392ec5b38e95048f06b739125b748364 +lib/icu/Makefile.inc: ae4b3c0b2dcf1a107c37da529a5a572d +lib/icu/current/Makefile.inc: ae4b3c0b2dcf1a107c37da529a5a572d +lib/icu/current/pkgdata.inc: 392ec5b38e95048f06b739125b748364 +lib/icu/pkgdata.inc: 392ec5b38e95048f06b739125b748364 +lib/libicudt.dll.a: 42327b89226e435dee32d4ed4043dd1e +lib/libicuin.dll.a: a479b7dfc0f69346644676625cab1154 +lib/libicuio.dll.a: 1b048a7fcae8905fa929b9ef282d05c8 +lib/libicutest.dll.a: af3d4912fe492f3089589416a582bff3 +lib/libicutu.dll.a: d27299ee9de0bfa2f7130b177a101ced +lib/libicuuc.dll.a: 0f98b361c734d8d5cd157678c8d7d6f1 +lib/pkgconfig/icu-i18n.pc: 5a7e7ff2a321db58b97ccaa41ea54e3b +lib/pkgconfig/icu-io.pc: 426da02c84b5694772af9a5bc11dee9b +lib/pkgconfig/icu-uc.pc: 5a761b97c6c84a60887f35393d0d15c2 licenses/LICENSE: 8bc5d32052a96f214cbdd1e53dfc935d share/icu/65.1/LICENSE: 8bc5d32052a96f214cbdd1e53dfc935d share/icu/65.1/config/mh-mingw64: 071f2f1be85f81141e4243ab65ca2a5b 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 deleted file mode 100644 index 4f7d3680..00000000 --- a/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.3/qtproject/stable/package/1c8544b57637b92dcdfce760b76b459bde0ce701/conanmanifest.txt +++ /dev/null @@ -1,12 +0,0 @@ -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/2b3cb3bb931646fe98ad49632435cdd3ed213435/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.3/qtproject/stable/package/2b3cb3bb931646fe98ad49632435cdd3ed213435/conanmanifest.txt deleted file mode 100644 index 9297a30c..00000000 --- a/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.3/qtproject/stable/package/2b3cb3bb931646fe98ad49632435cdd3ed213435/conanmanifest.txt +++ /dev/null @@ -1,12 +0,0 @@ -1582282436 -conaninfo.txt: e412e1148672ae4437d5d9e8f0089dae -include/jconfig.h: 36405c50a3b1509877826e26eac4fb69 -include/jerror.h: 9b7898fe417de269b8be88b10df908b0 -include/jmorecfg.h: 7873b0a4457d21a746e23c16fc16127d -include/jpeglib.h: 49b0829e2b84fcd4a0cee359199499cb -include/turbojpeg.h: b5b3a4a233ea12d2041ad1d1c971e6a0 -lib/libjpeg.a: 9ec4a3ea70de97420d8a262641df11fe -lib/libturbojpeg.a: 3704f7242f7d79187bcf09b7ff7bb86e -lib/pkgconfig/libjpeg.pc: fa956ecec06575a626eb24df4ade7059 -lib/pkgconfig/libturbojpeg.pc: 7a28369f664feaef64c4f36043bdbf84 -licenses/LICENSE.md: 2a423a921d0f68082c80ccc7ad808ef2 diff --git a/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.3/qtproject/stable/package/4985763cfece81b148d7c11f16d564e42ee2756c/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.3/qtproject/stable/package/4985763cfece81b148d7c11f16d564e42ee2756c/conanmanifest.txt deleted file mode 100644 index 32c864e9..00000000 --- a/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.3/qtproject/stable/package/4985763cfece81b148d7c11f16d564e42ee2756c/conanmanifest.txt +++ /dev/null @@ -1,12 +0,0 @@ -1582280262 -conaninfo.txt: 3ce2f8cfe80b79b4dd725bdff24c402d -include/jconfig.h: 36405c50a3b1509877826e26eac4fb69 -include/jerror.h: 9b7898fe417de269b8be88b10df908b0 -include/jmorecfg.h: 7873b0a4457d21a746e23c16fc16127d -include/jpeglib.h: 49b0829e2b84fcd4a0cee359199499cb -include/turbojpeg.h: b5b3a4a233ea12d2041ad1d1c971e6a0 -lib/jpeg-static.lib: 277031e07ff0a68b0da547fd73fa8931 -lib/pkgconfig/libjpeg.pc: 18fe4739f1c264cc5807ac171f79d5de -lib/pkgconfig/libturbojpeg.pc: 080a4da3c8052f00721671016bda4f79 -lib/turbojpeg-static.lib: 142395e528dbecc678f0f0242512cb32 -licenses/LICENSE.md: 2a423a921d0f68082c80ccc7ad808ef2 diff --git a/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.3/qtproject/stable/package/6fe55a250d22d4408ba9c4b99015260e933b58f0/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.3/qtproject/stable/package/6fe55a250d22d4408ba9c4b99015260e933b58f0/conanmanifest.txt deleted file mode 100644 index c64266b1..00000000 --- a/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.3/qtproject/stable/package/6fe55a250d22d4408ba9c4b99015260e933b58f0/conanmanifest.txt +++ /dev/null @@ -1,12 +0,0 @@ -1582281085 -conaninfo.txt: 05273e3ea056a1d7946e1065622c2e6d -include/jconfig.h: 36405c50a3b1509877826e26eac4fb69 -include/jerror.h: 9b7898fe417de269b8be88b10df908b0 -include/jmorecfg.h: 7873b0a4457d21a746e23c16fc16127d -include/jpeglib.h: 49b0829e2b84fcd4a0cee359199499cb -include/turbojpeg.h: b5b3a4a233ea12d2041ad1d1c971e6a0 -lib/jpeg-static.lib: 94e22b458fa49d878f9f5ecaa83b4d4c -lib/pkgconfig/libjpeg.pc: f86f98cba102e1be6cdbc77e1f73d6e2 -lib/pkgconfig/libturbojpeg.pc: 9138a79005a0dd437ec485743cbc7708 -lib/turbojpeg-static.lib: 85dceca1ee42fb40b9177483a710931c -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 deleted file mode 100644 index acabe605..00000000 --- a/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.3/qtproject/stable/package/7fbb66ade701b46f34dff2e121edef66968608b5/conanmanifest.txt +++ /dev/null @@ -1,12 +0,0 @@ -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/libjpeg-turbo/2.0.3/qtproject/stable/package/8f06876bcdec0570dded47fecf362dd95832bd6e/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.3/qtproject/stable/package/8f06876bcdec0570dded47fecf362dd95832bd6e/conanmanifest.txt deleted file mode 100644 index bf51a89e..00000000 --- a/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.3/qtproject/stable/package/8f06876bcdec0570dded47fecf362dd95832bd6e/conanmanifest.txt +++ /dev/null @@ -1,12 +0,0 @@ -1582282336 -conaninfo.txt: 99d4bfcf4fe5b33346747d9aed5a90dd -include/jconfig.h: 36405c50a3b1509877826e26eac4fb69 -include/jerror.h: 9b7898fe417de269b8be88b10df908b0 -include/jmorecfg.h: 7873b0a4457d21a746e23c16fc16127d -include/jpeglib.h: 49b0829e2b84fcd4a0cee359199499cb -include/turbojpeg.h: b5b3a4a233ea12d2041ad1d1c971e6a0 -lib/libjpeg.a: 520fd96afa81fffa67fbccc2d7499459 -lib/libturbojpeg.a: 65c525625f9bdb0c9c93b3cae93116f1 -lib/pkgconfig/libjpeg.pc: 9088ad9e74b2b56826bc949805312370 -lib/pkgconfig/libturbojpeg.pc: 176a550708755ea935a3928dcc75bb0c -licenses/LICENSE.md: 2a423a921d0f68082c80ccc7ad808ef2 diff --git a/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.3/qtproject/stable/package/9b721b63e452039565ba8417e25a183d1bbcb4df/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.3/qtproject/stable/package/9b721b63e452039565ba8417e25a183d1bbcb4df/conanmanifest.txt deleted file mode 100644 index 4a4b3386..00000000 --- a/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.3/qtproject/stable/package/9b721b63e452039565ba8417e25a183d1bbcb4df/conanmanifest.txt +++ /dev/null @@ -1,12 +0,0 @@ -1582281572 -conaninfo.txt: 9868d7ba246ae96d18441c975ee816f1 -include/jconfig.h: 36405c50a3b1509877826e26eac4fb69 -include/jerror.h: 9b7898fe417de269b8be88b10df908b0 -include/jmorecfg.h: 7873b0a4457d21a746e23c16fc16127d -include/jpeglib.h: 49b0829e2b84fcd4a0cee359199499cb -include/turbojpeg.h: b5b3a4a233ea12d2041ad1d1c971e6a0 -lib/jpeg-static.lib: fb149794dc225dcb890e1b2c48569660 -lib/pkgconfig/libjpeg.pc: 16468bac09adeea126c41a7e2eab161f -lib/pkgconfig/libturbojpeg.pc: 6bad484e5ee764e95e570110855d00c8 -lib/turbojpeg-static.lib: 12e129d91c4f92257c7b12d88a0ccd3b -licenses/LICENSE.md: 2a423a921d0f68082c80ccc7ad808ef2 diff --git a/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.3/qtproject/stable/package/acb703d92685c00a6f85ed3ca8225725f0e186c1/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.3/qtproject/stable/package/acb703d92685c00a6f85ed3ca8225725f0e186c1/conanmanifest.txt deleted file mode 100644 index 53b1b8b3..00000000 --- a/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.3/qtproject/stable/package/acb703d92685c00a6f85ed3ca8225725f0e186c1/conanmanifest.txt +++ /dev/null @@ -1,12 +0,0 @@ -1582280641 -conaninfo.txt: d0e67ef7124b3767bbd5cebd7e4bf806 -include/jconfig.h: 36405c50a3b1509877826e26eac4fb69 -include/jerror.h: 9b7898fe417de269b8be88b10df908b0 -include/jmorecfg.h: 7873b0a4457d21a746e23c16fc16127d -include/jpeglib.h: 49b0829e2b84fcd4a0cee359199499cb -include/turbojpeg.h: b5b3a4a233ea12d2041ad1d1c971e6a0 -lib/jpeg-static.lib: 50b078fedbf48e2accf55cc1201717d8 -lib/pkgconfig/libjpeg.pc: ef1839c5639ee60768584c29626db8b1 -lib/pkgconfig/libturbojpeg.pc: 53423ccf67af6cc13cc571dd1e7568e0 -lib/turbojpeg-static.lib: c3f43cb91de65238d38bee7051671eff -licenses/LICENSE.md: 2a423a921d0f68082c80ccc7ad808ef2 diff --git a/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.3/qtproject/stable/export/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.5/qtproject/stable/export/conanmanifest.txt index b0bb10ac..ad0ef6f4 100644 --- a/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.3/qtproject/stable/export/conanmanifest.txt +++ b/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.5/qtproject/stable/export/conanmanifest.txt @@ -1,4 +1,4 @@ -1582280120 +1599735572 LICENSE.md: 5aa9930034582b90e2008d2c609d1317 -conanfile.py: fc9f9025d45306204140aafdf174a422 +conanfile.py: b752e9ae1c6b8d65022ecc9094a8a8ab export_source/CMakeLists.txt: eb0fcc86f467a4c6ac9f37c16887a29f diff --git a/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.5/qtproject/stable/package/1655126cc73fa38b3abf5795b2008935595969ae/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.5/qtproject/stable/package/1655126cc73fa38b3abf5795b2008935595969ae/conanmanifest.txt new file mode 100644 index 00000000..a05189ee --- /dev/null +++ b/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.5/qtproject/stable/package/1655126cc73fa38b3abf5795b2008935595969ae/conanmanifest.txt @@ -0,0 +1,12 @@ +1599738045 +conaninfo.txt: 4fbbb44cc5815e6399144d4738128d34 +include/jconfig.h: 364c5b940297dd331dacb42dc5bc3cb9 +include/jerror.h: 9b7898fe417de269b8be88b10df908b0 +include/jmorecfg.h: 7873b0a4457d21a746e23c16fc16127d +include/jpeglib.h: 49b0829e2b84fcd4a0cee359199499cb +include/turbojpeg.h: e5051d1390ea320d22e81c7e73a163ae +lib/libjpeg.a: 1beb177c28bec696d92c96cb12cf50b0 +lib/libturbojpeg.a: 3601472665eebd9ba70a8b4ded622fb7 +lib/pkgconfig/libjpeg.pc: 31670f8efeaaf416c10ef75033a21f89 +lib/pkgconfig/libturbojpeg.pc: 9ec917634a8badf738794da988e0cdd2 +licenses/LICENSE.md: 26d6491346496a57f75f00a78199122e diff --git a/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.5/qtproject/stable/package/1c8544b57637b92dcdfce760b76b459bde0ce701/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.5/qtproject/stable/package/1c8544b57637b92dcdfce760b76b459bde0ce701/conanmanifest.txt new file mode 100644 index 00000000..1407cc56 --- /dev/null +++ b/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.5/qtproject/stable/package/1c8544b57637b92dcdfce760b76b459bde0ce701/conanmanifest.txt @@ -0,0 +1,12 @@ +1599737655 +conaninfo.txt: 1dff9c35ef06cd1f8e1dd7d3fa538a0b +include/jconfig.h: 364c5b940297dd331dacb42dc5bc3cb9 +include/jerror.h: 9b7898fe417de269b8be88b10df908b0 +include/jmorecfg.h: 7873b0a4457d21a746e23c16fc16127d +include/jpeglib.h: 49b0829e2b84fcd4a0cee359199499cb +include/turbojpeg.h: e5051d1390ea320d22e81c7e73a163ae +lib/jpeg-static.lib: 810088c13a0b62845d2a07fb9aedcf7c +lib/pkgconfig/libjpeg.pc: 42c35d08648be46cba25e5c233bb4ceb +lib/pkgconfig/libturbojpeg.pc: f5f04f23108a7e0287c36286668bed72 +lib/turbojpeg-static.lib: 57ccb316b5e241e589e4774d1873d2ea +licenses/LICENSE.md: 26d6491346496a57f75f00a78199122e diff --git a/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.5/qtproject/stable/package/4985763cfece81b148d7c11f16d564e42ee2756c/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.5/qtproject/stable/package/4985763cfece81b148d7c11f16d564e42ee2756c/conanmanifest.txt new file mode 100644 index 00000000..71ab3ac4 --- /dev/null +++ b/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.5/qtproject/stable/package/4985763cfece81b148d7c11f16d564e42ee2756c/conanmanifest.txt @@ -0,0 +1,12 @@ +1599735723 +conaninfo.txt: 96940ef25782fe187ad876a9798aefe6 +include/jconfig.h: 364c5b940297dd331dacb42dc5bc3cb9 +include/jerror.h: 9b7898fe417de269b8be88b10df908b0 +include/jmorecfg.h: 7873b0a4457d21a746e23c16fc16127d +include/jpeglib.h: 49b0829e2b84fcd4a0cee359199499cb +include/turbojpeg.h: e5051d1390ea320d22e81c7e73a163ae +lib/jpeg-static.lib: bac9b04d6d20cb9e29a47c56e1d58e92 +lib/pkgconfig/libjpeg.pc: 8d98a30a9db257c005f7619aa5c0a054 +lib/pkgconfig/libturbojpeg.pc: 79a1c3fce48acb5ad45fd69fc5b5a7e0 +lib/turbojpeg-static.lib: 8e8c7d62afe07877cc07befcafc9b189 +licenses/LICENSE.md: 26d6491346496a57f75f00a78199122e diff --git a/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.5/qtproject/stable/package/6fe55a250d22d4408ba9c4b99015260e933b58f0/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.5/qtproject/stable/package/6fe55a250d22d4408ba9c4b99015260e933b58f0/conanmanifest.txt new file mode 100644 index 00000000..75ec237b --- /dev/null +++ b/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.5/qtproject/stable/package/6fe55a250d22d4408ba9c4b99015260e933b58f0/conanmanifest.txt @@ -0,0 +1,12 @@ +1599736618 +conaninfo.txt: 03f3f4e3fcf5d709d43aaec1f55898dc +include/jconfig.h: 364c5b940297dd331dacb42dc5bc3cb9 +include/jerror.h: 9b7898fe417de269b8be88b10df908b0 +include/jmorecfg.h: 7873b0a4457d21a746e23c16fc16127d +include/jpeglib.h: 49b0829e2b84fcd4a0cee359199499cb +include/turbojpeg.h: e5051d1390ea320d22e81c7e73a163ae +lib/jpeg-static.lib: 3134bba34a47e8c27d20ec4a4588f54d +lib/pkgconfig/libjpeg.pc: e4f3f7cf063e703922623a48759eb548 +lib/pkgconfig/libturbojpeg.pc: 6412ff7d0f49e4b26ea9c17526fcd995 +lib/turbojpeg-static.lib: c01d3cddcc20514a4ed2ab9e0bf6bc79 +licenses/LICENSE.md: 26d6491346496a57f75f00a78199122e diff --git a/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.5/qtproject/stable/package/793aa46df280f94646f5e993f5e3553e18ec8ae9/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.5/qtproject/stable/package/793aa46df280f94646f5e993f5e3553e18ec8ae9/conanmanifest.txt new file mode 100644 index 00000000..fc756487 --- /dev/null +++ b/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.5/qtproject/stable/package/793aa46df280f94646f5e993f5e3553e18ec8ae9/conanmanifest.txt @@ -0,0 +1,12 @@ +1599738143 +conaninfo.txt: 3991de728b2148a357e0adfe83ddff62 +include/jconfig.h: 364c5b940297dd331dacb42dc5bc3cb9 +include/jerror.h: 9b7898fe417de269b8be88b10df908b0 +include/jmorecfg.h: 7873b0a4457d21a746e23c16fc16127d +include/jpeglib.h: 49b0829e2b84fcd4a0cee359199499cb +include/turbojpeg.h: e5051d1390ea320d22e81c7e73a163ae +lib/libjpeg.a: ab32855e9f71865bc026351d8e2e77dc +lib/libturbojpeg.a: a05a8eef4b34c10a68a3e5c7864f55b5 +lib/pkgconfig/libjpeg.pc: afe1d748f5b9331fe322f414eeb8d871 +lib/pkgconfig/libturbojpeg.pc: 5a19528da1aae07f73729acf72ea8d9b +licenses/LICENSE.md: 26d6491346496a57f75f00a78199122e diff --git a/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.5/qtproject/stable/package/7fbb66ade701b46f34dff2e121edef66968608b5/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.5/qtproject/stable/package/7fbb66ade701b46f34dff2e121edef66968608b5/conanmanifest.txt new file mode 100644 index 00000000..7e02159b --- /dev/null +++ b/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.5/qtproject/stable/package/7fbb66ade701b46f34dff2e121edef66968608b5/conanmanifest.txt @@ -0,0 +1,12 @@ +1599737489 +conaninfo.txt: faf97c2c98fbb660379fb96a52f3dcf3 +include/jconfig.h: 364c5b940297dd331dacb42dc5bc3cb9 +include/jerror.h: 9b7898fe417de269b8be88b10df908b0 +include/jmorecfg.h: 7873b0a4457d21a746e23c16fc16127d +include/jpeglib.h: 49b0829e2b84fcd4a0cee359199499cb +include/turbojpeg.h: e5051d1390ea320d22e81c7e73a163ae +lib/jpeg-static.lib: 05604ba0465efd4fe4e8a518e82cdb81 +lib/pkgconfig/libjpeg.pc: 6819f3aec5d0a35187d510fb1034c584 +lib/pkgconfig/libturbojpeg.pc: 7226bc5b0d915e053a1204aba32867cf +lib/turbojpeg-static.lib: efa16bdd47f24831fc02ac0b69912490 +licenses/LICENSE.md: 26d6491346496a57f75f00a78199122e diff --git a/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.5/qtproject/stable/package/9b721b63e452039565ba8417e25a183d1bbcb4df/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.5/qtproject/stable/package/9b721b63e452039565ba8417e25a183d1bbcb4df/conanmanifest.txt new file mode 100644 index 00000000..7e20c844 --- /dev/null +++ b/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.5/qtproject/stable/package/9b721b63e452039565ba8417e25a183d1bbcb4df/conanmanifest.txt @@ -0,0 +1,12 @@ +1599737081 +conaninfo.txt: da8913ab37decb7846f324c2c05b6e56 +include/jconfig.h: 364c5b940297dd331dacb42dc5bc3cb9 +include/jerror.h: 9b7898fe417de269b8be88b10df908b0 +include/jmorecfg.h: 7873b0a4457d21a746e23c16fc16127d +include/jpeglib.h: 49b0829e2b84fcd4a0cee359199499cb +include/turbojpeg.h: e5051d1390ea320d22e81c7e73a163ae +lib/jpeg-static.lib: 9d557bb3f4769b7e3820d71be4189cfb +lib/pkgconfig/libjpeg.pc: 1bcb08ffc4f83b2306ff794ad5c2b91c +lib/pkgconfig/libturbojpeg.pc: b9783de5729e5835e41a35cb2f5fa568 +lib/turbojpeg-static.lib: 09609dcfdad02bed5bf00e348fff8807 +licenses/LICENSE.md: 26d6491346496a57f75f00a78199122e diff --git a/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.5/qtproject/stable/package/acb703d92685c00a6f85ed3ca8225725f0e186c1/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.5/qtproject/stable/package/acb703d92685c00a6f85ed3ca8225725f0e186c1/conanmanifest.txt new file mode 100644 index 00000000..14fdfebb --- /dev/null +++ b/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.5/qtproject/stable/package/acb703d92685c00a6f85ed3ca8225725f0e186c1/conanmanifest.txt @@ -0,0 +1,12 @@ +1599736121 +conaninfo.txt: d3b27ba63fbdcf067b5f4afd1a1fdef0 +include/jconfig.h: 364c5b940297dd331dacb42dc5bc3cb9 +include/jerror.h: 9b7898fe417de269b8be88b10df908b0 +include/jmorecfg.h: 7873b0a4457d21a746e23c16fc16127d +include/jpeglib.h: 49b0829e2b84fcd4a0cee359199499cb +include/turbojpeg.h: e5051d1390ea320d22e81c7e73a163ae +lib/jpeg-static.lib: bcdd30b7636c7ed8f0e6dbfb97729c31 +lib/pkgconfig/libjpeg.pc: e124d9000016d4fa108588c91087d060 +lib/pkgconfig/libturbojpeg.pc: 6b112424701322f51d06015089920210 +lib/turbojpeg-static.lib: 7d9c9ee5fb38b856bb9424a2ae5f9bbd +licenses/LICENSE.md: 26d6491346496a57f75f00a78199122e diff --git a/coin/provisioning/common/windows/conan_manifests/libxml2/2.9.10/qtproject/stable/package/22d88c0e3f63872fe31c5fa40fc8085250867c11/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libxml2/2.9.10/qtproject/stable/package/1955c51c7e0a6365c20c2d798832186de95c0213/conanmanifest.txt index 975f4f5d..aba8aa87 100644 --- a/coin/provisioning/common/windows/conan_manifests/libxml2/2.9.10/qtproject/stable/package/22d88c0e3f63872fe31c5fa40fc8085250867c11/conanmanifest.txt +++ b/coin/provisioning/common/windows/conan_manifests/libxml2/2.9.10/qtproject/stable/package/1955c51c7e0a6365c20c2d798832186de95c0213/conanmanifest.txt @@ -1,9 +1,9 @@ -1582270297 -bin/libxml2-2.dll: 47b3af0297a53e146d739ba46b957ac9 -bin/xml2-config: f002e2e4fcc1ac7a3ed6a93044a99de1 -bin/xmlcatalog.exe: f51848350034b8b6010fd11f6e3aa10f -bin/xmllint.exe: 689e7c9b94aff9b39383164b13412623 -conaninfo.txt: ea32a81840ad020d92e3c678a2b31ab7 +1599827075 +bin/libxml2-2.dll: aaf2802bcdbb62e364d33d4307c2f656 +bin/xml2-config: b0691a0a3ab1546612090cb77b4f29bb +bin/xmlcatalog.exe: ceb3b58dd442e7a174d60a400b485355 +bin/xmllint.exe: 542a2dc43a32156244634f496afdad71 +conaninfo.txt: e494fa1f215b7080df24fc4bf487250b include/libxml2/libxml/DOCBparser.h: 21e6523a86338325c527e1e8847adc1d include/libxml2/libxml/HTMLparser.h: d57891c89573ed6dce04b8133e7438d2 include/libxml2/libxml/HTMLtree.h: 46cf4cefb419e18c40b8d5b6ac982f3f @@ -53,6 +53,6 @@ include/libxml2/libxml/xpathInternals.h: c18fad3cce22369a75166afed6343bcd include/libxml2/libxml/xpointer.h: 5b8025430888d5b99d03d159ddc78388 include/libxml2/win32config.h: e51ff5a65571584fbe45f75eede0ee3e include/libxml2/wsockcompat.h: fd8ce4d6dabe53035a28c6aa64926b1c -lib/libxml2.dll.a: 843beb5d307eda9c6600f02a2cd3f701 -lib/xml2Conf.sh: 26c219db3da9c216926f8894c096409b +lib/libxml2.dll.a: e9e9bb7eed77331a47e228a1a8f4c0c5 +lib/xml2Conf.sh: 1ac09ea07a1d73a25e8478e5911da219 licenses/COPYING: 2044417e2e5006b65a8b9067b683fcf1 diff --git a/coin/provisioning/common/windows/conan_manifests/libxml2/2.9.10/qtproject/stable/package/260f4ea2f609c699c16e114aec312888ec0a10b0/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libxml2/2.9.10/qtproject/stable/package/852e73d42d44dff3fe4b6ed5d6a4546250ec180e/conanmanifest.txt index c7c8ae44..e99d69b5 100644 --- a/coin/provisioning/common/windows/conan_manifests/libxml2/2.9.10/qtproject/stable/package/260f4ea2f609c699c16e114aec312888ec0a10b0/conanmanifest.txt +++ b/coin/provisioning/common/windows/conan_manifests/libxml2/2.9.10/qtproject/stable/package/852e73d42d44dff3fe4b6ed5d6a4546250ec180e/conanmanifest.txt @@ -1,9 +1,9 @@ -1582270098 -bin/libxml2-2.dll: 0a707dea653e54ed8606c66cb4af5eca -bin/xml2-config: f90c21a49ff66959f9370243e8aeb274 -bin/xmlcatalog.exe: 1f51631564d0df1e2eb7bab1e744797f -bin/xmllint.exe: 705805f98a8ee9045078d6d91a1e076b -conaninfo.txt: 5d6fafed34bc3f9e5dce2ad99f65aba0 +1599827195 +bin/libxml2-2.dll: dccd1b6cf7425125913b2095ff8eccc2 +bin/xml2-config: e93ed273bc16d12c4f8ecff87ceaaf79 +bin/xmlcatalog.exe: 0b575f8389ac5a8e397c3cde88babb85 +bin/xmllint.exe: 5a63ba2b6556ef0ae20436495c28355c +conaninfo.txt: 13134884f7be0e49d19552cd3423b91b include/libxml2/libxml/DOCBparser.h: 21e6523a86338325c527e1e8847adc1d include/libxml2/libxml/HTMLparser.h: d57891c89573ed6dce04b8133e7438d2 include/libxml2/libxml/HTMLtree.h: 46cf4cefb419e18c40b8d5b6ac982f3f @@ -53,6 +53,6 @@ include/libxml2/libxml/xpathInternals.h: c18fad3cce22369a75166afed6343bcd include/libxml2/libxml/xpointer.h: 5b8025430888d5b99d03d159ddc78388 include/libxml2/win32config.h: e51ff5a65571584fbe45f75eede0ee3e include/libxml2/wsockcompat.h: fd8ce4d6dabe53035a28c6aa64926b1c -lib/libxml2.dll.a: 849838d8f7d5dcbcb16097dbdabee707 -lib/xml2Conf.sh: d980a83ab1cdd3637ee4fc3aeb75733c +lib/libxml2.dll.a: 176eb6473b51dd69835b6213fcc40b19 +lib/xml2Conf.sh: 8713c5cd801bb525b6758a22a65c2a2e licenses/COPYING: 2044417e2e5006b65a8b9067b683fcf1 diff --git a/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.34/qtproject/stable/export/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.34/qtproject/stable/export/conanmanifest.txt index b8f7a946..77017cff 100644 --- a/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.34/qtproject/stable/export/conanmanifest.txt +++ b/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.34/qtproject/stable/export/conanmanifest.txt @@ -1,4 +1,4 @@ -1582270556 +1599827656 LICENSE.md: d9f691088a6aaf0589397de712404f23 -conanfile.py: fdaa2f193e25d36dbf5b92a0f6567611 -export_source/patches/0001-remove-with-profiler.patch: 44c783ce23e5be1360ef1521b1427da3 +conanfile.py: 1a377def24ec5c2878da1d9d97a2c39c +export_source/patches/Add-configuration-for-profiler.diff: 5207625dda27ca22cf49f7b136dc6585 diff --git a/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.34/qtproject/stable/package/ae932df57acef9c094443d5579df1a9b72790e1a/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.34/qtproject/stable/package/7e451536519482997336e237346b93d95b87eb32/conanmanifest.txt index a9d50c77..dcedf88b 100644 --- a/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.34/qtproject/stable/package/ae932df57acef9c094443d5579df1a9b72790e1a/conanmanifest.txt +++ b/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.34/qtproject/stable/package/7e451536519482997336e237346b93d95b87eb32/conanmanifest.txt @@ -1,9 +1,9 @@ -1582271749 -bin/libexslt-0.dll: 4b9cbde76ca3933da5a551bccc952ec4 -bin/libxslt-1.dll: 819776a46fa5031884953e1ad3e0e753 -bin/xslt-config: 7425a897e93c2b35d098d21de286564b -bin/xsltproc.exe: b7198489b916c3f5936284418d756f80 -conaninfo.txt: fd798c9d2cde468877c2c25020e44443 +1599827930 +bin/libexslt-0.dll: ff772bdd16e06a28bbbbbf509dace06f +bin/libxslt-1.dll: eccc32869a72838b9a8092e40d9ee7a2 +bin/xslt-config: 438e5a0d83ce7648c0bcb64446bd2874 +bin/xsltproc.exe: 5e2fe2b2465d07b4bad0ce6a90f61702 +conaninfo.txt: c74c15f161d0366c1f8b8ae6157be410 include/libexslt/exslt.h: f01af3bf058520059ba6d50f42133717 include/libexslt/exsltconfig.h: eb4297a735f2666c5872067c25f16005 include/libexslt/exsltexports.h: 03a75a174bc5b056f014e592cfd4db36 @@ -24,16 +24,16 @@ include/libxslt/transform.h: ccbcce4553f3231003b1944002814246 include/libxslt/variables.h: ebd9b3b1f996c4a2ed79d4473ff0fd77 include/libxslt/xslt.h: 0c08b8e7223b72f822a58457520b6387 include/libxslt/xsltInternals.h: 0c245b0fcc81bf537632a45adf8fcffb -include/libxslt/xsltconfig.h: e49047ac857ae0fea24b99ee4c56de62 +include/libxslt/xsltconfig.h: b932ebe3a2edfd7b6e42c6ccab09105f include/libxslt/xsltexports.h: 751f95448e71222d8e10d31ebf8822df include/libxslt/xsltlocale.h: d7b200e408cefe5082b15d3a5e1bf600 include/libxslt/xsltutils.h: 5f7848088182b183e6d1fdb335b2616a -lib/libexslt.dll.a: a27a9df2d4b7cf070377a32e10961027 -lib/libexslt.la: 036e99c1bab6a8d3a63471ad94d13aaf -lib/libxslt.dll.a: 5bf3583373ca584df267b766c3e9cb3e -lib/pkgconfig/libexslt.pc: a9e14aa113bd8c105df76410e046b233 -lib/pkgconfig/libxslt.pc: 12169caf9654c69c90e0e0c0f98776ad -lib/xsltConf.sh: 5fa057a4733819c38f5c55d1ce50fd48 +lib/libexslt.dll.a: 7bd46b7300a66f8ce59b2899c66544e2 +lib/libexslt.la: fa24e93ffd0896a1e4aeeb7bfbc39c0b +lib/libxslt.dll.a: ceb051c0397694811816950fc670681b +lib/pkgconfig/libexslt.pc: be5f747c35a550775cb2367bdb4a7384 +lib/pkgconfig/libxslt.pc: ebc9b2f108096aec1ddf30f4c45855ec +lib/xsltConf.sh: baa711dd9eb12d5855ef8fa782129519 licenses/COPYING: 0cd9a07afbeb24026c9b03aecfeba458 share/aclocal/libxslt.m4: 7b0b8b6bd86eea30c617663c9e9439b3 share/doc/libxslt-1.1.34/html/API.html: 205e063f09d60a36b44a61c6b7af0af9 diff --git a/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.34/qtproject/stable/package/b06e2211adc32e230f2d9e729d1dcad2648782e8/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.34/qtproject/stable/package/d4099b870b7e1ab748c13f5751cb2d32f893a78f/conanmanifest.txt index bd393d41..e1a69a64 100644 --- a/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.34/qtproject/stable/package/b06e2211adc32e230f2d9e729d1dcad2648782e8/conanmanifest.txt +++ b/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.34/qtproject/stable/package/d4099b870b7e1ab748c13f5751cb2d32f893a78f/conanmanifest.txt @@ -1,9 +1,9 @@ -1582271938 -bin/libexslt-0.dll: 1561e984c203d94cdfcf78235ecfe43a -bin/libxslt-1.dll: 0174f89e8ec9e26aee9e665e686214b9 -bin/xslt-config: 6e477e88682bb878d649b48d48de3b3d -bin/xsltproc.exe: 3cd6a8754d4e21dec52c8dab720cfcf3 -conaninfo.txt: fb9e8ed7e2ab80afd38743a228fd5ac9 +1599827795 +bin/libexslt-0.dll: a3e52849942745520c13c2d20135ada7 +bin/libxslt-1.dll: e6a19c28494ef3e908d869598b79c97a +bin/xslt-config: bf300e18f495cea8591f79fdb0520d06 +bin/xsltproc.exe: 0d34ec7f2847d75a4140d5221366ae75 +conaninfo.txt: d905a86a351921bb21c973326d39e9de include/libexslt/exslt.h: f01af3bf058520059ba6d50f42133717 include/libexslt/exsltconfig.h: eb4297a735f2666c5872067c25f16005 include/libexslt/exsltexports.h: 03a75a174bc5b056f014e592cfd4db36 @@ -24,16 +24,16 @@ include/libxslt/transform.h: ccbcce4553f3231003b1944002814246 include/libxslt/variables.h: ebd9b3b1f996c4a2ed79d4473ff0fd77 include/libxslt/xslt.h: 0c08b8e7223b72f822a58457520b6387 include/libxslt/xsltInternals.h: 0c245b0fcc81bf537632a45adf8fcffb -include/libxslt/xsltconfig.h: e23457bb8ef22a6dc617d413679d59ca +include/libxslt/xsltconfig.h: 77d836d8d0a9b2fdd6bea3d379696d80 include/libxslt/xsltexports.h: 751f95448e71222d8e10d31ebf8822df include/libxslt/xsltlocale.h: d7b200e408cefe5082b15d3a5e1bf600 include/libxslt/xsltutils.h: 5f7848088182b183e6d1fdb335b2616a -lib/libexslt.dll.a: 3fee05595887faea3d7022483bf8ab9d -lib/libexslt.la: 1ea05e967d865f7ac83d66aeef3f9740 -lib/libxslt.dll.a: b42e5789521163430675d263374e745e -lib/pkgconfig/libexslt.pc: 40e4bf2205e0bcc91529683218d7b53a -lib/pkgconfig/libxslt.pc: 296b763342f742c10accc1cd9b08dd08 -lib/xsltConf.sh: dab0389225bc7e3b47e502c8a6496ff0 +lib/libexslt.dll.a: f86f6868818b72c97c977e182700d479 +lib/libexslt.la: d0c4257b491be8cf3c45d5e01b7ffb96 +lib/libxslt.dll.a: 461a9372775da06a0747728a1b505ae2 +lib/pkgconfig/libexslt.pc: ba1963709ee3ecc7323aaf188404f144 +lib/pkgconfig/libxslt.pc: 9ef33a36710bc31556d1038e27e2510d +lib/xsltConf.sh: 9b2f5a93679c6e963d8bf3d6efa46591 licenses/COPYING: 0cd9a07afbeb24026c9b03aecfeba458 share/aclocal/libxslt.m4: 7b0b8b6bd86eea30c617663c9e9439b3 share/doc/libxslt-1.1.34/html/API.html: 205e063f09d60a36b44a61c6b7af0af9 diff --git a/coin/provisioning/common/windows/conan_manifests/zlib/1.2.11/qtproject/stable/export/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/zlib/1.2.11/qtproject/stable/export/conanmanifest.txt deleted file mode 100644 index dc3fe965..00000000 --- a/coin/provisioning/common/windows/conan_manifests/zlib/1.2.11/qtproject/stable/export/conanmanifest.txt +++ /dev/null @@ -1,7 +0,0 @@ -1582277614 -FindZLIB.cmake: 0ec128c2f97a3a6d7e800d3204e5c94f -LICENSE: 1ac8330e79e050867144e174d80880f7 -conanfile.py: c7aba1a732c28bb9851cb50acf3f7a4d -export_source/CMakeLists.txt: b45a8f19ed120e922c1cb720c0e4a7c7 -export_source/CMakeLists_minizip.txt: 7b2c2a9ab51d0ba37b5ca35da21579b7 -export_source/minizip.patch: dc8ffe80d334f8e5b1bb967593fe2d4a diff --git a/coin/provisioning/common/windows/conan_manifests/zlib/1.2.11/qtproject/stable/package/5a14faea650589a68f33a6a5b0207a4a852a5f1d/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/zlib/1.2.11/qtproject/stable/package/5a14faea650589a68f33a6a5b0207a4a852a5f1d/conanmanifest.txt deleted file mode 100644 index 239d5b82..00000000 --- a/coin/provisioning/common/windows/conan_manifests/zlib/1.2.11/qtproject/stable/package/5a14faea650589a68f33a6a5b0207a4a852a5f1d/conanmanifest.txt +++ /dev/null @@ -1,9 +0,0 @@ -1582279989 -FindZLIB.cmake: 0ec128c2f97a3a6d7e800d3204e5c94f -conaninfo.txt: 40e76e93e86476bbd92e1e82b71d04bb -include/zconf.h: 931d0dd891d90ace1eab7a46125a8bda -include/zlib.h: 0338828e9d00c94645648b1517108324 -lib/libzlib.a: 7e55bbef492eceaf8101e433e2a46720 -lib/pkgconfig/zlib.pc: 29adeed07108745c3562dc19343f3d99 -licenses/LICENSE: 1af2e5353c16e930435fff550f827c3e -zlib.pc: 29adeed07108745c3562dc19343f3d99 diff --git a/coin/provisioning/common/windows/conan_requirements.txt b/coin/provisioning/common/windows/conan_requirements.txt index 7097de1e..078158e8 100644 --- a/coin/provisioning/common/windows/conan_requirements.txt +++ b/coin/provisioning/common/windows/conan_requirements.txt @@ -1,33 +1,33 @@ -# Generated for conan==1.22.2 -appdirs==1.4.3 +# Generated for conan==1.29.0 +appdirs==1.4.4 bottle==0.12.18 -certifi==2019.11.28 +certifi==2020.6.20 chardet==3.0.4 colorama==0.4.3 -conan==1.22.2 +conan==1.29.0 deprecation==2.0.7 -distlib==0.3.0 -distro==1.1.0 +distlib==0.3.1 +distro==1.5.0 fasteners==0.15 filelock==3.0.12 future==0.18.2 -idna==2.9 -importlib-metadata==1.5.0 -Jinja2==2.11.1 +idna==2.10 +importlib-metadata==1.7.0 +Jinja2==2.11.2 MarkupSafe==1.1.1 monotonic==1.5 node-semver==0.6.1 -packaging==20.1 -patch-ng==1.17.2 -pluginbase==0.7 -Pygments==2.5.2 +packaging==20.4 +patch-ng==1.17.4 +pluginbase==1.0.0 +Pygments==2.7.0 PyJWT==1.7.1 -pyparsing==2.4.6 +pyparsing==2.4.7 python-dateutil==2.8.1 -PyYAML==5.3 -requests==2.23.0 -six==1.14.0 -tqdm==4.43.0 -urllib3==1.25.8 -virtualenv==20.0.4 -zipp==2.2.0 +PyYAML==5.3.1 +requests==2.24.0 +six==1.15.0 +tqdm==4.49.0 +urllib3==1.25.10 +virtualenv==20.0.31 +zipp==3.1.0 diff --git a/coin/provisioning/common/windows/disable-netadapterlso.ps1 b/coin/provisioning/common/windows/disable-netadapterlso.ps1 index ca7ad3ca..2df955b9 100644 --- a/coin/provisioning/common/windows/disable-netadapterlso.ps1 +++ b/coin/provisioning/common/windows/disable-netadapterlso.ps1 @@ -1 +1,2 @@ -Disable-NetAdapterLso Ethernet +Disable-NetAdapterLso "Ethernet 2" +Start-Sleep -s 15 # Give windows some time to adjust network settings diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/90-python-modules.sh b/coin/provisioning/common/windows/install-azure-tool.ps1 index 8a3fc7b9..937804fd 100755..100644 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/90-python-modules.sh +++ b/coin/provisioning/common/windows/install-azure-tool.ps1 @@ -1,8 +1,6 @@ -#!/usr/bin/env bash - ############################################################################# ## -## 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. @@ -32,8 +30,11 @@ ## $QT_END_LICENSE$ ## ############################################################################# +. "$PSScriptRoot\helpers.ps1" + +# This script will install Azure singtool using Dotnet SDK +$dotnet = "C:\Program Files\dotnet\dotnet.exe" -set -ex +$version = "2.0.17" +Run-Executable "$dotnet" "tool install --global AzureSignTool --version $version" -# shellcheck source=../common/unix/python-modules.sh -source "${BASH_SOURCE%/*}/../common/unix/python-modules.sh" diff --git a/coin/provisioning/common/windows/install-dotnet.ps1 b/coin/provisioning/common/windows/install-dotnet.ps1 new file mode 100644 index 00000000..8578c9b4 --- /dev/null +++ b/coin/provisioning/common/windows/install-dotnet.ps1 @@ -0,0 +1,59 @@ +############################################################################# +## +## 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$ +## +############################################################################# +. "$PSScriptRoot\helpers.ps1" + +# This script will install Dotnet SDK which is required for Azure installation + +$version = "2.1" +if (Is64BitWinHost) { + $urlCache = "http://ci-files01-hki.intra.qt.io/input/windows/dotnet-sdk-2.1.809-win-x64.exe" + $urlOfficial = "https://download.visualstudio.microsoft.com/download/pr/c980b6fb-e570-4c73-b344-e4dae6573777/f844ac1a4c6ea5de7227a701786126fd/dotnet-sdk-2.1.809-win-x64.exe" + $sha1 = "343e80c2ab558a30696dbe03ad2288bf435d5cd8" +} else { + $urlCache = "http://ci-files01-hki.intra.qt.io/input/windows/dotnet-sdk-2.1.809-win-x86.exe" + $urlOfficial = "https://download.visualstudio.microsoft.com/download/pr/cf86a2f3-f6b2-4959-8e41-cf84b0d2f294/a61e834f56abe2dc2e12599e1a60c10b/dotnet-sdk-2.1.809-win-x86.exe" + $sha1 = "b38a4e1392f17aed110508a1687f1c65b9d86161" +} +$installer = "C:\Windows\Temp\dotnet-sdk-$version.exe" + +Write-Host "Installing Dotnet SDK $version" +Download $urlOfficial $urlCache $installer +Verify-Checksum $installer $sha1 +Run-Executable "$installer" "/install /passive" +Prepend-Path "C:\Program Files\dotnet" +Remove $installer + +Write-Output "Dotnet SDK = $version" >> ~/versions.txt + + + diff --git a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2015_update.ps1 b/coin/provisioning/common/windows/install-mcuxpresso.ps1 index 69f3e27b..08647fad 100644..100755 --- a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2015_update.ps1 +++ b/coin/provisioning/common/windows/install-mcuxpresso.ps1 @@ -1,6 +1,6 @@ -############################################################################# +############################################################################ ## -## 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. @@ -31,21 +31,16 @@ ## ############################################################################# -# 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" +. "$PSScriptRoot\helpers.ps1" -# 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 +# This script installs NXP MCUXpresso IDE +# MCUXpresso IDE provides the tools for flashing and onboard debugging -# 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" +$version = "11.2.0_4120" +$url = "http://ci-files01-hki.intra.qt.io/input/windows/MCUXpressoIDE_$version.zip" +$zip = "C:\Windows\Temp\MCUXpressoIDE_$version.zip" -echo "Visual Studio = $version version $version_number" >> ~\versions.txt +Download $url $url $zip +Extract-7Zip $zip C: +Rename-Item C:\MCUXpressoIDE_$version C:\MCUXpressoIDE +Write-Output "MCUXpresso IDE = $version" >> ~/versions.txt diff --git a/coin/provisioning/common/windows/install-msys2.ps1 b/coin/provisioning/common/windows/install-msys2.ps1 index 784b09dc..2be0d35c 100644 --- a/coin/provisioning/common/windows/install-msys2.ps1 +++ b/coin/provisioning/common/windows/install-msys2.ps1 @@ -33,46 +33,50 @@ . "$PSScriptRoot\helpers.ps1" -# This script installs 7-Zip +# This script will installs msys2 -$version = "20181211" +$version = "20200903" $prog = "msys2" -if (Is64BitWinHost) { - $arch = "x86_64" - $sha1 = "d689ff74fd060934bd7aaf458a11db67833463c2" - $folder = "msys64" -} else { - $arch = "i686" - $sha1 = "928f9d1537d1a77dc7f2adab74fb438e7d11a98e" - $folder = "msys32" -} -$package = $prog + "-base-" + $arch + "-" + $version + ".tar.xz" +$arch = "x86_64" +$sha1 = "5a1644585fac2d58855d48b4ba4a92579a14cf03" +$sha1_prebuilt = "d86d45d72228f53f7ae060771bc95b6f54c703c8" +$folder = "msys64" +$package_prebuilt = $folder + "_" + $version + "_prebuilt.7z" +$package = $prog + "-base-" + $arch + "-" + $version + ".tar.xz" +$url_cache_prebuilt = "\\ci-files01-hki.intra.qt.io\provisioning\windows\$package_prebuilt" $url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\$package" $url_official = "http://repo.msys2.org/distrib/$arch/$package" -$PackagePath = "C:\Windows\Temp\$package" $TargetLocation = "C:\Utils" -Download $url_official $url_cache $PackagePath -Verify-Checksum $PackagePath $sha1 -Extract-tar_gz $PackagePath $TargetLocation -$msys = "$TargetLocation\$folder\msys2_shell.cmd" +if ((Test-Path $url_cache_prebuilt)) { + $PackagePath = "C:\Windows\Temp\$package_prebuilt" + Download $url_cache_prebuilt $url_cache_prebuilt $PackagePath + Verify-Checksum $PackagePath $sha1_prebuilt + Extract-7Zip $PackagePath $TargetLocation +} else { + $PackagePath = "C:\Windows\Temp\$package" + Download $url_official $url_cache $PackagePath + Verify-Checksum $PackagePath $sha1 + Extract-tar_gz $PackagePath $TargetLocation + $msys = "$TargetLocation\$folder\msys2_shell.cmd" -# install perl -# 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`"" + # install perl + # 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 60 + cmd /c "$msys `"-l`" `"-c`" `"echo y | 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 } + # 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 360 + 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" -Write-Output "7-Zip = $version" >> ~\versions.txt +Write-Output "msys2 = $version" >> ~\versions.txt diff --git a/coin/provisioning/common/windows/install-stm32cubeprogrammer.ps1 b/coin/provisioning/common/windows/install-stm32cubeprogrammer.ps1 new file mode 100644 index 00000000..a5eba038 --- /dev/null +++ b/coin/provisioning/common/windows/install-stm32cubeprogrammer.ps1 @@ -0,0 +1,50 @@ +############################################################################ +## +## 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$ +## +############################################################################# + +. "$PSScriptRoot\helpers.ps1" + +# This script will install STM32CubeProgrammer software needed by MCU RTA +# Official donwload from https://www.st.com/en/development-tools/stm32cubeprog.html + +$version ="2_5_0" +$url = "http://ci-files01-hki.ci.local/input/windows/STMicroelectronics_v${version}.zip" +$zip = "C:\Windows\Temp\STMicroelectronics_v${version}.zip" + +Download $url $url $zip +Extract-7Zip $zip "C:\Program Files" +Remove-Item -Recurse -Force -Path $zip + +Write-Output "STM32CubeProgrammer = $version" >> ~/versions.txt + + + diff --git a/coin/provisioning/common/windows/libclang-v100-dyn.ps1 b/coin/provisioning/common/windows/libclang-v100-dyn.ps1 new file mode 100644 index 00000000..b0792a07 --- /dev/null +++ b/coin/provisioning/common/windows/libclang-v100-dyn.ps1 @@ -0,0 +1,50 @@ +param( + [Int32]$archVer=32, + [string]$toolchain="vs2019", + [bool]$setDefault=$true +) +. "$PSScriptRoot\helpers.ps1" + +$libclang_version="10.0" +Write-Output "libClang for QtForPython = $libclang_version" >> ~/versions.txt + +# PySide versions following Qt6 use a C++ parser based on Clang (http://clang.org/). +# The Clang library (C-bindings), version 8.0 or higher is required for building. + +# Starting from Qt 5.11 QDoc requires Clang to parse C++ + +$baseDestination = "C:\Utils\libclang-" + $libclang_version + "-dynlibs-" + $toolchain +$libclang_version = $libclang_version -replace '["."]' + +function install() { + + param( + [string]$sha1=$1, + [string]$destination=$2 + ) + + $zip = "c:\users\qt\downloads\libclang-dyn.7z" + + $script:OfficialUrl = "https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_$libclang_version-based-windows-$toolchain`_$archVer.7z" + $script:CachedUrl = "http://ci-files01-hki.intra.qt.io/input/libclang/libclang-release_$libclang_version-based-windows-$toolchain`_$archVer.7z" + + Download $OfficialUrl $CachedUrl $zip + Verify-Checksum $zip $sha1 + Extract-7Zip $zip C:\Utils\ + Rename-Item C:\Utils\libclang $destination + Remove-Item -Force -Path $zip +} + +if ( $toolchain -eq "vs2019" ) { + if ( $archVer -eq 64 ) { + $sha1 = "B2C4F24B2388AEBAA6B8FCE3AE4E63D34D1517FE" + } + else { + $sha1 = "b970f51df255a27e0fdb7b665e70ed5281257f40" + } +} + +install $sha1 $baseDestination-$archVer + +Set-EnvironmentVariable "LLVM_DYNAMIC_LIBS_100" ($baseDestination + "-_ARCH_") + diff --git a/coin/provisioning/common/windows/nodejs.ps1 b/coin/provisioning/common/windows/nodejs.ps1 index c56f6db6..24b06751 100644 --- a/coin/provisioning/common/windows/nodejs.ps1 +++ b/coin/provisioning/common/windows/nodejs.ps1 @@ -37,25 +37,25 @@ # Needed by QtWebengine $version = "12.18.0" -$package = "C:\Windows\temp\nodejs-$version.zip" -$targetFolder = "C:\Utils\nodejs" -$arch = "$((Get-WmiObject Win32_Processor).AddressWidth)" -$externalUrl = "https://nodejs.org/dist/v$version/node-v$version-win-x$arch.zip" -$internalUrl = "http://ci-files01-hki.intra.qt.io/input/windows/node-v$version-win-x$arch.zip" - -if ( $arch -eq 64 ) { +if (Is64BitWinHost) { + $arch = "x64" $sha1 = "457b1527d249ee471a9445953a906cb10c75378d" } else { + $arch = "x86" $sha1 = "58801900f5bddca9c00feed6b84fed729426fc92" - } +$package = "C:\Windows\temp\nodejs-$version.zip" +$targetFolder = "C:\Utils" +$installFolder = "C:\Utils\node-v$version-win-$arch" +$externalUrl = "https://nodejs.org/dist/v$version/node-v$version-win-$arch.zip" +$internalUrl = "http://ci-files01-hki.intra.qt.io/input/windows/node-v$version-win-$arch.zip" + Write-Host "Installing Node.js" Download $externalUrl $internalUrl $package Verify-Checksum $package $sha1 -mkdir $targetFolder Extract-7Zip $package $targetFolder -Add-Path $targetFolder +Add-Path $installFolder Remove $package Write-Output "Node.js = $version" >> ~/versions.txt diff --git a/coin/provisioning/common/windows/openssl.ps1 b/coin/provisioning/common/windows/openssl.ps1 index 891f5db7..08f7d60f 100644 --- a/coin/provisioning/common/windows/openssl.ps1 +++ b/coin/provisioning/common/windows/openssl.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 OpenSSL $version. # Both x86 and x64 versions needed when x86 integrations are done on x64 machine -$version = "1_1_1d" +$version = "1_1_1g" $packagex64 = "C:\Windows\Temp\Win64OpenSSL-$version.exe" $packagex86 = "C:\Windows\Temp\Win32OpenSSL-$version.exe" @@ -47,7 +47,7 @@ if (Is64BitWinHost) { $installFolder = "C:\openssl" $externalUrl = "https://slproweb.com/download/Win64OpenSSL-$version.exe" $internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\Win64OpenSSL-$version.exe" - $sha1 = "df9c40e9e82edf693c15302cbc8e8a057857a13c" + $sha1 = "7643561c372720f55de51454a707ede334db086e" Write-Host "Fetching from URL ..." Download $externalUrl $internalUrl $packagex64 @@ -74,7 +74,7 @@ if (Is64BitWinHost) { $externalUrl = "https://slproweb.com/download/Win32OpenSSL-$version.exe" $internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\Win32OpenSSL-$version.exe" -$sha1 = "5c49ccd3a5d17f63d25fb819963978f50c7966d0" +$sha1 = "c7d4b096c2413d1af819ccb291214fa3c4cece07" Write-Host "Fetching from URL ..." Download $externalUrl $internalUrl $packagex86 diff --git a/coin/provisioning/common/windows/python.ps1 b/coin/provisioning/common/windows/python.ps1 index 342358d5..ab094ffa 100644 --- a/coin/provisioning/common/windows/python.ps1 +++ b/coin/provisioning/common/windows/python.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. @@ -54,8 +54,30 @@ $internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\windows\python-$versio Write-Host "Fetching from URL..." Download $externalUrl $internalUrl $package Verify-Checksum $package $sha1 -Write-Host "Installing $package..." -Run-Executable "msiexec" "/passive /i $package TARGETDIR=$targetDir ALLUSERS=1" + +# Python installation is flaky, but seems to pass with second run if error occurs. +$stop = $false +[int]$retry = "0" +do { + try { + # /levx = e:'All error messages' v:'Verbose' x:'Extra debugging info' + Run-Executable "msiexec" "/passive /i $package /levx C:\Windows\Temp\Python_log.log TARGETDIR=$targetDir ALLUSERS=1" + $stop = $true + } + catch { + Get-Content C:\Windows\Temp\Python_log.log -Tail 50 + if ($retry -gt 2) { + Write-Host "Python installation failed!" + throw + } + else { + Write-Host "Couldn't install python, retrying in 30 seconds" + Start-Sleep -s 30 + $retry = $retry + 1 + } + } +} +while ($stop -ne $true) # We need to change allowZip64 from 'False' to 'True' to be able to create ZIP files that use the ZIP64 extensions when the zipfile is larger than 2 GB Write-Host "Changing allowZip64 value to 'True'..." diff --git a/coin/provisioning/common/windows/python3.ps1 b/coin/provisioning/common/windows/python3.ps1 index 8fbd615c..58cd25c5 100644 --- a/coin/provisioning/common/windows/python3.ps1 +++ b/coin/provisioning/common/windows/python3.ps1 @@ -35,12 +35,14 @@ # This script installs Python $version. # Python3 is required for building some qt modules. param( - [Int32]$archVer=32, - [string]$install_path = "C:\Python36" + [Int32]$archVer, + [string]$sha1, + [string]$install_path, + [string]$version, + [bool]$setDefault=$false ) . "$PSScriptRoot\helpers.ps1" -$version = "3.6.1" $package = "C:\Windows\temp\python-$version.exe" # check bit version @@ -48,11 +50,9 @@ if ( $archVer -eq 64 ) { Write-Host "Installing 64 bit Python" $externalUrl = "https://www.python.org/ftp/python/$version/python-$version-amd64.exe" $internalUrl = "http://ci-files01-hki.intra.qt.io/input/windows/python-$version-amd64.exe" - $sha1 = "bf54252c4065b20f4a111cc39cf5215fb1edccff" } else { $externalUrl = "https://www.python.org/ftp/python/$version/python-$version.exe" $internalUrl = "http://ci-files01-hki.intra.qt.io/input/windows/python-$version.exe" - $sha1 = "76c50b747237a0974126dd8b32ea036dd77b2ad1" } Write-Host "Fetching from URL..." @@ -65,11 +65,19 @@ Remove-Item -Path $package # For cross-compilation we export some helper env variable if (($archVer -eq 32) -And (Is64BitWinHost)) { - Set-EnvironmentVariable "PYTHON3_32_PATH" "$install_path" - Set-EnvironmentVariable "PIP3_32_PATH" "$install_path\Scripts" + if ($setDefault) { + Set-EnvironmentVariable "PYTHON3_32_PATH" "$install_path" + Set-EnvironmentVariable "PIP3_32_PATH" "$install_path\Scripts" + } + Set-EnvironmentVariable "PYTHON$version-32_PATH" "$install_path" + Set-EnvironmentVariable "PIP$version-32_PATH" "$install_path\Scripts" } else { - Set-EnvironmentVariable "PYTHON3_PATH" "$install_path" - Set-EnvironmentVariable "PIP3_PATH" "$install_path\Scripts" + if ($setDefault) { + Set-EnvironmentVariable "PYTHON3_PATH" "$install_path" + Set-EnvironmentVariable "PIP3_PATH" "$install_path\Scripts" + } + Set-EnvironmentVariable "PYTHON$version-64_PATH" "$install_path" + Set-EnvironmentVariable "PIP$version-64_PATH" "$install_path\Scripts" } @@ -88,7 +96,13 @@ Run-Executable "$install_path\Scripts\pip3.exe" "$pip_args install virtualenv wh # Install all needed packages in a special wheel cache directory $python3_wheel_dir="$install_path\python3-wheels" Run-Executable "$install_path\Scripts\pip3.exe" "$pip_args wheel --wheel-dir $python3_wheel_dir -r $PSScriptRoot\..\shared\requirements.txt" -Set-EnvironmentVariable "PYTHON3_WHEEL_CACHE" "$python3_wheel_dir" + +Set-EnvironmentVariable "PYTHON3_WHEEL_CACHE-$version-$archVer" "$python3_wheel_dir" +# PYTHON3_WHEEL_CACHE is already in use so we should keep it pointing to 64 bit default +# wheel cache +if (($setDefault) -And ($archVer -eq 64)) { + Set-EnvironmentVariable "PYTHON3_WHEEL_CACHE" "$python3_wheel_dir" +} # Install PyPDF2 for QSR documentation Run-Executable "$install_path\Scripts\pip3.exe" "$pip_args install PyPDF2" diff --git a/coin/provisioning/common/windows/squishInstall.ps1 b/coin/provisioning/common/windows/squishInstall.ps1 index 8396743e..c615f9eb 100644 --- a/coin/provisioning/common/windows/squishInstall.ps1 +++ b/coin/provisioning/common/windows/squishInstall.ps1 @@ -36,11 +36,11 @@ # This script will pre-installed squish package for Windows. # Squish is need by Release Test Automation (RTA) -$version = "6.5.2" -$qtBranch = "514x" +$version = "6.6.1" +$qtBranch = "515x" $targetDir = "C:\Utils\squish" $squishPackage = "C:\Utils\rta_squish" -$squishUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\jenkins_build" +$squishUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\jenkins_build\stable" $licenseUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\coin" # Squish license @@ -60,17 +60,19 @@ $OSVersion = (get-itemproperty -Path "HKLM:\SOFTWARE\Microsoft\Windows NT\Curren if ($OSVersion -eq "Windows 10 Enterprise") { $winVersion = "win10" if (Is64BitWinHost) { - $sha1 = "9262d3b749483094024c74986f93e9340afbdb62" + $sha1 = "17b5bec83f448877e42e5effdc7daf723d157800" } else { - $sha1 = "0763b344afa327e6c374971492021c5e923be892" + $sha1 = "9c0fc186605522ac0ac11066c10c3f3e8a95a705" + #Remove special handling when all packages are in same dir, exception now for win10 x86->the archive had to be rebuild + $squishUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\jenkins_build\stable\6.6.1_rerun" } } elseif ($OSVersion -eq "Windows 7 Enterprise") { $winVersion = "win7" - $sha1 = "01b3529459da948cfde319d60becc666da0e1c4d" + $sha1 = "ec890c16bb671ae79b093ba81e6567d2780f85a2" } $squishArchive = "prebuild-squish-$version-$qtBranch-$winVersion-$arch.zip" -Copy-Item "\\ci-files01-hki.intra.qt.io\provisioning\squish\jenkins_build\stable\$squishArchive" "C:\Utils" +Copy-Item "$squishUrl\$squishArchive" "C:\Utils" Verify-Checksum "C:\Utils\$squishArchive" $sha1 Extract-7Zip "C:\Utils\$squishArchive" "C:\Utils" Rename-Item "$squishPackage" "$targetDir" diff --git a/coin/provisioning/common/windows/update-msvc2019.ps1 b/coin/provisioning/common/windows/update-msvc2019.ps1 new file mode 100644 index 00000000..0b0f384d --- /dev/null +++ b/coin/provisioning/common/windows/update-msvc2019.ps1 @@ -0,0 +1,71 @@ +############################################################################ +## +## 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$ +## +############################################################################# + +. "$PSScriptRoot\helpers.ps1" + +# This script will update MSVC 2019. +# NOTE! Visual Studio is pre-installed to tier 1 image so this script won't install the whole Visual Studio. See ../../../pre-provisioning/qtci-windows-10-x86_64/msvc2019.txt +# MSVC 2019 online installers can be found from here https://docs.microsoft.com/en-us/visualstudio/releases/2019/history#installing-an-earlier-release + +$version = "16_7_5" +$urlCache_vsInstaller = "\\ci-files01-hki.intra.qt.io\provisioning\windows\msvc\vs2019_Professional_$version.exe" +$urlOfficial_vsInstaller = "https://download.visualstudio.microsoft.com/download/pr/e8bc3741-cb70-42aa-9b4e-2bd497de85dd/74b4e599138d5b5824d87ee657b78cbdeb3716f58a9645047e53bb5f68131516/vs_Professional.exe" +$sha1_vsInstaller = "70062274c1ae79f5f0f7cb91192347abc1ebcb00" +$urlCache_buildToolsInstaller = "\\ci-files01-hki.intra.qt.io\provisioning\windows\msvc\vs2019_BuildTools_$version.exe" +$urlOfficial_buildToolsInstaller = "https://download.visualstudio.microsoft.com/download/pr/e8bc3741-cb70-42aa-9b4e-2bd497de85dd/f3713de3e01b7829d529f67d6240116b73cc0743974bb5373a052f9629cc24d2/vs_BuildTools.exe" +$sha1_buildToolsInstaller = "efb4600bf9bd09adf55a36e2e5d0d47a3abd481e" +$installerPath = "C:\Windows\Temp\installer.exe" + +function Install { + + Param ( + [string] $urlOfficial = $(BadParam("Official url path")), + [string] $urlCache = $(BadParam("Cached url path")), + [string] $sha1 = $(BadParam("SHA1 checksum of the file")) + + ) + + Write-Host "Installing msvc 2019 $version" + Download $urlOfficial $urlCache $installerPath + Verify-Checksum $installerPath $sha1 + Run-Executable "$installerPath" "update --passive --wait" + Remove-Item -Force -Path $installerPath +} + +Install $urlOfficial_vsInstaller $urlCache_vsInstaller $sha1_vsInstaller +Install $urlOfficial_buildToolsInstaller $urlCache_buildToolsInstaller $sha1_buildToolsInstaller + +$msvc2019Version = (cmd /c "C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe" -latest -property catalog_productDisplayVersion 2`>`&1) + +Write-Output "Visual Studio 2019 = $msvc2019Version" >> ~\versions.txt +Write-Output "Visual Studio 2019 Build Tools = $version" >> ~\versions.txt diff --git a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/05-libclang-v100-dyn.sh b/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/05-libclang-v100-dyn.sh new file mode 100755 index 00000000..fbf34ddd --- /dev/null +++ b/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/05-libclang-v100-dyn.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash +set -ex + +BASEDIR=$(dirname "$0") +# shellcheck source=../common/unix/libclang-v100-dyn.sh +"$BASEDIR/../common/unix/libclang-v100-dyn.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/04-install-packages.sh index c5304b21..5e3a4f8c 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/04-install-packages.sh @@ -80,12 +80,14 @@ installPackages+=(pulseaudio-libs-devel) installPackages+=(libXtst-devel) installPackages+=(nspr-devel) installPackages+=(nss-devel) -installPackages+=(rh-nodejs12-nodejs) +installPackages+=(rh-nodejs12-nodejs) # NOTE! Nodejs12 needs to be added to PATH! installPackages+=(rh-nodejs12-nodejs-devel) # For Android builds installPackages+=(java-1.8.0-openjdk-devel) # For receiving shasum installPackages+=(perl-Digest-SHA) +# For Clang 11 tests +installPackages+=(perl-Digest-MD5) # INTEGRITY requirements installPackages+=(glibc.i686) # Enable Qt Bluetooth @@ -134,6 +136,9 @@ sudo ln -s /opt/rh/rh-python36/root/usr/bin/pip3 /usr/local/bin/pip3 sudo pip install --upgrade pip sudo pip install virtualenv wheel +# Needed by packaging scripts +sudo /usr/local/bin/pip3 install colorlog --user + sudo /usr/local/bin/pip3 install wheel # Install all needed packages in a special wheel cache directory /usr/local/bin/pip3 wheel --wheel-dir "$HOME/python3-wheels" -r "${BASH_SOURCE%/*}/../common/shared/requirements.txt" @@ -141,3 +146,8 @@ sudo /usr/local/bin/pip3 install wheel # shellcheck source=../common/unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels" +SetEnvVar "PATH" "/opt/rh/rh-nodejs12/root/usr/bin:\$PATH" + +gccVersion="$(gcc --version |grep gcc |cut -b 11-16)" +echo "GCC = $gccVersion" >> versions.txt + diff --git a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/08-libclang-v100-dyn.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/08-libclang-v100-dyn.sh new file mode 100755 index 00000000..b0080cbc --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/08-libclang-v100-dyn.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +set -ex + +BASEDIR=$(dirname "$0") +# shellcheck source=../common/unix/libclang-v100-dyn.sh +"$BASEDIR/../common/unix/libclang-v100-dyn.sh" diff --git a/coin/provisioning/qtci-linux-SLES-15-x86_64/01-disable-btrfs-balance.sh b/coin/provisioning/qtci-linux-SLES-15-x86_64/01-disable-btrfs-balance.sh new file mode 100755 index 00000000..a0126cb2 --- /dev/null +++ b/coin/provisioning/qtci-linux-SLES-15-x86_64/01-disable-btrfs-balance.sh @@ -0,0 +1,9 @@ +#!/usr/bin/env bash + +set -ex + +# Stops the balance job if one is running at the moment. This is a very expensive thing to run and causes major slow down. +sudo systemctl stop btrfs-balance.service + +# This will disable btrfs balance job scheduling. +sudo sed -i 's/BTRFS_BALANCE_PERIOD="weekly"/BTRFS_BALANCE_PERIOD="none"/g' /etc/sysconfig/btrfsmaintenance diff --git a/coin/provisioning/qtci-linux-SLES-15-x86_64/01-disable-cron_daily.sh b/coin/provisioning/qtci-linux-SLES-15-x86_64/01-disable-cron_daily.sh new file mode 100755 index 00000000..166fb1e2 --- /dev/null +++ b/coin/provisioning/qtci-linux-SLES-15-x86_64/01-disable-cron_daily.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +set -ex + +# this script will remove executable rights from cron.daily jobs +sudo chmod -x /etc/cron.daily/* + diff --git a/coin/provisioning/qtci-linux-SLES-15-x86_64/01-disable-fstrim_timer.sh b/coin/provisioning/qtci-linux-SLES-15-x86_64/01-disable-fstrim_timer.sh new file mode 100644 index 00000000..9fd06e72 --- /dev/null +++ b/coin/provisioning/qtci-linux-SLES-15-x86_64/01-disable-fstrim_timer.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +set -ex + +# This will disable fstrim. The fstrim.timer is scheduled to activate the fstrim.service +sudo systemctl stop fstrim.timer +sudo systemctl disable fstrim.timer diff --git a/coin/provisioning/qtci-linux-SLES-15-x86_64/02-enable-modules.sh b/coin/provisioning/qtci-linux-SLES-15-x86_64/02-enable-modules.sh new file mode 100644 index 00000000..52c67941 --- /dev/null +++ b/coin/provisioning/qtci-linux-SLES-15-x86_64/02-enable-modules.sh @@ -0,0 +1,8 @@ +#!/usr/bin/env bash + +set -ex + +# Activate these modules + +# This is needed by Nodejs and QtWebEngine +sudo SUSEConnect -p sle-module-web-scripting/15/x86_64 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 638a9387..bed165f1 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 @@ -2,7 +2,7 @@ ############################################################################# ## -## 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. @@ -103,3 +103,15 @@ sudo zypper -nq install unixODBC-devel unixODBC # sqlite support sudo zypper -nq install sqlite3 sqlite3-devel +# Java - needed by RTA jenkins +sudo zypper -nq install java + +# open-vm-tools requires update. Version in tier1 is broken and causes segfault on boot. +sudo zypper -nq update open-vm-tools + +# Nodejs - needed by QtWebEngine +sudo zypper -nq install nodejs10 +sudo zypper -nq install nodejs10-devel + +gccVersion="$(gcc --version |grep gcc |cut -b 17-23)" +echo "GCC = $gccVersion" >> versions.txt 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 6c6a90c8..15142600 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.2.0 50 2b3873263d4d6b09b37102078d80dcd7016b9392 44975966b15bca922ba64efa8ec3257726a79153 +InstallGCC 9.3.0 50 5038e8752407d14e5a70c8efc80c20a6d4219aaa 212f77d7b7fe1fdf01a1c0b0ebc9d82aeda5e1e0 diff --git a/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/04-libclang-v100-dyn.sh b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/04-libclang-v100-dyn.sh new file mode 100755 index 00000000..dcd5b2d8 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/04-libclang-v100-dyn.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash + +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/unix/libclang-v100-dyn.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 index b509ff6c..79a29837 100755 --- 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 @@ -36,7 +36,7 @@ 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 nodejs10 nodejs10-devel + mozilla-nspr-devel mozilla-nss-devel nodejs10 nodejs10-devel glproto-devel # qtwebkit sudo zypper -nq install libxml2-devel libxslt-devel @@ -50,3 +50,5 @@ sudo zypper -nq install cups-devel #speech-dispatcher sudo zypper -nq install libspeechd-devel +gccVersion="$(gcc --version |grep gcc |cut -b 17-23)" +echo "GCC = $gccVersion" >> versions.txt diff --git a/coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/08-libclang-v100-dyn.sh b/coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/08-libclang-v100-dyn.sh new file mode 100755 index 00000000..b0080cbc --- /dev/null +++ b/coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/08-libclang-v100-dyn.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +set -ex + +BASEDIR=$(dirname "$0") +# shellcheck source=../common/unix/libclang-v100-dyn.sh +"$BASEDIR/../common/unix/libclang-v100-dyn.sh" diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/35-openssl.sh b/coin/provisioning/qtci-macos-10.13-x86_64/07-openssl-sh index 44fa76f1..44fa76f1 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/35-openssl.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/07-openssl-sh diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/25-homebrew.sh b/coin/provisioning/qtci-macos-10.13-x86_64/08-homebrew.sh index f7f9e214..f7f9e214 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/25-homebrew.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/08-homebrew.sh diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/08-nodejs.sh b/coin/provisioning/qtci-macos-10.13-x86_64/08-nodejs.sh new file mode 100755 index 00000000..4600a8c2 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.13-x86_64/08-nodejs.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash + +set -ex + +brew install --build-from-source node diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/28-libclang-v100-dyn.sh b/coin/provisioning/qtci-macos-10.13-x86_64/28-libclang-v100-dyn.sh new file mode 100755 index 00000000..c9d6e93d --- /dev/null +++ b/coin/provisioning/qtci-macos-10.13-x86_64/28-libclang-v100-dyn.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +set -ex + +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/unix/libclang-v100-dyn.sh" diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/30-nodejs.sh b/coin/provisioning/qtci-macos-10.13-x86_64/30-nodejs.sh deleted file mode 100755 index ab992405..00000000 --- a/coin/provisioning/qtci-macos-10.13-x86_64/30-nodejs.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -set -ex - -brew install nodejs - diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/28-libclang-v100-dyn.sh b/coin/provisioning/qtci-macos-10.14-x86_64/28-libclang-v100-dyn.sh new file mode 100755 index 00000000..c9d6e93d --- /dev/null +++ b/coin/provisioning/qtci-macos-10.14-x86_64/28-libclang-v100-dyn.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +set -ex + +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/unix/libclang-v100-dyn.sh" diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/55-signtools.sh b/coin/provisioning/qtci-macos-10.14-x86_64/55-signtools.sh index bded35eb..85087b33 100755 --- a/coin/provisioning/qtci-macos-10.14-x86_64/55-signtools.sh +++ b/coin/provisioning/qtci-macos-10.14-x86_64/55-signtools.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. @@ -114,15 +114,15 @@ sha1Ios="aae58d00d0a1b179a09f21cfc67f9d16fb95ff36" { Install "$cacheSigningTools/ios_password.txt" "$targetFolder/ios_password.txt" $sha1Ios; } 2> /dev/null { iosPassword=$(cat "$targetFolder/ios_password.txt"); } 2> /dev/null -iPhoneDeveloper="iosDevelopment2019CiTeam.p12" -shaIPhoneDeveloper="fa22abe1b1cc64af6585f7a61c4aba5e00220bdc" -Install "$cacheSigningTools/latest_ios_cert_2019/$iPhoneDeveloper" "$targetFolder/$iPhoneDeveloper" $shaIPhoneDeveloper +iPhoneDeveloper="iPhoneDeveloperCiTeam2020.p12" +shaIPhoneDeveloper="73136e44fed850f398e85908e4a73f20a6bdd8a2" +Install "$cacheSigningTools/latest_ios_cert_2020/$iPhoneDeveloper" "$targetFolder/$iPhoneDeveloper" $shaIPhoneDeveloper echo "Importing $iPhoneDeveloper.." { security import $targetFolder/$iPhoneDeveloper -k $loginKeychain* -P "$iosPassword" -T /usr/bin/codesign; } 2> /dev/null -iPhoneDistribution="iosDistribution2019CiTeam.p12" -shaIPhoneDistribution="6510119651c7aecb21d0a1dae329f2eae1e8f4e9" -Install "$cacheSigningTools/latest_ios_cert_2019/$iPhoneDistribution" "$targetFolder/$iPhoneDistribution" $shaIPhoneDistribution +iPhoneDistribution="iPhoneDistributionCiTeam2020.p12" +shaIPhoneDistribution="36215c3cbc6bfee48e86aafbd53c56282fe36d8d" +Install "$cacheSigningTools/latest_ios_cert_2020/$iPhoneDistribution" "$targetFolder/$iPhoneDistribution" $shaIPhoneDistribution echo "Importing $iPhoneDistribution.." { security import "$targetFolder/$iPhoneDistribution" -k $loginKeychain* -P "$iosPassword" -T /usr/bin/codesign; } 2> /dev/null @@ -130,8 +130,8 @@ echo "Importing $iPhoneDistribution.." echo "Creating directory $targetFolder/Library/MobileDevice/Provisioning Profiles.." mkdir "$targetFolder/Library/MobileDevice" mkdir "$targetFolder/Library/MobileDevice/Provisioning Profiles" -shaMobileprovision="477a7f3876c4333bd56a045df0d82fce795b1ebb" -Install "$cacheSigningTools/latest_ios_cert_2019/iOS_Dev_2019_citeam.mobileprovision" "$targetFolder/Library/MobileDevice/Provisioning Profiles/iOS_Dev08112017.mobileprovision" $shaMobileprovision +shaMobileprovision="ec9697276253ca7bf4401912236f0e6fde4214da" +Install "$cacheSigningTools/latest_ios_cert_2020/iOS_Dev_2020_citeam.mobileprovision" "$targetFolder/Library/MobileDevice/Provisioning Profiles/iOS_Dev_2020_citeam.mobileprovision" $shaMobileprovision # Removing password files rm -fr "$targetFolder/login_keychain_password.txt" diff --git a/coin/provisioning/qtci-windows-10-x86/01-enable-guest-logon.ps1 b/coin/provisioning/qtci-windows-10-x86/01-enable-guest-logon.ps1 new file mode 100644 index 00000000..3cf989d3 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/01-enable-guest-logon.ps1 @@ -0,0 +1,2 @@ +# Allow SMB client guest logons to SMB server. +reg.exe ADD "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\LanmanWorkstation\Parameters" /V AllowInsecureGuestAuth /T REG_dWORD /D 1 /F diff --git a/coin/provisioning/qtci-windows-10-x86/08-python3.ps1 b/coin/provisioning/qtci-windows-10-x86/08-python3.ps1 index 998e6bae..9446a32f 100644 --- a/coin/provisioning/qtci-windows-10-x86/08-python3.ps1 +++ b/coin/provisioning/qtci-windows-10-x86/08-python3.ps1 @@ -1 +1,8 @@ -. "$PSScriptRoot\..\common\windows\python3.ps1" +# Parameters: +# - Arch 32/64 +# - installer sha1 +# - install target dir +# - version +# - Optional true/false if set as default with PYTHON3/PIP3_PATH variables, default false + +. "$PSScriptRoot\..\common\windows\python3.ps1" 32 "76c50b747237a0974126dd8b32ea036dd77b2ad1" "C:\Python36" "3.6.1" $true diff --git a/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt b/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt index 5def5b33..f670b394 100644 --- a/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt +++ b/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt @@ -2,7 +2,7 @@ icu/65.1@qtproject/stable libxml2/2.9.10@qtproject/stable libxslt/1.1.34@qtproject/stable -libjpeg-turbo/2.0.3@qtproject/stable +libjpeg-turbo/2.0.5@qtproject/stable [generators] cmake diff --git a/coin/provisioning/qtci-windows-10-x86_64/01-enable-guest-logon.ps1 b/coin/provisioning/qtci-windows-10-x86_64/01-enable-guest-logon.ps1 new file mode 100644 index 00000000..3cf989d3 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/01-enable-guest-logon.ps1 @@ -0,0 +1,2 @@ +# Allow SMB client guest logons to SMB server. +reg.exe ADD "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\LanmanWorkstation\Parameters" /V AllowInsecureGuestAuth /T REG_dWORD /D 1 /F 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 72ac1ca7..b2949632 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/05-msvc.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/05-msvc.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,8 +36,5 @@ # MSVC 2015 Update 3 Write-Output "Visual Studio 2015 = Version 14.0.25431.01 Update 3" >> ~\versions.txt -# MSVC 2017 -Write-Output "Visual Studio 2017 = Version 15.8.5" >> ~\versions.txt +# MSVC 2019 and Build Tools are pre-provisioned, but the updating happens with "$PSScriptRoot\..\common\windows\update-msvc2019.ps1" -# 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/08-libclang-v100-dyn.ps1 b/coin/provisioning/qtci-windows-10-x86_64/08-libclang-v100-dyn.ps1 new file mode 100644 index 00000000..82b91257 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/08-libclang-v100-dyn.ps1 @@ -0,0 +1,2 @@ +. "$PSScriptRoot\..\common\windows\libclang-v100-dyn.ps1" 64 vs2019 +. "$PSScriptRoot\..\common\windows\libclang-v100-dyn.ps1" 32 vs2019 diff --git a/coin/provisioning/qtci-windows-10-x86_64/08-python3-32.ps1 b/coin/provisioning/qtci-windows-10-x86_64/08-python3-32.ps1 deleted file mode 100644 index 5ffeab3b..00000000 --- a/coin/provisioning/qtci-windows-10-x86_64/08-python3-32.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\python3.ps1" 32 "C:\Python36_32" diff --git a/coin/provisioning/qtci-windows-10-x86_64/08-python3.ps1 b/coin/provisioning/qtci-windows-10-x86_64/08-python3.ps1 index 3201032d..0ab0ed39 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/08-python3.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/08-python3.ps1 @@ -1 +1,12 @@ -. "$PSScriptRoot\..\common\windows\python3.ps1" 64 +# Parameters: +# - Arch 32/64 +# - installer sha1 +# - install target dir +# - version +# - Optional true/false if set as default with PYTHON3/PIP3_PATH variables, default false + +. "$PSScriptRoot\..\common\windows\python3.ps1" 64 "a8ac14ee5486547caf84abdf151be22d9d069c0a" "C:\Python38_64" "3.8.1" +. "$PSScriptRoot\..\common\windows\python3.ps1" 32 "14ff2c2e5538b03a012cb4c9d519d970444ebd42" "C:\Python38_32" "3.8.1" +# default ones +. "$PSScriptRoot\..\common\windows\python3.ps1" 64 "bf54252c4065b20f4a111cc39cf5215fb1edccff" "C:\Python36" "3.6.1" $true +. "$PSScriptRoot\..\common\windows\python3.ps1" 32 "76c50b747237a0974126dd8b32ea036dd77b2ad1" "C:\Python36_32" "3.6.1" $true 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 71abc7e1..09c5b21c 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/11-conan.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/11-conan.ps1 @@ -50,20 +50,20 @@ Run-Conan-Install ` Run-Conan-Install ` -ConanfilesDir "$PSScriptRoot\conanfiles" ` - -BuildinfoDir Mingw73-x86 ` + -BuildinfoDir Mingw-x86 ` -Arch x86 ` -Compiler "gcc" ` - -CompilerVersion 7 ` + -CompilerVersion 8 ` -CompilerLibcxx "libstdc++" ` -CompilerException "dwarf2" ` -CompilerThreads "posix" Run-Conan-Install ` -ConanfilesDir "$PSScriptRoot\conanfiles" ` - -BuildinfoDir Mingw73-x86_64 ` + -BuildinfoDir Mingw-x86_64 ` -Arch x86_64 ` -Compiler "gcc" ` - -CompilerVersion 7 ` + -CompilerVersion 8 ` -CompilerLibcxx "libstdc++" ` -CompilerException "seh" ` -CompilerThreads "posix" diff --git a/coin/provisioning/qtci-windows-10-x86_64/90-install-dotnet.ps1 b/coin/provisioning/qtci-windows-10-x86_64/90-install-dotnet.ps1 new file mode 100644 index 00000000..a2ecfba2 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/90-install-dotnet.ps1 @@ -0,0 +1,2 @@ +. "$PSScriptRoot\..\common\windows\install-dotnet.ps1" + diff --git a/coin/provisioning/qtci-windows-10-x86_64/90-install-mcuxpresso.ps1 b/coin/provisioning/qtci-windows-10-x86_64/90-install-mcuxpresso.ps1 new file mode 100755 index 00000000..22d19322 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/90-install-mcuxpresso.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\install-mcuxpresso.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/90-install-stm32cubeprogrammer.ps1 b/coin/provisioning/qtci-windows-10-x86_64/90-install-stm32cubeprogrammer.ps1 new file mode 100644 index 00000000..25c2bb42 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/90-install-stm32cubeprogrammer.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\install-stm32cubeprogrammer.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/91-install-azure-tool.ps1 b/coin/provisioning/qtci-windows-10-x86_64/91-install-azure-tool.ps1 new file mode 100644 index 00000000..f1d5acc3 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/91-install-azure-tool.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\install-azure-tool.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.txt b/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.txt index 491c9375..eaafc008 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.txt +++ b/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.txt @@ -2,7 +2,7 @@ icu/65.1@qtproject/stable libxml2/2.9.10@qtproject/stable libxslt/1.1.34@qtproject/stable -libjpeg-turbo/2.0.3@qtproject/stable +libjpeg-turbo/2.0.5@qtproject/stable [generators] cmake diff --git a/coin/provisioning/qtci-windows-7-x86/08-python3.ps1 b/coin/provisioning/qtci-windows-7-x86/08-python3.ps1 index 998e6bae..9446a32f 100644 --- a/coin/provisioning/qtci-windows-7-x86/08-python3.ps1 +++ b/coin/provisioning/qtci-windows-7-x86/08-python3.ps1 @@ -1 +1,8 @@ -. "$PSScriptRoot\..\common\windows\python3.ps1" +# Parameters: +# - Arch 32/64 +# - installer sha1 +# - install target dir +# - version +# - Optional true/false if set as default with PYTHON3/PIP3_PATH variables, default false + +. "$PSScriptRoot\..\common\windows\python3.ps1" 32 "76c50b747237a0974126dd8b32ea036dd77b2ad1" "C:\Python36" "3.6.1" $true diff --git a/coin/provisioning/qtci-windows-7-x86/09-openssl.ps1 b/coin/provisioning/qtci-windows-7-x86/09-openssl.ps1 index 269771c7..717e06fc 100644 --- a/coin/provisioning/qtci-windows-7-x86/09-openssl.ps1 +++ b/coin/provisioning/qtci-windows-7-x86/09-openssl.ps1 @@ -43,9 +43,9 @@ # nmake install -$version = "1.1.1d" +$version = "1.1.1g" $zip = Get-DownloadLocation ("openssl-$version.7z") -$sha1 = "2bf9379c4cea81858c4288cf06cc3444996bcad5" +$sha1 = "e94263ba067a5cc0ace17e26bb2f98c62d298b5a" $url = "http://ci-files01-hki.intra.qt.io/input/openssl/openssl_${version}_prebuild_x86_windows7_msvc2010.zip" Download $url $url $zip diff --git a/coin/provisioning/qtci-windows-7-x86/11-conan.ps1 b/coin/provisioning/qtci-windows-7-x86/11-conan.ps1 index aa380a09..1d928ffa 100644 --- a/coin/provisioning/qtci-windows-7-x86/11-conan.ps1 +++ b/coin/provisioning/qtci-windows-7-x86/11-conan.ps1 @@ -2,10 +2,10 @@ Run-Conan-Install ` -ConanfilesDir "$PSScriptRoot\conanfiles" ` - -BuildinfoDir Mingw73-x86 ` + -BuildinfoDir Mingw-x86 ` -Arch x86 ` -Compiler "gcc" ` - -CompilerVersion 7 ` + -CompilerVersion 8 ` -CompilerLibcxx "libstdc++" ` -CompilerException "dwarf2" ` -CompilerThreads "posix" diff --git a/coin/provisioning/qtci-windows-7-x86/conanfiles/qtwebkit.txt b/coin/provisioning/qtci-windows-7-x86/conanfiles/qtwebkit.txt index 3850cfea..663d5903 100644 --- a/coin/provisioning/qtci-windows-7-x86/conanfiles/qtwebkit.txt +++ b/coin/provisioning/qtci-windows-7-x86/conanfiles/qtwebkit.txt @@ -2,8 +2,7 @@ icu/65.1@qtproject/stable libxml2/2.9.10@qtproject/stable libxslt/1.1.34@qtproject/stable -libjpeg-turbo/2.0.3@qtproject/stable -zlib/1.2.11@qtproject/stable +libjpeg-turbo/2.0.5@qtproject/stable [generators] cmake @@ -22,8 +21,6 @@ libxslt:shared=True libjpeg-turbo:shared=False -zlib:shared=False - [imports] bin, icudt65.dll -> ./bin bin, icuin65.dll -> ./bin |