summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2018-01-19 09:56:46 +0100
committerLiang Qi <liang.qi@qt.io>2018-01-19 09:56:46 +0100
commit45528e68740a225cd3cb9dc116aca2c2b452bd23 (patch)
treef87e247e7ea71d3afe691a8a2999248979d8f1e1
parent21e734438986ab73647d966a1058959c002e760c (diff)
parent786be66eaf2bf35c75ca534930cbc87c52634e8d (diff)
Merge remote-tracking branch 'origin/5.9' into 5.10
-rw-r--r--coin/platform_configs/default.txt2
-rw-r--r--coin/provisioning/common/windows/disable-windows-updates.ps121
-rw-r--r--coin/provisioning/common/windows/install-notepad++.ps17
-rwxr-xr-xcoin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh4
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps12
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86_64/08-msvc-2013-update5.ps13
6 files changed, 25 insertions, 14 deletions
diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt
index f1634e28..5553d7b8 100644
--- a/coin/platform_configs/default.txt
+++ b/coin/platform_configs/default.txt
@@ -12,7 +12,7 @@ qtci-linux-Ubuntu-16.04-x86_64-2 GCC
qtci-linux-openSUSE-42.3-x86_64 GCC DeveloperBuild NoPch
qtci-linux-openSUSE-42.3-x86_64 ICC_18 DeveloperBuild NoPch DisableTests SystemSQLite
qtci-linux-RHEL-6.6-x86_64 GCC Release ForceDebugInfo
-qtci-linux-RHEL-7.4-x86_64 GCC Packaging Release NoUseGoldLinker ForceDebugInfo
+qtci-linux-RHEL-7.4-x86_64 GCC Packaging Release NoUseGoldLinker
qtci-macos-10.12-x86_64-8 Clang Packaging DebugAndRelease Release
qtci-osx-10.11-x86_64-3 Clang DeveloperBuild Release QtNamespace NoPch
qtci-osx-10.10-x86_64 Clang Release NoFramework DisableTests
diff --git a/coin/provisioning/common/windows/disable-windows-updates.ps1 b/coin/provisioning/common/windows/disable-windows-updates.ps1
index 1a014733..05215e20 100644
--- a/coin/provisioning/common/windows/disable-windows-updates.ps1
+++ b/coin/provisioning/common/windows/disable-windows-updates.ps1
@@ -33,5 +33,22 @@
# This script disables the automatic Windows updates
-stop-service wuauserv
-set-service wuauserv –startup disabled
+$service = get-service wuauserv
+if (-not $service) {
+ Write-Host "Windows Update service not found."
+ exit 0
+}
+
+if ($service.Status -eq "Stopped") {
+ Write-Host "Windows Update service already stopped."
+} else {
+ Write-Host "Stopping Windows Update service."
+ stop-service wuauserv
+}
+
+$startup = Get-WmiObject Win32_Service | Where-Object {$_.Name -eq "wuauserv"} | Select -ExpandProperty "StartMode"
+if ($startup -ne "Disabled") {
+ set-service wuauserv -startup disabled
+} else {
+ Write-Host "Windows Update service startup already disabled."
+}
diff --git a/coin/provisioning/common/windows/install-notepad++.ps1 b/coin/provisioning/common/windows/install-notepad++.ps1
index a6e20d5e..4fad6f6d 100644
--- a/coin/provisioning/common/windows/install-notepad++.ps1
+++ b/coin/provisioning/common/windows/install-notepad++.ps1
@@ -57,11 +57,6 @@ Remove-Item -Recurse -Force "$nppPackage"
echo "Notepad++ = $version" >> ~\versions.txt
-if( (is64bitWinHost) -eq 1 ) {
- Rename-Item -Path "C:\Program Files (x86)\Notepad++\updater" -NewName "updater_disabled"
-}
-else {
- Rename-Item -Path "C:\Program Files\Notepad++\updater" -NewName "updater_disabled"
-}
+Rename-Item -Path "C:\Program Files\Notepad++\updater" -NewName "updater_disabled"
echo "Auto-updating disabled."
diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh
index 60e637b7..5d36f57b 100755
--- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh
@@ -52,8 +52,8 @@ ExceptionProxy=104
try
(
- echo "Set timezone to UTC" || throw $ExceptionTimezone
- sudo timedatectl set-timezone Etc/UTC
+ echo "Set timezone to UTC."
+ sudo timedatectl set-timezone Etc/UTC || throw $ExceptionTimezone
echo "Timeout for blanking the screen (0 = never)"
gsettings set org.gnome.desktop.session idle-delay 0 || throw $ExceptionGsettings1
echo "Prevents screen lock when screesaver goes active."
diff --git a/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 b/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1
index 18ce0581..a7a8c035 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1
@@ -38,7 +38,7 @@
$zip = "c:\users\qt\downloads\qnx700.7z"
Invoke-WebRequest -UseBasicParsing http://ci-files01-hki.intra.qt.io/input/qnx/qnx700.7z -OutFile $zip
-Verify-Checksum $zip "2eab8bcf993056f79c9e2585c9c05e05658ba8bb"
+Verify-Checksum $zip "DD3346A3429C06B59BF4D45CE0782F737D2424C7"
Extract-7Zip $zip C:\
[Environment]::SetEnvironmentVariable("QNX_700", "C:\QNX700", "Machine")
diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/08-msvc-2013-update5.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/08-msvc-2013-update5.ps1
index 202d072d..447e7b1f 100644
--- a/coin/provisioning/qtci-windows-8.1-x86_64/08-msvc-2013-update5.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86_64/08-msvc-2013-update5.ps1
@@ -40,10 +40,9 @@ $url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\VS2013.5.exe"
echo "Fetching patch for Visual Studio $version..."
Copy-Item $url_cache $package
-$commandLine = $package
echo "Installing Update 5 for Visual Studio $version..."
-. $commandLine /norestart /passive
+Start-Process -FilePath $package -ArgumentList "/norestart /passive" -Wait
echo "Removing $package ..."
remove-item $package