Merge remote-tracking branch 'origin/5.6' into 5.7

Change-Id: I4a97d7f5b12f9f5e082c44dea279e39417ccf1c4

12 files changed, 50 insertions, 1 deletions

diff --git a/coin/provisioning/common/helpers.ps1 b/coin/provisioning/common/helpers.ps1
index f517e94d..d7b957f3 100644
--- a/coin/provisioning/common/helpers.ps1
+++ b/coin/provisioning/common/helpers.ps1
@@ -27,5 +27,5 @@ function Extract-Zip
     $shell = new-object -com shell.application
     $zipfile = $shell.Namespace($Source)
     $destinationFolder = $shell.Namespace($Destination)
-    $destinationFolder.CopyHere($zipfile.Items())
+    $destinationFolder.CopyHere($zipfile.Items(), 16)
 }
diff --git a/coin/provisioning/common/icu.ps1 b/coin/provisioning/common/icu.ps1
new file mode 100644
index 00000000..4be185e5
--- /dev/null
+++ b/coin/provisioning/common/icu.ps1
@@ -0,0 +1,9 @@
+# ICU is already pre-installed on Windows machines, it would be nice to have
+# the installation script, but for now let's just export the right variables
+
+# FIXME: do we really want to have it per MSVC version? What about MSVC2015?
+[Environment]::SetEnvironmentVariable("CI_ICU_PATH_MSVC2012", "C:\\Utils\\icu_53_1_msvc_2012_64_devel\\icu53_1", "Machine")
+[Environment]::SetEnvironmentVariable("CI_ICU_PATH_MSVC2013", "C:\\Utils\\icu_53_1_msvc_2013_64_devel\\icu53_1", "Machine")
+
+# FIXME: do we really want to use the 4.8.2 ICU build?
+[Environment]::SetEnvironmentVariable("CI_ICU_PATH_Mingw49", "C:\Utils\icu_53_1_Mingw_builds_4_8_2_posix_seh_64_devel\icu53_1", "Machine")
diff --git a/coin/provisioning/common/jom.ps1 b/coin/provisioning/common/jom.ps1
index c233ee6e..ef012b64 100644
--- a/coin/provisioning/common/jom.ps1
+++ b/coin/provisioning/common/jom.ps1
@@ -5,3 +5,5 @@ $zip = "c:\users\qt\downloads\jom_1_1_0.zip"
 Invoke-WebRequest -UseBasicParsing http://download.qt.io/official_releases/jom/jom_1_1_0.zip -OutFile $zip
 Verify-Checksum $zip "C4149FE706B25738B4C4E54C73E180B9CAB55832"
 Extract-Zip $zip C:\Utils\Jom
+
+[Environment]::SetEnvironmentVariable("CI_JOM_PATH", "C:\Utils\Jom", "Machine")
diff --git a/coin/provisioning/qtci-osx-10.10/crashreporter.sh b/coin/provisioning/qtci-osx-10.10/crashreporter.sh
new file mode 100644
index 00000000..ba8dbdd3
--- /dev/null
+++ b/coin/provisioning/qtci-osx-10.10/crashreporter.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+defaults write com.apple.CrashReporter DialogType server
diff --git a/coin/provisioning/qtci-osx-10.11/crashreporter.sh b/coin/provisioning/qtci-osx-10.11/crashreporter.sh
new file mode 100644
index 00000000..ba8dbdd3
--- /dev/null
+++ b/coin/provisioning/qtci-osx-10.11/crashreporter.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+defaults write com.apple.CrashReporter DialogType server
diff --git a/coin/provisioning/qtci-osx-10.8/crashreporter.sh b/coin/provisioning/qtci-osx-10.8/crashreporter.sh
new file mode 100644
index 00000000..ba8dbdd3
--- /dev/null
+++ b/coin/provisioning/qtci-osx-10.8/crashreporter.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+defaults write com.apple.CrashReporter DialogType server
diff --git a/coin/provisioning/qtci-osx-10.9/crashreporter.sh b/coin/provisioning/qtci-osx-10.9/crashreporter.sh
new file mode 100644
index 00000000..ba8dbdd3
--- /dev/null
+++ b/coin/provisioning/qtci-osx-10.9/crashreporter.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+defaults write com.apple.CrashReporter DialogType server
diff --git a/coin/provisioning/qtci-windows-10-x86/icu.ps1 b/coin/provisioning/qtci-windows-10-x86/icu.ps1
new file mode 100644
index 00000000..7756bd0f
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86/icu.ps1
@@ -0,0 +1,6 @@
+Set-ExecutionPolicy RemoteSigned -Force
+
+# install jom
+. "$PSScriptRoot\..\common\icu.ps1"
+
+Set-ExecutionPolicy Restricted -Force
diff --git a/coin/provisioning/qtci-windows-10-x86_64/icu.ps1 b/coin/provisioning/qtci-windows-10-x86_64/icu.ps1
new file mode 100644
index 00000000..7756bd0f
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86_64/icu.ps1
@@ -0,0 +1,6 @@
+Set-ExecutionPolicy RemoteSigned -Force
+
+# install jom
+. "$PSScriptRoot\..\common\icu.ps1"
+
+Set-ExecutionPolicy Restricted -Force
diff --git a/coin/provisioning/qtci-windows-7-x86/icu.ps1 b/coin/provisioning/qtci-windows-7-x86/icu.ps1
new file mode 100644
index 00000000..7756bd0f
--- /dev/null
+++ b/coin/provisioning/qtci-windows-7-x86/icu.ps1
@@ -0,0 +1,6 @@
+Set-ExecutionPolicy RemoteSigned -Force
+
+# install jom
+. "$PSScriptRoot\..\common\icu.ps1"
+
+Set-ExecutionPolicy Restricted -Force
diff --git a/coin/provisioning/qtci-windows-8-x86/icu.ps1 b/coin/provisioning/qtci-windows-8-x86/icu.ps1
new file mode 100644
index 00000000..7756bd0f
--- /dev/null
+++ b/coin/provisioning/qtci-windows-8-x86/icu.ps1
@@ -0,0 +1,6 @@
+Set-ExecutionPolicy RemoteSigned -Force
+
+# install jom
+. "$PSScriptRoot\..\common\icu.ps1"
+
+Set-ExecutionPolicy Restricted -Force
diff --git a/coin/provisioning/qtci-windows-8-x86_64/icu.ps1 b/coin/provisioning/qtci-windows-8-x86_64/icu.ps1
new file mode 100644
index 00000000..7756bd0f
--- /dev/null
+++ b/coin/provisioning/qtci-windows-8-x86_64/icu.ps1
@@ -0,0 +1,6 @@
+Set-ExecutionPolicy RemoteSigned -Force
+
+# install jom
+. "$PSScriptRoot\..\common\icu.ps1"
+
+Set-ExecutionPolicy Restricted -Force