diff options
61 files changed, 111 insertions, 149 deletions
diff --git a/.gitmodules b/.gitmodules index 21e63f9c..7657f30f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,60 +1,60 @@ [submodule "qtbase"] path = qtbase url = ../qtbase.git - branch = 5.12.6 + branch = 5.12 status = essential [submodule "qtsvg"] depends = qtbase path = qtsvg url = ../qtsvg.git - branch = 5.12.6 + branch = 5.12 status = addon [submodule "qtdeclarative"] depends = qtbase recommends = qtsvg path = qtdeclarative url = ../qtdeclarative.git - branch = 5.12.6 + branch = 5.12 status = essential [submodule "qtactiveqt"] depends = qtbase path = qtactiveqt url = ../qtactiveqt.git - branch = 5.12.6 + branch = 5.12 status = addon [submodule "qtscript"] depends = qtbase recommends = qttools path = qtscript url = ../qtscript.git - branch = 5.12.6 + branch = 5.12 status = deprecated [submodule "qtmultimedia"] depends = qtbase recommends = qtdeclarative path = qtmultimedia url = ../qtmultimedia.git - branch = 5.12.6 + branch = 5.12 status = essential [submodule "qttools"] depends = qtbase recommends = qtdeclarative qtactiveqt path = qttools url = ../qttools.git - branch = 5.12.6 + branch = 5.12 status = essential [submodule "qtxmlpatterns"] depends = qtbase recommends = qtdeclarative path = qtxmlpatterns url = ../qtxmlpatterns.git - branch = 5.12.6 + branch = 5.12 status = addon [submodule "qttranslations"] depends = qttools path = qttranslations url = ../qttranslations.git - branch = 5.12.6 + branch = 5.12 status = essential priority = 30 [submodule "qtdoc"] @@ -62,7 +62,7 @@ recommends = qtmultimedia qtquickcontrols qtquickcontrols2 path = qtdoc url = ../qtdoc.git - branch = 5.12.6 + branch = 5.12 status = essential priority = 40 [submodule "qtrepotools"] @@ -83,14 +83,14 @@ recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport path = qtlocation url = ../qtlocation.git - branch = 5.12.6 + branch = 5.12 status = addon [submodule "qtsensors"] depends = qtbase recommends = qtdeclarative path = qtsensors url = ../qtsensors.git - branch = 5.12.6 + branch = 5.12 status = addon [submodule "qtsystems"] depends = qtbase @@ -123,185 +123,185 @@ recommends = qtdeclarative qtandroidextras path = qtconnectivity url = ../qtconnectivity.git - branch = 5.12.6 + branch = 5.12 status = addon [submodule "qtwayland"] depends = qtbase recommends = qtdeclarative path = qtwayland url = ../qtwayland.git - branch = 5.12.6 + branch = 5.12 status = addon [submodule "qt3d"] depends = qtbase recommends = qtdeclarative qtimageformats qtgamepad path = qt3d url = ../qt3d.git - branch = 5.12.6 + branch = 5.12 status = addon [submodule "qtimageformats"] depends = qtbase path = qtimageformats url = ../qtimageformats.git - branch = 5.12.6 + branch = 5.12 status = addon [submodule "qtgraphicaleffects"] depends = qtdeclarative path = qtgraphicaleffects url = ../qtgraphicaleffects.git - branch = 5.12.6 + branch = 5.12 status = addon [submodule "qtquickcontrols"] depends = qtdeclarative recommends = qtgraphicaleffects path = qtquickcontrols url = ../qtquickcontrols.git - branch = 5.12.6 + branch = 5.12 status = addon [submodule "qtserialbus"] depends = qtserialport path = qtserialbus url = ../qtserialbus.git - branch = 5.12.6 + branch = 5.12 status = addon [submodule "qtserialport"] depends = qtbase path = qtserialport url = ../qtserialport.git - branch = 5.12.6 + branch = 5.12 status = addon [submodule "qtx11extras"] depends = qtbase path = qtx11extras url = ../qtx11extras.git - branch = 5.12.6 + branch = 5.12 status = addon [submodule "qtmacextras"] depends = qtbase path = qtmacextras url = ../qtmacextras.git - branch = 5.12.6 + branch = 5.12 status = addon [submodule "qtwinextras"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtwinextras url = ../qtwinextras.git - branch = 5.12.6 + branch = 5.12 status = addon [submodule "qtandroidextras"] depends = qtbase path = qtandroidextras url = ../qtandroidextras.git - branch = 5.12.6 + branch = 5.12 status = addon [submodule "qtwebsockets"] depends = qtbase recommends = qtdeclarative path = qtwebsockets url = ../qtwebsockets.git - branch = 5.12.6 + branch = 5.12 status = addon [submodule "qtwebchannel"] depends = qtbase recommends = qtdeclarative qtwebsockets path = qtwebchannel url = ../qtwebchannel.git - branch = 5.12.6 + branch = 5.12 status = addon [submodule "qtwebengine"] depends = qtdeclarative recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel qttools path = qtwebengine url = ../qtwebengine.git - branch = 5.12.6 + branch = 5.12 status = addon priority = 10 [submodule "qtcanvas3d"] depends = qtdeclarative path = qtcanvas3d url = ../qtcanvas3d.git - branch = 5.12.6 + branch = 5.12 status = addon [submodule "qtwebview"] depends = qtdeclarative recommends = qtwebengine path = qtwebview url = ../qtwebview.git - branch = 5.12.6 + branch = 5.12 status = addon [submodule "qtquickcontrols2"] depends = qtgraphicaleffects recommends = qtimageformats path = qtquickcontrols2 url = ../qtquickcontrols2.git - branch = 5.12.6 + branch = 5.12 status = essential [submodule "qtpurchasing"] depends = qtbase recommends = qtdeclarative qtandroidextras path = qtpurchasing url = ../qtpurchasing.git - branch = 5.12.6 + branch = 5.12 status = addon [submodule "qtcharts"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtcharts url = ../qtcharts.git - branch = 5.12.6 + branch = 5.12 status = addon [submodule "qtdatavis3d"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtdatavis3d url = ../qtdatavis3d.git - branch = 5.12.6 + branch = 5.12 status = addon [submodule "qtvirtualkeyboard"] depends = qtbase qtdeclarative qtsvg recommends = qtmultimedia qtquickcontrols path = qtvirtualkeyboard url = ../qtvirtualkeyboard.git - branch = 5.12.6 + branch = 5.12 status = addon [submodule "qtgamepad"] depends = qtbase recommends = qtdeclarative path = qtgamepad url = ../qtgamepad.git - branch = 5.12.6 + branch = 5.12 status = addon [submodule "qtscxml"] depends = qtbase qtdeclarative path = qtscxml url = ../qtscxml.git - branch = 5.12.6 + branch = 5.12 status = addon [submodule "qtspeech"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtspeech url = ../qtspeech.git - branch = 5.12.6 + branch = 5.12 status = addon [submodule "qtnetworkauth"] depends = qtbase path = qtnetworkauth url = ../qtnetworkauth.git - branch = 5.12.6 + branch = 5.12 status = addon [submodule "qtremoteobjects"] depends = qtbase recommends = qtdeclarative path = qtremoteobjects url = ../qtremoteobjects.git - branch = 5.12.6 + branch = 5.12 status = addon [submodule "qtwebglplugin"] depends = qtbase qtwebsockets recommends = qtdeclarative path = qtwebglplugin url = ../qtwebglplugin.git - branch = 5.12.6 + branch = 5.12 status = addon diff --git a/coin/provisioning/common/linux/cmake_linux.sh b/coin/provisioning/common/linux/cmake_linux.sh index 2b8d71d0..a3b2a9cc 100755 --- a/coin/provisioning/common/linux/cmake_linux.sh +++ b/coin/provisioning/common/linux/cmake_linux.sh @@ -33,7 +33,7 @@ ## ############################################################################# -# This script installs CMake 3.6.2 +# This script installs CMake 3.7.2 # CMake is needed for autotests that verify that Qt can be built with CMake @@ -42,10 +42,10 @@ source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh" # shellcheck source=../unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" -version="3.6.2" -PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/cmake/cmake-3.6.2-Linux-x86_64.tar.gz" -AltUrl="https://cmake.org/files/v3.6/cmake-3.6.2-Linux-x86_64.tar.gz" -SHA1="dd9d8d57b66109d4bac6eef9209beb94608a185c" +version="3.7.2" +PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/cmake/cmake-3.7.2-Linux-x86_64.tar.gz" +AltUrl="https://cmake.org/files/v3.7/cmake-3.7.2-Linux-x86_64.tar.gz" +SHA1="915bc981aab354821fb9fd28374a720fdb3aa180" targetFolder="/opt/cmake-$version" appPrefix="cmake-$version-Linux-x86_64" diff --git a/coin/provisioning/common/linux/openssl_for_android_linux.sh b/coin/provisioning/common/linux/openssl_for_android_linux.sh index d833975f..4860c01f 100755 --- a/coin/provisioning/common/linux/openssl_for_android_linux.sh +++ b/coin/provisioning/common/linux/openssl_for_android_linux.sh @@ -53,11 +53,11 @@ else rm -rf "$exports_file" fi -version="1.1.1b" +version="1.1.1d" 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="e9710abf5e95c48ebf47991b10cbb48c09dae102" +sha="056057782325134b76d1931c48f2c7e6595d7ef4" opensslHome="${HOME}/openssl/android/openssl-${version}" DownloadURL "$cachedUrl" "$officialUrl" "$sha" "$targetFile" mkdir -p "${HOME}/openssl/android/" diff --git a/coin/provisioning/common/macos/install_openssl_111a.sh b/coin/provisioning/common/macos/install_openssl_111a.sh deleted file mode 100755 index cd6cd9e8..00000000 --- a/coin/provisioning/common/macos/install_openssl_111a.sh +++ /dev/null @@ -1,78 +0,0 @@ -#!/usr/bin/env bash - -############################################################################# -## -## Copyright (C) 2019 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ -## -## This file is part of the provisioning scripts of the Qt Toolkit. -## -## $QT_BEGIN_LICENSE:LGPL21$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see http://www.qt.io/terms-conditions. For further -## information use the contact form at http://www.qt.io/contact-us. -## -## GNU Lesser General Public License Usage -## Alternatively, this file may be used under the terms of the GNU Lesser -## General Public License version 2.1 or version 3 as published by the Free -## Software Foundation and appearing in the file LICENSE.LGPLv21 and -## LICENSE.LGPLv3 included in the packaging of this file. Please review the -## following information to ensure the GNU Lesser General Public License -## requirements will be met: https://www.gnu.org/licenses/lgpl.html and -## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -## -## As a special exception, The Qt Company gives you certain additional -## rights. These rights are described in The Qt Company LGPL Exception -## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -## -## $QT_END_LICENSE$ -## -############################################################################# - -# This script install OpenSSL - -set -ex - -# shellcheck source=../unix/InstallFromCompressedFileFromURL.sh -source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh" -# shellcheck source=../unix/SetEnvVar.sh -source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" - -opensslVersion="1.1.1a" -opensslFile="openssl-$opensslVersion.tar.gz" -opensslDlUrl="http://ci-files01-hki.intra.qt.io/input/openssl/$opensslFile" -opensslAltDlUrl="https://www.openssl.org/source/$opensslFile" -opensslSha1="8fae27b4f34445a5500c9dc50ae66b4d6472ce29" - -# Below target location has been hard coded into Coin. -# QTQAINFRA-1195 -openssl_install_dir=/usr/local/openssl-$opensslVersion -opensslTargetLocation="/usr/local/opt/openssl" - -InstallFromCompressedFileFromURL "$opensslDlUrl" "$opensslAltDlUrl" "$opensslSha1" "/tmp/openssl-$opensslVersion" "openssl-$opensslVersion" -cd "/tmp/openssl-$opensslVersion" -sudo ./Configure --prefix=$openssl_install_dir shared no-ssl3-method enable-ec_nistp_64_gcc_128 darwin64-x86_64-cc "-Wa,--noexecstack" - -sudo make install_sw install_ssldirs - -path=$(echo "$opensslTargetLocation" | sed -E 's/(.*)\/.*$/\1/') -sudo mkdir -p "$path" -sudo ln -s $openssl_install_dir $opensslTargetLocation - -SetEnvVar "PATH" "\"$opensslTargetLocation/bin:\$PATH\"" -SetEnvVar "MANPATH" "\"$opensslTargetLocation/share/man:\$MANPATH\"" - -SetEnvVar "OPENSSL_DIR" "\"$openssl_install_dir\"" -SetEnvVar "OPENSSL_INCLUDE" "\"$openssl_install_dir/include\"" -SetEnvVar "OPENSSL_LIB" "\"$openssl_install_dir/lib\"" - -security find-certificate -a -p /Library/Keychains/System.keychain | sudo tee -a $opensslTargetLocation/ssl/cert.pem > /dev/null -security find-certificate -a -p /System/Library/Keychains/SystemRootCertificates.keychain | sudo tee -a $opensslTargetLocation/ssl/cert.pem > /dev/null - -sudo rm -rf /tmp/openssl-$opensslVersion - -echo "OpenSSL = $opensslVersion" >> ~/versions.txt diff --git a/coin/provisioning/common/unix/install-openssl.sh b/coin/provisioning/common/unix/install-openssl.sh index 01a20935..08a3390b 100755 --- a/coin/provisioning/common/unix/install-openssl.sh +++ b/coin/provisioning/common/unix/install-openssl.sh @@ -42,11 +42,11 @@ source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh" # shellcheck source=../unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" -version="1.1.1b" +version="1.1.1d" 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="e9710abf5e95c48ebf47991b10cbb48c09dae102" +sha="056057782325134b76d1931c48f2c7e6595d7ef4" opensslHome="${HOME}/openssl-${version}" opensslSource="${opensslHome}-src" DownloadURL "$cachedUrl" "$officialUrl" "$sha" "$targetFile" diff --git a/coin/provisioning/common/windows/android-openssl.ps1 b/coin/provisioning/common/windows/android-openssl.ps1 index 981fa51d..35e49423 100644 --- a/coin/provisioning/common/windows/android-openssl.ps1 +++ b/coin/provisioning/common/windows/android-openssl.ps1 @@ -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.1b" +$version = "1.1.1d" $zip = Get-DownloadLocation ("openssl-$version.tar.gz") -$sha1 = "e9710abf5e95c48ebf47991b10cbb48c09dae102" +$sha1 = "056057782325134b76d1931c48f2c7e6595d7ef4" $destination = "C:\Utils\openssl-android-master" # msys unix style paths diff --git a/coin/provisioning/common/windows/cmake.ps1 b/coin/provisioning/common/windows/cmake.ps1 index ec84d706..9d3d6aef 100644 --- a/coin/provisioning/common/windows/cmake.ps1 +++ b/coin/provisioning/common/windows/cmake.ps1 @@ -33,8 +33,8 @@ . "$PSScriptRoot\helpers.ps1" -$majorminorversion = "3.6" -$version = "3.6.2" +$majorminorversion = "3.7" +$version = "3.7.2" $zip = Get-DownloadLocation ("cmake-" + $version + "-win32-x86.zip") $officialurl = "https://cmake.org/files/v" + $majorminorversion + "/cmake-" + $version + "-win32-x86.zip" @@ -44,7 +44,7 @@ Write-Host "Removing old cmake" Remove-Item "C:\CMake" -Force -Recurse -ErrorAction SilentlyContinue Download $officialurl $cachedurl $zip -Verify-Checksum $zip "541F6E7EFD228E46770B8631FFE57097576E4D4E" +Verify-Checksum $zip "c80c17e858ecfebfaf16fe8af18b174d2600c4e6" Extract-7Zip $zip C: $defaultinstallfolder = "C:\cmake-" + $version + "-win32-x86" diff --git a/coin/provisioning/common/windows/disable-clean-manager.ps1 b/coin/provisioning/common/windows/disable-clean-manager.ps1 new file mode 100644 index 00000000..6d54e137 --- /dev/null +++ b/coin/provisioning/common/windows/disable-clean-manager.ps1 @@ -0,0 +1,8 @@ +# This script will disable automatic disk cleanup + +. "$PSScriptRoot\helpers.ps1" + +Run-Executable "reg.exe" "ADD `"HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\StorageSense\Parameters\StoragePolicy`" /V 04 /T REG_dWORD /D 0 /F" + +# Maintenance task used by the system to launch a silent auto disk cleanup when running low on free disk space. +DisableSchedulerTask "DiskCleanup\SilentCleanup" diff --git a/coin/provisioning/common/windows/install-jdk.ps1 b/coin/provisioning/common/windows/install-jdk.ps1 index 0c548e63..ce1abdd5 100644 --- a/coin/provisioning/common/windows/install-jdk.ps1 +++ b/coin/provisioning/common/windows/install-jdk.ps1 @@ -68,8 +68,7 @@ try { Verify-Checksum $javaPackage $sha1 Run-Executable "$javaPackage" "/s SPONSORS=0" -Write-Host "Cleaning $javaPackage.." -Remove-Item -Recurse -Force -Path "$javaPackage" +Remove "$javaPackage" Write-Host "Remove Java update from startup" reg delete "HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Run" /v SunJavaUpdateSched /f diff --git a/coin/provisioning/common/windows/openssl.ps1 b/coin/provisioning/common/windows/openssl.ps1 index 2f21db37..891f5db7 100644 --- a/coin/provisioning/common/windows/openssl.ps1 +++ b/coin/provisioning/common/windows/openssl.ps1 @@ -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_1b" +$version = "1_1_1d" $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 = "5b50819dd84aa9219e0cad9cdddf78285bdd1bbb" + $sha1 = "df9c40e9e82edf693c15302cbc8e8a057857a13c" 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 = "1ae5ad4fe5dae01dd056274979cce26945c9e86c" +$sha1 = "5c49ccd3a5d17f63d25fb819963978f50c7966d0" Write-Host "Fetching from URL ..." Download $externalUrl $internalUrl $packagex86 diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/05-systemsetup.sh b/coin/provisioning/qtci-macos-10.12-x86_64/05-systemsetup.sh index ce8043fa..95631107 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/05-systemsetup.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/05-systemsetup.sh @@ -2,7 +2,7 @@ ############################################################################# ## -## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2019 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -37,7 +37,13 @@ set -ex # This script modified system settings for automated use -VNCPassword=qt +targetFile="$HOME/vncpw.txt" + +# Fetch password +curl --retry 5 --retry-delay 10 --retry-max-time 60 "http://ci-files01-hki.intra.qt.io/input/semisecure/vncpw.txt" -o "$targetFile" +shasum "$targetFile" |grep "a795fccaa8f277e62ec08e6056c544b8b63924a0" + +{ VNCPassword=$(cat "$targetFile"); } 2> /dev/null NTS_IP=10.212.2.216 echo "Disable Screensaver" @@ -82,10 +88,13 @@ defaults write -g InitialKeyRepeat -int 15 # normal minimum is 2 (30 ms) defaults write -g KeyRepeat -int 2 +set +x echo "Enable remote desktop sharing" sudo /System/Library/CoreServices/RemoteManagement/ARDAgent.app/Contents/Resources/kickstart -activate -configure -access -on -clientopts -setvnclegacy -vnclegacy yes -clientopts -setvncpw -vncpw $VNCPassword -restart -agent -privs -all +set -x echo "Set Network Test Server address to $NTS_IP in /etc/hosts" echo "$NTS_IP qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts sudo systemsetup settimezone GMT +sudo rm -f "$targetFile" diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/05-systemsetup.sh b/coin/provisioning/qtci-macos-10.13-x86_64/05-systemsetup.sh index d91316bd..95631107 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/05-systemsetup.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/05-systemsetup.sh @@ -2,7 +2,7 @@ ############################################################################# ## -## Copyright (C) 2018 The Qt Company Ltd. +## Copyright (C) 2019 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -37,7 +37,13 @@ set -ex # This script modified system settings for automated use -VNCPassword=qt +targetFile="$HOME/vncpw.txt" + +# Fetch password +curl --retry 5 --retry-delay 10 --retry-max-time 60 "http://ci-files01-hki.intra.qt.io/input/semisecure/vncpw.txt" -o "$targetFile" +shasum "$targetFile" |grep "a795fccaa8f277e62ec08e6056c544b8b63924a0" + +{ VNCPassword=$(cat "$targetFile"); } 2> /dev/null NTS_IP=10.212.2.216 echo "Disable Screensaver" @@ -82,10 +88,13 @@ defaults write -g InitialKeyRepeat -int 15 # normal minimum is 2 (30 ms) defaults write -g KeyRepeat -int 2 +set +x echo "Enable remote desktop sharing" sudo /System/Library/CoreServices/RemoteManagement/ARDAgent.app/Contents/Resources/kickstart -activate -configure -access -on -clientopts -setvnclegacy -vnclegacy yes -clientopts -setvncpw -vncpw $VNCPassword -restart -agent -privs -all +set -x echo "Set Network Test Server address to $NTS_IP in /etc/hosts" echo "$NTS_IP qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts sudo systemsetup settimezone GMT +sudo rm -f "$targetFile" diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/05-systemsetup.sh b/coin/provisioning/qtci-macos-10.14-x86_64/05-systemsetup.sh index 817e3858..79eba834 100755 --- a/coin/provisioning/qtci-macos-10.14-x86_64/05-systemsetup.sh +++ b/coin/provisioning/qtci-macos-10.14-x86_64/05-systemsetup.sh @@ -2,7 +2,7 @@ ############################################################################# ## -## Copyright (C) 2018 The Qt Company Ltd. +## Copyright (C) 2019 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -37,7 +37,13 @@ set -ex # This script modified system settings for automated use -VNCPassword=qt +targetFile="$HOME/vncpw.txt" + +# Fetch password +curl --retry 5 --retry-delay 10 --retry-max-time 60 "http://ci-files01-hki.intra.qt.io/input/semisecure/vncpw.txt" -o "$targetFile" +shasum "$targetFile" |grep "a795fccaa8f277e62ec08e6056c544b8b63924a0" + +{ VNCPassword=$(cat "$targetFile"); } 2> /dev/null NTS_IP=10.212.2.216 echo "Disable Screensaver" @@ -82,11 +88,14 @@ defaults write -g InitialKeyRepeat -int 15 # normal minimum is 2 (30 ms) defaults write -g KeyRepeat -int 2 +set +x echo "Enable remote desktop sharing" sudo /System/Library/CoreServices/RemoteManagement/ARDAgent.app/Contents/Resources/kickstart -activate -configure -access -on -clientopts -setvnclegacy -vnclegacy yes -clientopts -setvncpw -vncpw $VNCPassword -restart -agent -privs -all +set -x echo "Set Network Test Server address to $NTS_IP in /etc/hosts" echo "$NTS_IP qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts sudo systemsetup settimezone GMT sudo systemsetup setusingnetworktime off +sudo rm -f "$targetFile" diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/20-xcode.sh b/coin/provisioning/qtci-macos-10.14-x86_64/20-xcode.sh index ebeadc02..2ee4dedf 100755 --- a/coin/provisioning/qtci-macos-10.14-x86_64/20-xcode.sh +++ b/coin/provisioning/qtci-macos-10.14-x86_64/20-xcode.sh @@ -50,4 +50,4 @@ set -ex # shellcheck source=../common/macos/install_xcode.sh source "${BASH_SOURCE%/*}/../common/macos/install_xcode.sh" -InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/macos_10.14_mojave/Xcode_10.2.1.tar.gz 10.2.1 +InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/macos_10.14_mojave/Xcode_10.2.1_update.tar.gz 10.2.1 diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/35-openssl.sh b/coin/provisioning/qtci-macos-10.14-x86_64/35-openssl.sh index cf312ed2..57a86c47 100755 --- a/coin/provisioning/qtci-macos-10.14-x86_64/35-openssl.sh +++ b/coin/provisioning/qtci-macos-10.14-x86_64/35-openssl.sh @@ -2,5 +2,6 @@ set -ex -# shellcheck source=../common/macos/install_openssl_111a.sh -source "${BASH_SOURCE%/*}/../common/macos/install_openssl_111a.sh" +# shellcheck source=../common/macos/install_openssl.sh +source "${BASH_SOURCE%/*}/../common/unix/install-openssl.sh" "macos" + diff --git a/coin/provisioning/qtci-windows-10-x86/00-disable-clean-manager.ps1 b/coin/provisioning/qtci-windows-10-x86/00-disable-clean-manager.ps1 new file mode 100644 index 00000000..1dc08d21 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/00-disable-clean-manager.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\disable-clean-manager.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/00-disable-clean-manager.ps1 b/coin/provisioning/qtci-windows-10-x86_64/00-disable-clean-manager.ps1 new file mode 100644 index 00000000..1dc08d21 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/00-disable-clean-manager.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\disable-clean-manager.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86/00-disable-clean-manager.ps1 b/coin/provisioning/qtci-windows-7-x86/00-disable-clean-manager.ps1 new file mode 100644 index 00000000..1dc08d21 --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86/00-disable-clean-manager.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\disable-clean-manager.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86/09-openssl.ps1 b/coin/provisioning/qtci-windows-7-x86/09-openssl.ps1 index f90938c4..269771c7 100644 --- a/coin/provisioning/qtci-windows-7-x86/09-openssl.ps1 +++ b/coin/provisioning/qtci-windows-7-x86/09-openssl.ps1 @@ -43,10 +43,10 @@ # nmake install -$version = "1.1.1b" +$version = "1.1.1d" $zip = Get-DownloadLocation ("openssl-$version.7z") -$sha1 = "7afba53ab984cecb54a1915c135cbb2a20c6b576" -$url = "http://ci-files01-hki.intra.qt.io/input/openssl/openssl_${version}_prebuild_x86.7z" +$sha1 = "2bf9379c4cea81858c4288cf06cc3444996bcad5" +$url = "http://ci-files01-hki.intra.qt.io/input/openssl/openssl_${version}_prebuild_x86_windows7_msvc2010.zip" Download $url $url $zip Verify-Checksum $zip $sha1 @@ -55,6 +55,8 @@ $installFolder = "C:\openssl" Extract-7Zip $zip "C:\" Remove-Item -Path $zip +Move-Item -Path C:\openssl_${version}_prebuild_x86_windows7_msvc2010 -Destination C:\openssl + Set-EnvironmentVariable "OPENSSL_CONF_x86" "$installFolder\openssl.cnf" Set-EnvironmentVariable "OPENSSL_INCLUDE_x86" "$installFolder\include" Set-EnvironmentVariable "OPENSSL_LIB_x86" "$installFolder\lib" diff --git a/qt3d b/qt3d -Subproject b77712dd95adb6644e9af3bf98a2a6ebc5a52ec +Subproject 48c8f339f09c5274536222bce159a6d0394dbed diff --git a/qtactiveqt b/qtactiveqt -Subproject 7dd17c586ab559415936e677b6b0814ec81f42e +Subproject 29734c78952e670662703b607cf9b56fb92999c diff --git a/qtandroidextras b/qtandroidextras -Subproject 2a5a86ee4a8af250c4aca26f3e376ac117c0d58 +Subproject 59ba2a8c6c6a9c37265b85866404c2f1959c0b9 diff --git a/qtbase b/qtbase -Subproject f0b93f7a4b4281c5470280eb36b7c0ef5948a92 +Subproject 9c80104cfdc137b9e805e4577b416b42ba7502a diff --git a/qtcanvas3d b/qtcanvas3d -Subproject 51e8dc59d87463f32dab0e401e9ae17615c7b79 +Subproject 7a773c11a5405ac874d72107b9b54180b6c258d diff --git a/qtcharts b/qtcharts -Subproject 969fc5bf94e8e0e6cd86c79c38e11074de23527 +Subproject 52f37be1ec48d0ad2ac3b4e2ac6f90f18cb2ed3 diff --git a/qtconnectivity b/qtconnectivity -Subproject 33f5988eadf1b748d75deec8bc12afc1d47ea52 +Subproject f4db303e10b8f6cca2f6b5ff56c15d3d42eb3e0 diff --git a/qtdatavis3d b/qtdatavis3d -Subproject 2b753d7caa9f780d6a76829db516e3fb859c335 +Subproject 9f27ba0da78166b774cf70d8899424217b0e2a0 diff --git a/qtdeclarative b/qtdeclarative -Subproject 179c4b689d1a7b9e9edb71ddf545dc237bca670 +Subproject 11dd3dd1345d08e5f9d2ded4d0e5a3f6d3a8fde diff --git a/qtdoc b/qtdoc -Subproject 5c4b2eb41483bb6827f1e38d23eb11e2d60e8d6 +Subproject 1de55623cdd960b164181870154b23d0d13007b diff --git a/qtgamepad b/qtgamepad -Subproject 39b7df80c9b58dffc7a6e9e68b99e1b9f78ed2e +Subproject 7bcf32370113a4c6e06ba7924488d2c628b1b15 diff --git a/qtgraphicaleffects b/qtgraphicaleffects -Subproject 7ce8cd84f7f8ce8d0377019f7087b2352b5626e +Subproject dcc7b59942a460449eea8641f0bb77b530e605f diff --git a/qtimageformats b/qtimageformats -Subproject dad286f15b75f36f37d4523ac86696e5133e58c +Subproject 5825bd6eec557c07ca9d0dc7b784123ca4af64a diff --git a/qtlocation b/qtlocation -Subproject ad359c55d36f39c7f243bee8960d490772bfe84 +Subproject 34b9d20b1e1bc36f475e5e2be45635d126e0120 diff --git a/qtmacextras b/qtmacextras -Subproject 3ac09b971a940b05ebd42f99f84b3ad9990bebc +Subproject 10715628d2ae0aa1fe348e9224995d785f128b8 diff --git a/qtmultimedia b/qtmultimedia -Subproject 53a507b30befc40a4d06a1620e85bb4a5b1bf40 +Subproject daaaad704562873bd63d978b1f59a5ab256edbb diff --git a/qtnetworkauth b/qtnetworkauth -Subproject ecdeaac31d2cdebda5d7b06a0224fd34649a737 +Subproject a4423983a078f9c208382a605f68aa62db512d8 diff --git a/qtpurchasing b/qtpurchasing -Subproject ceb003e074cdbb6f2429dd3f4ddcf995382d199 +Subproject 5badc129ab30e8c1c5fd29dbcac1a5f3b11441d diff --git a/qtqa b/qtqa -Subproject b9a306372a17a22e1907bbd5911f819d4911bb8 +Subproject ffbd9daf83a9a881eb295f640766d60409f0f2b diff --git a/qtquickcontrols b/qtquickcontrols -Subproject 8f8d9b7015cd05e936d560f097cbce42eb375de +Subproject 5ce2201145ef02c53cce0ce8c2b4665e3d2c9eb diff --git a/qtquickcontrols2 b/qtquickcontrols2 -Subproject ed92154c712b0e54caa5baa72d832d7f8286307 +Subproject 5379e3199a11e2cb9a816725da7aac527caa14f diff --git a/qtremoteobjects b/qtremoteobjects -Subproject 76d6a13889514b03a1878e19b56eb1e6f17d1b9 +Subproject 53e303ab7f4eada4837b0c1b70fb607a1d59c15 diff --git a/qtrepotools b/qtrepotools -Subproject 0028759fdab4f2a5d59b1ec3cfc34d2c992e9d9 +Subproject fa4ab96e757b72096b5e67fd636e128f8d8afe8 diff --git a/qtscript b/qtscript -Subproject c2e02e863c3867f5d038731f429cc3a03f3cc3b +Subproject 86074a2cbf2e78e5738b14ba18bbb4cee1e0594 diff --git a/qtscxml b/qtscxml -Subproject 9ed16e4621ae705947d5e04ade450f1859ef86c +Subproject 7397449e5a848eae81290a8126e50821d16a89f diff --git a/qtsensors b/qtsensors -Subproject 8fd13b71e50d0935af69e70f1961ac8194cb6fb +Subproject 43c5a30bf784cc0e3af3ed50f70ee8f58204338 diff --git a/qtserialbus b/qtserialbus -Subproject 4347caecbd0b2d02074a033eabf7d114ad7ca5f +Subproject 49b44638f6dd9c7ceab2051b5fcd55b2e3c5610 diff --git a/qtserialport b/qtserialport -Subproject f3bf6e0cc9c7b8c9d1ef249cf8043c465d7e818 +Subproject c703fc74ba1e0f1a070d48692a8ebd980b000fe diff --git a/qtspeech b/qtspeech -Subproject 099aaa9df347e00ef121f959fa8fb6e1c0910a3 +Subproject 724d657b7d7f323032c6f7bcd291a7869f4d6a2 diff --git a/qtsvg b/qtsvg -Subproject f8eb5228da5805161701477682489baf9d5028e +Subproject 3244bdcb937f42d255b8816e3fc612729672bbc diff --git a/qttools b/qttools -Subproject c4988ca21346752e601df8a6b2cef3ee10c062f +Subproject e83dc49ef0c4c83f5aa1bf2e962cbc48a85fd06 diff --git a/qttranslations b/qttranslations -Subproject d80d31a2d4bd94a4a97dd532a126f04d1a4dfc2 +Subproject cb20da70ada2ffb92a08a232ddad5b1b51ade03 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard -Subproject 73259adb59f15dab266504f5444c99a6e06a7f3 +Subproject c8ba6d41d6651de5f91274df9da497b612b35b9 diff --git a/qtwayland b/qtwayland -Subproject b28b121f05caba25da9544b31059832e0a492ee +Subproject 0fd288fa01072c912277f004e969a3d90927bd6 diff --git a/qtwebchannel b/qtwebchannel -Subproject 77af92deffa9aeb8a5f85f1e73c3f110d24f7f4 +Subproject e1b2018ef0a806a9ee207af8ae352e0dd59f149 diff --git a/qtwebengine b/qtwebengine -Subproject 636b32c7f22c96e9562270219cedca52d520373 +Subproject a4b598d1633e8278776c922faae012681018cdc diff --git a/qtwebglplugin b/qtwebglplugin -Subproject 560f3c6f9a5e199f88be2f111e1ee5fa19948d5 +Subproject 26d8348e6fa5c95a0a12c1d8e2493e9dff20400 diff --git a/qtwebsockets b/qtwebsockets -Subproject fd324911025d49b8b3d89a155ce38e3228edfd3 +Subproject 986d2d910f52299f1396fe2b3a192a9c0635d12 diff --git a/qtwebview b/qtwebview -Subproject bc7e946f0e823be99de7834a2784c22d5ae2d62 +Subproject 58d5ef93c239fcf48b6c15363cfcfeaf3d47336 diff --git a/qtwinextras b/qtwinextras -Subproject 09ed2f46fb51ec508bd1c5836d2a1884246e9d0 +Subproject 4a1dda32bdfc907495eab564b8d4af477550543 diff --git a/qtx11extras b/qtx11extras -Subproject 547506f904a2ba72d56c2c61c2c24adea91bdd2 +Subproject 049f550dde6d0a72d4b18bed881762ff4928de9 diff --git a/qtxmlpatterns b/qtxmlpatterns -Subproject e74c6fee102c228da060f3899610e4449bc1851 +Subproject ad4d0452621f5d7869f9bf52c0346224c28f006 |