summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@qt.io>2017-07-09 10:33:56 +0200
committerSimon Hausmann <simon.hausmann@qt.io>2017-07-14 07:24:32 +0000
commitd615b4a99f2dcbdf464323b4c63f4f71b08b8c47 (patch)
tree0d809a18ab4cc1295ec473d3819b56d5ff0900df
parentbded0e1bbc43c1243b2d924f54862b5b7eb748ec (diff)
parentbbf18ab4ad3d965f1512f64e7d3c49eeb5f3f8b3 (diff)
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts: .gitmodules coin/platform_configs/qt5.txt Remove QNX Windows builds, 0358b6d2 Remove Integrity build temporarily, QTBUG-61702 coin/provisioning/qtci-macos-10.12-x86_64/020-xcode.sh Done-with: Liang Qi <liang.qi@qt.io> Change-Id: I5a56633d6cd60b5514828060fde87f784e54cdda
-rw-r--r--.gitignore1
-rw-r--r--.gitmodules17
-rw-r--r--coin/platform_configs/default.txt27
-rw-r--r--coin/platform_configs/qt5.txt18
-rw-r--r--coin/platform_configs/qtwebkit.txt5
-rw-r--r--coin/pre-provisioning/qtci-windows-10-x86/06-msvc_2017_build_tools.ps148
-rw-r--r--coin/pre-provisioning/qtci-windows-10-x86/msvc2017.ps12
-rw-r--r--coin/pre-provisioning/qtci-windows-10-x86_64/06-msvc_2017_build_tools.ps148
-rw-r--r--coin/pre-provisioning/qtci-windows-10-x86_64/msvc2017.ps12
-rw-r--r--coin/provisioning/common/03-conan.ps18
-rw-r--r--coin/provisioning/common/3dstudio_3rdparty.ps110
-rw-r--r--coin/provisioning/common/InstallFromCompressedFileFromURL.sh2
-rw-r--r--coin/provisioning/common/cmake.ps12
-rw-r--r--coin/provisioning/common/conan_manifests/icu/57.1/annulen/stable/export/conanmanifest.txt (renamed from coin/provisioning/qtci-windows-7-x86/conanfiles/qtwebkit.manifests/icu/57.1/annulen/stable/export/conanmanifest.txt)0
-rw-r--r--coin/provisioning/common/conan_manifests/icu/57.1/annulen/stable/package/df887949b128f2725c575258bd175fe4d30ba476/conanmanifest.txt (renamed from coin/provisioning/qtci-windows-7-x86/conanfiles/qtwebkit.manifests/icu/57.1/annulen/stable/package/df887949b128f2725c575258bd175fe4d30ba476/conanmanifest.txt)0
-rw-r--r--coin/provisioning/common/conan_manifests/icu/59.1/vitallium/stable/export/conanmanifest.txt2
-rw-r--r--coin/provisioning/common/conan_manifests/icu/59.1/vitallium/stable/package/970e773c5651dc2560f86200a4ea56c23f568ff9/conanmanifest.txt187
-rw-r--r--coin/provisioning/common/conan_manifests/icu/59.1/vitallium/stable/package/c85f9b402dd4d46acdf074e1c63b768a41181d7a/conanmanifest.txt187
-rw-r--r--coin/provisioning/common/conan_manifests/icu/59.1/vitallium/stable/package/c97b9e1abccf18d0aefcbcdef01d2c4689917df6/conanmanifest.txt187
-rw-r--r--coin/provisioning/common/conan_manifests/icu/59.1/vitallium/stable/package/ca0c09cfa678fd91b04c82824988c42e9ac40ddf/conanmanifest.txt187
-rw-r--r--coin/provisioning/common/conan_manifests/libxml2/2.9.4/annulen/stable/export/conanmanifest.txt (renamed from coin/provisioning/qtci-windows-7-x86/conanfiles/qtwebkit.manifests/libxml2/2.9.4/annulen/stable/export/conanmanifest.txt)0
-rw-r--r--coin/provisioning/common/conan_manifests/libxml2/2.9.4/annulen/stable/package/357fb491ae867cbbfe369d54132f4f21c3f13f7d/conanmanifest.txt (renamed from coin/provisioning/qtci-windows-7-x86/conanfiles/qtwebkit.manifests/libxml2/2.9.4/annulen/stable/package/357fb491ae867cbbfe369d54132f4f21c3f13f7d/conanmanifest.txt)0
-rw-r--r--coin/provisioning/common/conan_manifests/libxml2/2.9.4/vitallium/stable/export/conanmanifest.txt2
-rw-r--r--coin/provisioning/common/conan_manifests/libxml2/2.9.4/vitallium/stable/package/3c9b592a3dd15507b8a6d90a8fcc34d2b4de2260/conanmanifest.txt (renamed from coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/libxml2/2.9.4/vitallium/stable/package/95a4a855074d4607ef02a5a86bf5ef1666dd773e/conanmanifest.txt)14
-rw-r--r--coin/provisioning/common/conan_manifests/libxml2/2.9.4/vitallium/stable/package/61c4f21bb72fcb92afb46571ac7caaa967c09c5d/conanmanifest.txt (renamed from coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.manifests/libxml2/2.9.4/vitallium/stable/package/0de2434f61f19881f1d4cfe60c583be521a65d08/conanmanifest.txt)14
-rw-r--r--coin/provisioning/common/conan_manifests/libxml2/2.9.4/vitallium/stable/package/8ec39b27fb5828ba512b3f2dafe88cc0962c29b9/conanmanifest.txt55
-rw-r--r--coin/provisioning/common/conan_manifests/libxml2/2.9.4/vitallium/stable/package/e08083f0910e4ba3ae89c4298d94b672829af1fe/conanmanifest.txt55
-rw-r--r--coin/provisioning/common/conan_manifests/libxslt/1.1.29/annulen/stable/export/conanmanifest.txt (renamed from coin/provisioning/qtci-windows-7-x86/conanfiles/qtwebkit.manifests/libxslt/1.1.29/annulen/stable/export/conanmanifest.txt)0
-rw-r--r--coin/provisioning/common/conan_manifests/libxslt/1.1.29/annulen/stable/package/30620cba1eaf28add40f441a20f7d1be9a5c636c/conanmanifest.txt (renamed from coin/provisioning/qtci-windows-7-x86/conanfiles/qtwebkit.manifests/libxslt/1.1.29/annulen/stable/package/30620cba1eaf28add40f441a20f7d1be9a5c636c/conanmanifest.txt)0
-rw-r--r--coin/provisioning/common/conan_manifests/libxslt/1.1.29/vitallium/stable/export/conanmanifest.txt (renamed from coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.manifests/libxslt/1.1.29/vitallium/stable/export/conanmanifest.txt)2
-rw-r--r--coin/provisioning/common/conan_manifests/libxslt/1.1.29/vitallium/stable/package/19663639a14063d996b277c7fac0e00264689c20/conanmanifest.txt (renamed from coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/libxslt/1.1.29/vitallium/stable/package/19663639a14063d996b277c7fac0e00264689c20/conanmanifest.txt)0
-rw-r--r--coin/provisioning/common/conan_manifests/libxslt/1.1.29/vitallium/stable/package/466fc39fa8b7a19ee2095aa945fff98630acdd12/conanmanifest.txt (renamed from coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.manifests/libxslt/1.1.29/vitallium/stable/package/466fc39fa8b7a19ee2095aa945fff98630acdd12/conanmanifest.txt)0
-rw-r--r--coin/provisioning/common/conan_manifests/libxslt/1.1.29/vitallium/stable/package/8c83c725f7fefe466a2c6c18ff17d3b0b91202c6/conanmanifest.txt38
-rw-r--r--coin/provisioning/common/conan_manifests/libxslt/1.1.29/vitallium/stable/package/f8cbe39e2f6584ea05b56c1f3dd9b0a99f522727/conanmanifest.txt38
-rw-r--r--coin/provisioning/common/conan_manifests/zlib/1.2.8/annulen/stable/export/conanmanifest.txt (renamed from coin/provisioning/qtci-windows-7-x86/conanfiles/qtwebkit.manifests/zlib/1.2.8/annulen/stable/export/conanmanifest.txt)0
-rw-r--r--coin/provisioning/common/conan_manifests/zlib/1.2.8/annulen/stable/package/a990f14748d35a55b067140a0973ea7204f67350/conanmanifest.txt (renamed from coin/provisioning/qtci-windows-7-x86/conanfiles/qtwebkit.manifests/zlib/1.2.8/annulen/stable/package/a990f14748d35a55b067140a0973ea7204f67350/conanmanifest.txt)0
-rw-r--r--coin/provisioning/common/helpers.ps132
-rwxr-xr-xcoin/provisioning/common/homebrew.sh3
-rwxr-xr-xcoin/provisioning/common/install_xcode.sh83
-rw-r--r--coin/provisioning/common/libclang.ps132
-rwxr-xr-xcoin/provisioning/common/libclang.sh73
-rw-r--r--coin/provisioning/common/msvc_2015_update3_patch.ps160
-rw-r--r--coin/provisioning/common/ninja.ps112
-rw-r--r--coin/provisioning/common/python.ps14
-rw-r--r--coin/provisioning/common/sw_versions.txt1
-rw-r--r--coin/provisioning/common/windows_removethemall.ps1 (renamed from coin/provisioning/common/01-windows_removethemall.ps1)2
-rwxr-xr-xcoin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-libclang.sh9
-rwxr-xr-xcoin/provisioning/qtci-linux-RHEL-7.2-x86_64/08-libclang.sh9
-rw-r--r--coin/provisioning/qtci-linux-RHEL-7.2-x86_64/10-qnx_700.sh64
-rwxr-xr-xcoin/provisioning/qtci-linux-RHEL-7.2-x86_64/30-integrity.sh55
-rwxr-xr-xcoin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/001-systemsetup.sh7
-rwxr-xr-xcoin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/003-qemu.sh12
-rwxr-xr-xcoin/provisioning/qtci-macos-10.12-x86_64/005-systemsetup.sh11
-rwxr-xr-xcoin/provisioning/qtci-macos-10.12-x86_64/007-SSL_keychain.sh3
-rwxr-xr-xcoin/provisioning/qtci-macos-10.12-x86_64/020-java.sh129
-rwxr-xr-xcoin/provisioning/qtci-macos-10.12-x86_64/020-xcode.sh65
-rwxr-xr-xcoin/provisioning/qtci-macos-10.12-x86_64/030-android.sh116
-rwxr-xr-xcoin/provisioning/qtci-macos-10.12-x86_64/035-openssl.sh117
-rwxr-xr-xcoin/provisioning/qtci-osx-10.10-x86_64/08-libclang.sh5
-rw-r--r--coin/provisioning/qtci-osx-10.10-x86_64/android.sh103
-rwxr-xr-xcoin/provisioning/qtci-osx-10.11-x86_64/005-systemsetup.sh11
-rwxr-xr-xcoin/provisioning/qtci-osx-10.11-x86_64/007-SSL_keychain.sh3
-rwxr-xr-xcoin/provisioning/qtci-osx-10.11-x86_64/020-xcode.sh67
-rwxr-xr-xcoin/provisioning/qtci-osx-10.11-x86_64/025-homebrew.sh4
-rwxr-xr-xcoin/provisioning/qtci-osx-10.11-x86_64/026-p7zip.sh4
-rwxr-xr-xcoin/provisioning/qtci-osx-10.11-x86_64/08-libclang.sh5
-rw-r--r--coin/provisioning/qtci-osx-10.8-x86_64/001-crashreporter.sh2
-rw-r--r--coin/provisioning/qtci-osx-10.8-x86_64/002-disable-screensaver.sh26
-rwxr-xr-xcoin/provisioning/qtci-osx-10.8-x86_64/08-libclang.sh5
-rw-r--r--coin/provisioning/qtci-osx-10.9-x86_64/001-crashreporter.sh2
-rw-r--r--coin/provisioning/qtci-osx-10.9-x86_64/002-disable-screensaver.sh26
-rwxr-xr-xcoin/provisioning/qtci-osx-10.9-x86_64/08-libclang.sh5
-rw-r--r--coin/provisioning/qtci-windows-10-x86/01-windows_removethemall.ps12
-rw-r--r--coin/provisioning/qtci-windows-10-x86/03-conan.ps18
-rw-r--r--coin/provisioning/qtci-windows-10-x86/06-ninja.ps11
-rw-r--r--coin/provisioning/qtci-windows-10-x86/08-libclang.ps11
-rw-r--r--coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.manifests/icu/57.1/vitallium/stable/export/conanmanifest.txt2
-rw-r--r--coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.manifests/icu/57.1/vitallium/stable/package/08d619707be406a9063a13de35af19767e64a982/conanmanifest.txt180
-rw-r--r--coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.manifests/libxml2/2.9.4/vitallium/stable/export/conanmanifest.txt2
-rw-r--r--coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt2
-rw-r--r--[-rwxr-xr-x]coin/provisioning/qtci-windows-10-x86/msvc.ps1 (renamed from coin/provisioning/qtci-linux-OpenSuSE-13.01-x86_64/openssl_allow_ssl2.sh)19
-rw-r--r--coin/provisioning/qtci-windows-10-x86/msvc_2015_update3_patch.ps118
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/01-windows_removethemall.ps12
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/03-conan.ps124
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/05-mingw53.ps148
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps146
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/06-ninja.ps11
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/08-libclang.ps11
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/3dstudio_3rdparty.ps11
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/icu/57.1/vitallium/stable/export/conanmanifest.txt2
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/icu/57.1/vitallium/stable/package/c4195ae4643996fbb226d1e0265076354ac622bb/conanmanifest.txt180
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/libxml2/2.9.4/vitallium/stable/export/conanmanifest.txt2
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/libxslt/1.1.29/vitallium/stable/export/conanmanifest.txt2
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.txt2
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/msvc.ps143
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/msvc_2015_update3_patch.ps118
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/mysql.ps170
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/opengl32_x86.ps12
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/openssl.ps14
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/postgresql.ps125
-rw-r--r--coin/provisioning/qtci-windows-7-x86/01-windows_removethemall.ps12
-rw-r--r--coin/provisioning/qtci-windows-7-x86/04-msys.ps12
-rw-r--r--coin/provisioning/qtci-windows-7-x86/06-android.ps14
-rw-r--r--coin/provisioning/qtci-windows-7-x86/07-android_openssl.ps12
-rw-r--r--coin/provisioning/qtci-windows-7-x86/08-ninja.ps11
-rw-r--r--coin/provisioning/qtci-windows-8-x86/01-windows_removethemall.ps12
-rw-r--r--coin/provisioning/qtci-windows-8-x86/08-libclang.ps11
-rw-r--r--coin/provisioning/qtci-windows-8-x86_64/01-windows_removethemall.ps12
-rw-r--r--coin/provisioning/qtci-windows-8-x86_64/08-libclang.ps11
-rwxr-xr-xinit-repository2
-rw-r--r--qt.pro6
111 files changed, 2227 insertions, 831 deletions
diff --git a/.gitignore b/.gitignore
index d5a0a45c..9b8015da 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
Makefile
.qmake.cache
.qmake.super
+*.pro.user*
diff --git a/.gitmodules b/.gitmodules
index 139b3d29..0def5d8d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -68,7 +68,7 @@
url = ../qtrepotools.git
branch = master
status = essential
- qt = false
+ project = -
[submodule "qtwebkit"]
depends = qtbase
recommends = qtdeclarative qtlocation qtmultimedia qtsensors qtwebchannel qtxmlpatterns
@@ -146,8 +146,8 @@
branch = dev
status = addon
[submodule "qt3d"]
- depends = qtdeclarative qtimageformats
- recommends = qtgamepad
+ depends = qtdeclarative
+ recommends = qtimageformats qtgamepad
path = qt3d
url = ../qt3d.git
branch = dev
@@ -295,33 +295,34 @@
depends = qtbase
recommends = qtdeclarative
path = qtgamepad
- url = ../qtgamepad
+ url = ../qtgamepad.git
branch = dev
status = addon
[submodule "qtscxml"]
depends = qtbase qtdeclarative
path = qtscxml
- url = ../qtscxml
+ url = ../qtscxml.git
branch = dev
status = addon
[submodule "qtspeech"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtspeech
- url = ../qtspeech
+ url = ../qtspeech.git
branch = dev
status = addon
[submodule "qtnetworkauth"]
depends = qtbase
recommends = qtwebview
path = qtnetworkauth
- url = ../qtnetworkauth
+ url = ../qtnetworkauth.git
branch = dev
status = addon
[submodule "qtremoteobjects"]
depends = qtbase
+ recommends = qtdeclarative
path = qtremoteobjects
- url = ../qtremoteobjects
+ url = ../qtremoteobjects.git
branch = dev
status = preview
[submodule "qtwebglplugin"]
diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt
index 5f9aba51..d2328871 100644
--- a/coin/platform_configs/default.txt
+++ b/coin/platform_configs/default.txt
@@ -1,26 +1,25 @@
Template Target OS Target arch Compiler Features
----------------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
-qtci-windows-8-x86_64-2 MSVC2013 DeveloperBuild Release BuildExamples
-qtci-windows-10-x86_64-5 MSVC2015 DeveloperBuild Release QtNamespace QtLibInfix
+qtci-windows-8-x86_64-2 MSVC2013 DeveloperBuild Release
+qtci-windows-10-x86_64-7 MSVC2015 DeveloperBuild Release QtNamespace QtLibInfix BuildExamples
qtci-windows-8-x86-2 MSVC2013 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
qtci-windows-8-x86_64-2 MSVC2013 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
-qtci-windows-7-x86-2 Mingw53 Packaging DebugAndRelease Release OpenGLDynamic
-qtci-windows-10-x86-4 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
-qtci-windows-10-x86_64-5 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
-qtci-windows-10-x86_64-5 WinRT_10 x86 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests
-qtci-windows-10-x86_64-5 WinRT_10 armv7 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests
+qtci-windows-7-x86-2 Mingw53 DeveloperBuild Release OpenGLDynamic
+qtci-windows-10-x86_64-7 x86 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
+qtci-windows-10-x86_64-7 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
+qtci-windows-10-x86_64-7 WinRT_10 x86 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests
+qtci-windows-10-x86_64-7 WinRT_10 armv7 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests
qtci-linux-Ubuntu-16.04-x86_64 GCC NoWidgets ForceDebugInfo
qtci-linux-Ubuntu-16.04-x86_64 GCC DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace
qtci-linux-openSUSE-42.1-x86_64 GCC DeveloperBuild NoPch
qtci-linux-RHEL-6.6-x86_64 GCC Release ForceDebugInfo
qtci-linux-RHEL-7.2-x86_64 GCC Packaging Release NoUseGoldLinker
-qtci-macos-10.12-x86_64-8 Clang DebugAndRelease Release DisableTests
-qtci-osx-10.11-x86_64-3 Clang DeveloperBuild Release QtNamespace NoPch DisableTests
-qtci-osx-10.10-x86_64 Clang Packaging DebugAndRelease Release
-qtci-osx-10.10-x86_64 Clang DeveloperBuild Release QtNamespace NoPch
-qtci-osx-10.10-x86_64 Clang Release NoFramework
+qtci-macos-10.12-x86_64-8 Clang DebugAndRelease Release
+qtci-osx-10.11-x86_64-3 Clang DeveloperBuild Release QtNamespace NoPch
+qtci-osx-10.10-x86_64 Clang Packaging DebugAndRelease Release DisableTests
+qtci-osx-10.10-x86_64 Clang Release NoFramework DisableTests
qtci-osx-10.10-x86_64 IOS_ANY x86_64 Clang Release DisableTests Static
qtci-linux-RHEL-7.2-x86_64 Android_ANY armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
-qtci-linux-Ubuntu-16.04-x86_64 Boot2Qt_Jethro x86_64 GCC DisableTests
-qtci-linux-RHEL-6.6-x86_64 QNX_660 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
+qtci-linux-Ubuntu-16.04-x86_64 Boot2Qt_Jethro armv7 GCC Release
qtci-linux-Ubuntu-16.04-x86_64 GCC TestOnly LicenseCheck
+qtci-linux-RHEL-7.2-x86_64 QNX_700 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt
index 8d1fb22c..bf1ec3ff 100644
--- a/coin/platform_configs/qt5.txt
+++ b/coin/platform_configs/qt5.txt
@@ -1,16 +1,20 @@
Template Target OS Target arch Compiler Features
--------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
-qtci-windows-10-x86_64-5 WinRT_10 MSVC2015 Packaging DebugAndRelease Release DisableTests
+qtci-windows-10-x86_64-7 WinRT_10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests
+qtci-windows-10-x86-6 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests
+qtci-windows-10-x86_64-7 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests
+qtci-windows-10-x86_64-7 WinRT_10 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests
+qtci-windows-7-x86-2 Mingw53 Packaging DebugAndRelease Release OpenGLDynamic DisableTests
+qtci-windows-10-x86_64-7 WinRT_10 armv7 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests
+qtci-windows-10-x86_64-7 WinRT_10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests
qtci-linux-RHEL-7.2-x86_64 Android_ANY x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
qtci-windows-7-x86-2 Android_ANY armv7 Mingw53 Packaging Release DisableTests OpenGLES2
qtci-windows-7-x86-2 Android_ANY x86 Mingw53 Packaging Release DisableTests OpenGLES2
-qtci-osx-10.10-x86_64 Android_ANY armv7 GCC Packaging Release DisableTests OpenGLES2
-qtci-osx-10.10-x86_64 Android_ANY x86 GCC Packaging Release DisableTests OpenGLES2
-qtci-osx-10.11-x86_64 Android_ANY armv7 GCC Packaging Release DisableTests OpenGLES2
-qtci-osx-10.11-x86_64 Android_ANY x86 GCC Packaging Release DisableTests OpenGLES2
+qtci-macos-10.12-x86_64-8 Android_ANY armv7 GCC Packaging Release DisableTests OpenGLES2
+qtci-macos-10.12-x86_64-8 Android_ANY x86 GCC Packaging Release DisableTests OpenGLES2
qtci-linux-RHEL-6.6-x86_64 QNX_660 x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
-qtci-windows-7-x86-2 QNX_660 armv7 Mingw53 Packaging Release DisableTests OpenGLES2
-qtci-windows-7-x86-2 QNX_660 x86 Mingw53 Packaging Release DisableTests OpenGLES2
+qtci-linux-RHEL-6.6-x86_64 QNX_660 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
+qtci-linux-RHEL-7.2-x86_64 QNX_700 x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
qtci-osx-10.10-x86_64 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static
qtci-macos-10.12-x86_64-8 TvOS_ANY multi Clang DebugAndRelease DisableTests
qtci-macos-10.12-x86_64-8 WatchOS_ANY multi Clang DebugAndRelease DisableTests
diff --git a/coin/platform_configs/qtwebkit.txt b/coin/platform_configs/qtwebkit.txt
new file mode 100644
index 00000000..abc434de
--- /dev/null
+++ b/coin/platform_configs/qtwebkit.txt
@@ -0,0 +1,5 @@
+Template Target OS Target arch Compiler Features
+--------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
+qtci-windows-10-x86-6 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests
+qtci-windows-10-x86_64-7 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests
+qtci-windows-7-x86-2 Mingw53 Packaging DebugAndRelease Release OpenGLDynamic DisableTests
diff --git a/coin/pre-provisioning/qtci-windows-10-x86/06-msvc_2017_build_tools.ps1 b/coin/pre-provisioning/qtci-windows-10-x86/06-msvc_2017_build_tools.ps1
new file mode 100644
index 00000000..556a352f
--- /dev/null
+++ b/coin/pre-provisioning/qtci-windows-10-x86/06-msvc_2017_build_tools.ps1
@@ -0,0 +1,48 @@
+############################################################################
+##
+## Copyright (C) 2017 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the provisioning scripts of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL21$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://www.qt.io/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 or version 3 as published by the Free
+## Software Foundation and appearing in the file LICENSE.LGPLv21 and
+## LICENSE.LGPLv3 included in the packaging of this file. Please review the
+## following information to ensure the GNU Lesser General Public License
+## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## As a special exception, The Qt Company gives you certain additional
+## rights. These rights are described in The Qt Company LGPL Exception
+## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+. "$PSScriptRoot\..\common\helpers.ps1"
+
+# This script will install Visual Studio 2017 Build Tools
+# https://www.visualstudio.com/downloads/#build-tools-for-visual-studio-2017
+
+$version = "2017_version_15.0"
+$url_cache = "http://ci-files01-hki.ci.local/input/windows/mu_build_tools_for_visual_studio_" + $version + "_x86_x64_10254482.exe"
+$sha1 = "a31e099e5114fef80a21654689e6864afc544a16"
+$msvcPackage = "C:\Windows\Temp\$version.exe"
+
+Download $url_cache $url_cache $msvcPackage
+Verify-Checksum $msvcPackage $sha1
+cmd /c "$msvcPackage --all --passive --wait"
+echo "Cleaning $msvcPackage.."
+Remove-Item -Recurse -Force "$msvcPackage"
+echo "Visual Studio Build Tools = $version" >> ~\versions.txt
diff --git a/coin/pre-provisioning/qtci-windows-10-x86/msvc2017.ps1 b/coin/pre-provisioning/qtci-windows-10-x86/msvc2017.ps1
index 46675c23..01442324 100644
--- a/coin/pre-provisioning/qtci-windows-10-x86/msvc2017.ps1
+++ b/coin/pre-provisioning/qtci-windows-10-x86/msvc2017.ps1
@@ -43,7 +43,7 @@ $msvcPackage = "C:\Windows\Temp\$version.exe"
Download $url_cache $url_cache $msvcPackage
Verify-Checksum $msvcPackage $sha1
-cmd /c "$msvcPackage --all --norestart --quiet --wait"
+cmd /c "$msvcPackage --all --norestart --quiet --wait --add Microsoft.VisualStudio.Component.VC.Tools.ARM"
echo "Cleaning $msvcPackage.."
Remove-Item -Recurse -Force "$msvcPackage"
echo "Visual Studio = $version" >> ~\versions.txt
diff --git a/coin/pre-provisioning/qtci-windows-10-x86_64/06-msvc_2017_build_tools.ps1 b/coin/pre-provisioning/qtci-windows-10-x86_64/06-msvc_2017_build_tools.ps1
new file mode 100644
index 00000000..556a352f
--- /dev/null
+++ b/coin/pre-provisioning/qtci-windows-10-x86_64/06-msvc_2017_build_tools.ps1
@@ -0,0 +1,48 @@
+############################################################################
+##
+## Copyright (C) 2017 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the provisioning scripts of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL21$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://www.qt.io/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 or version 3 as published by the Free
+## Software Foundation and appearing in the file LICENSE.LGPLv21 and
+## LICENSE.LGPLv3 included in the packaging of this file. Please review the
+## following information to ensure the GNU Lesser General Public License
+## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## As a special exception, The Qt Company gives you certain additional
+## rights. These rights are described in The Qt Company LGPL Exception
+## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+. "$PSScriptRoot\..\common\helpers.ps1"
+
+# This script will install Visual Studio 2017 Build Tools
+# https://www.visualstudio.com/downloads/#build-tools-for-visual-studio-2017
+
+$version = "2017_version_15.0"
+$url_cache = "http://ci-files01-hki.ci.local/input/windows/mu_build_tools_for_visual_studio_" + $version + "_x86_x64_10254482.exe"
+$sha1 = "a31e099e5114fef80a21654689e6864afc544a16"
+$msvcPackage = "C:\Windows\Temp\$version.exe"
+
+Download $url_cache $url_cache $msvcPackage
+Verify-Checksum $msvcPackage $sha1
+cmd /c "$msvcPackage --all --passive --wait"
+echo "Cleaning $msvcPackage.."
+Remove-Item -Recurse -Force "$msvcPackage"
+echo "Visual Studio Build Tools = $version" >> ~\versions.txt
diff --git a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2017.ps1 b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2017.ps1
index 46675c23..01442324 100644
--- a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2017.ps1
+++ b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2017.ps1
@@ -43,7 +43,7 @@ $msvcPackage = "C:\Windows\Temp\$version.exe"
Download $url_cache $url_cache $msvcPackage
Verify-Checksum $msvcPackage $sha1
-cmd /c "$msvcPackage --all --norestart --quiet --wait"
+cmd /c "$msvcPackage --all --norestart --quiet --wait --add Microsoft.VisualStudio.Component.VC.Tools.ARM"
echo "Cleaning $msvcPackage.."
Remove-Item -Recurse -Force "$msvcPackage"
echo "Visual Studio = $version" >> ~\versions.txt
diff --git a/coin/provisioning/common/03-conan.ps1 b/coin/provisioning/common/03-conan.ps1
index 6a4b4ebb..2c9d9f8d 100644
--- a/coin/provisioning/common/03-conan.ps1
+++ b/coin/provisioning/common/03-conan.ps1
@@ -2,7 +2,10 @@
$scriptsPath = "C:\Python27\Scripts"
-& "$scriptsPath\pip.exe" install --upgrade conan==0.20.2
+& "$scriptsPath\pip.exe" install --upgrade conan==0.24.0
+
+# Use Qt Project repository by default
+& "$scriptsPath\conan.exe" remote add qtproject https://api.bintray.com/conan/qtproject/conan --insert
[Environment]::SetEnvironmentVariable("CI_CONAN_BUILDINFO_DIR", "C:\Utils\conanbuildinfos", "Machine")
@@ -32,11 +35,12 @@ function Run-Conan-Install
$extraArgs = "-s compiler.libcxx=$($CompilerLibcxx)"
}
+ $manifestsDir = "$PSScriptRoot\conan_manifests"
+
Get-ChildItem -Path "$ConanfilesDir\*.txt" |
ForEach-Object {
$conanfile = $_.FullName
$outpwd = "C:\Utils\conanbuildinfos\$($BuildinfoDir)\$($_.BaseName)"
- $manifestsDir = "$($_.DirectoryName)\$($_.BaseName).manifests"
New-Item $outpwd -Type directory -Force
$process = Start-Process-Logged `
diff --git a/coin/provisioning/common/3dstudio_3rdparty.ps1 b/coin/provisioning/common/3dstudio_3rdparty.ps1
new file mode 100644
index 00000000..36816438
--- /dev/null
+++ b/coin/provisioning/common/3dstudio_3rdparty.ps1
@@ -0,0 +1,10 @@
+. "$PSScriptRoot\helpers.ps1"
+
+$zip = "c:\users\qt\downloads\Qt3DStudio-3rdparty-win64-CI.zip"
+
+Invoke-WebRequest -UseBasicParsing http://ci-files01-hki.ci.local/input/3rdparty/Qt3DStudio-3rdparty-win64-CI.zip -OutFile $zip
+Verify-Checksum $zip "08D740D2EFB4CBCDE7D012908B89AA48DE5CD4E1"
+Extract-Zip $zip C:\Utils\Qt3DStudio3rdparty
+Remove-Item $zip
+
+[Environment]::SetEnvironmentVariable("QT3DSTUDIO_3RDPARTY_DIR", "C:/Utils/Qt3DStudio3rdparty", "Machine")
diff --git a/coin/provisioning/common/InstallFromCompressedFileFromURL.sh b/coin/provisioning/common/InstallFromCompressedFileFromURL.sh
index 1f097d32..e3716597 100644
--- a/coin/provisioning/common/InstallFromCompressedFileFromURL.sh
+++ b/coin/provisioning/common/InstallFromCompressedFileFromURL.sh
@@ -80,7 +80,7 @@ function InstallFromCompressedFileFromURL {
;;
esac
echo "Moving app to $installDirectory"
- sudo mkdir "$installDirectory"
+ sudo mkdir -p "$installDirectory"
sudo mv "$targetDirectory/$appPrefix/"* "$installDirectory" || throw $ExceptionMoveApp
echo "Removing file '$targetFile'"
rm "$targetFile" || throw $ExceptionDeleteTmpFile
diff --git a/coin/provisioning/common/cmake.ps1 b/coin/provisioning/common/cmake.ps1
index 6870f3a7..88e2a10c 100644
--- a/coin/provisioning/common/cmake.ps1
+++ b/coin/provisioning/common/cmake.ps1
@@ -2,7 +2,7 @@
$zip = "c:\users\qt\downloads\cmake-3.6.2-win32-x86.zip"
-Download https://cmake.org/files/v3.6/cmake-3.6.2-win32-x86.zip http://ci-files01-hki.ci.local/input/cmake/cmake-3.6.2-win32-x86.zip $zip
+Download https://cmake.org/files/v3.6/cmake-3.6.2-win32-x86.zip \\ci-files01-hki.ci.local\provisioning\cmake\cmake-3.6.2-win32-x86.zip $zip
Verify-Checksum $zip "541F6E7EFD228E46770B8631FFE57097576E4D4E"
Extract-Zip $zip C:
diff --git a/coin/provisioning/qtci-windows-7-x86/conanfiles/qtwebkit.manifests/icu/57.1/annulen/stable/export/conanmanifest.txt b/coin/provisioning/common/conan_manifests/icu/57.1/annulen/stable/export/conanmanifest.txt
index c61454b9..c61454b9 100644
--- a/coin/provisioning/qtci-windows-7-x86/conanfiles/qtwebkit.manifests/icu/57.1/annulen/stable/export/conanmanifest.txt
+++ b/coin/provisioning/common/conan_manifests/icu/57.1/annulen/stable/export/conanmanifest.txt
diff --git a/coin/provisioning/qtci-windows-7-x86/conanfiles/qtwebkit.manifests/icu/57.1/annulen/stable/package/df887949b128f2725c575258bd175fe4d30ba476/conanmanifest.txt b/coin/provisioning/common/conan_manifests/icu/57.1/annulen/stable/package/df887949b128f2725c575258bd175fe4d30ba476/conanmanifest.txt
index ada3d009..ada3d009 100644
--- a/coin/provisioning/qtci-windows-7-x86/conanfiles/qtwebkit.manifests/icu/57.1/annulen/stable/package/df887949b128f2725c575258bd175fe4d30ba476/conanmanifest.txt
+++ b/coin/provisioning/common/conan_manifests/icu/57.1/annulen/stable/package/df887949b128f2725c575258bd175fe4d30ba476/conanmanifest.txt
diff --git a/coin/provisioning/common/conan_manifests/icu/59.1/vitallium/stable/export/conanmanifest.txt b/coin/provisioning/common/conan_manifests/icu/59.1/vitallium/stable/export/conanmanifest.txt
new file mode 100644
index 00000000..b7d5c80b
--- /dev/null
+++ b/coin/provisioning/common/conan_manifests/icu/59.1/vitallium/stable/export/conanmanifest.txt
@@ -0,0 +1,2 @@
+1499107210
+conanfile.py: 3efebe46ba6af17316bd4e2a6fffef0c
diff --git a/coin/provisioning/common/conan_manifests/icu/59.1/vitallium/stable/package/970e773c5651dc2560f86200a4ea56c23f568ff9/conanmanifest.txt b/coin/provisioning/common/conan_manifests/icu/59.1/vitallium/stable/package/970e773c5651dc2560f86200a4ea56c23f568ff9/conanmanifest.txt
new file mode 100644
index 00000000..888563eb
--- /dev/null
+++ b/coin/provisioning/common/conan_manifests/icu/59.1/vitallium/stable/package/970e773c5651dc2560f86200a4ea56c23f568ff9/conanmanifest.txt
@@ -0,0 +1,187 @@
+1499107660
+bin/icudt59.dll: 2a60bfe06670d8605ae7fc97c4ec2db7
+bin/icuin59.dll: d0a46fdd146a1bd68dde8bcb6b019470
+bin/icuio59.dll: 1fb60d06bcb4a5811e503a679b28dd67
+bin/icutest59.dll: 71bd203b8b2b930ca35240937c0f5429
+bin/icutu59.dll: fb0e6e2ee5c12c4809007747fcc23ad4
+bin/icuuc59.dll: 405d599ca8b2fbf78e6efeda65fdfffb
+conaninfo.txt: b0fbb0ff195375b137bed8cc0921caad
+include/unicode/alphaindex.h: c4e73b7d46eacc8fa67691e4dd0b5ecc
+include/unicode/appendable.h: deea01996ebb26600e2dde91ed196395
+include/unicode/basictz.h: 01cabd21915d2cee7d2ef7787240e8f2
+include/unicode/brkiter.h: 03b569a42e7dae96c0c86ad2c8d3bd00
+include/unicode/bytestream.h: 61e720935437b6830d58b216918552d2
+include/unicode/bytestrie.h: b61efc3e639298f2a6c19fec6d0622f5
+include/unicode/bytestriebuilder.h: 62d2640165c997f0abe27994f59318e3
+include/unicode/calendar.h: 759cbc7bd35d6efc0a4976dd753eb485
+include/unicode/caniter.h: 330f1b6de404cfb24479f009926890f2
+include/unicode/casemap.h: 61bbc0c334ada3bea9920815ce033de4
+include/unicode/char16ptr.h: 06b3963db87be73f87dac310136fc58c
+include/unicode/chariter.h: 362ade4f54a9fa6f1c845078440e2b03
+include/unicode/choicfmt.h: b12a447a93d96d3a6080c978dfdecdb4
+include/unicode/coleitr.h: f03e36876d1a9829eae20fab28f32d6a
+include/unicode/coll.h: 7d6cddc98e3227bd2277afa6d7793a50
+include/unicode/compactdecimalformat.h: b3bdc4cc4ea3b3af9a930614ef68db37
+include/unicode/curramt.h: 323107674df349a27d624663757447e4
+include/unicode/currpinf.h: 18f3f5825fd0511a670d7eff90201719
+include/unicode/currunit.h: 4b1c4900fd9cee8de157f549cf8d47f0
+include/unicode/datefmt.h: c07976e59ac1c1c08c98bf9d4e4c3587
+include/unicode/dbbi.h: db0a5e6e9dd092466fbbe21e949e4820
+include/unicode/dcfmtsym.h: eafe4061e7fad4ebe1a3a11ea219c12b
+include/unicode/decimfmt.h: fec30b356bf6a646a172977caf2678ee
+include/unicode/docmain.h: 49875d4c4b781f05d1c51668c74b94bb
+include/unicode/dtfmtsym.h: 4fec8e6662b9914a8d99b2a75ce75a5a
+include/unicode/dtintrv.h: 05a46fbf5f15b7bb2ba59f44814ac095
+include/unicode/dtitvfmt.h: 5c42410d99e25e140d8e84af39139512
+include/unicode/dtitvinf.h: e7eddd3476b1aadb8bb17350985081d6
+include/unicode/dtptngen.h: 4edbf8188c936b808141a17e24f6c17e
+include/unicode/dtrule.h: c0ad9c5a662d96a067b3687c6b788fd6
+include/unicode/edits.h: 0d3660bc8cb14c5e78bb0fba7438e184
+include/unicode/enumset.h: 488a530c2f5d1727105b317bfb38ffab
+include/unicode/errorcode.h: 200ad3b02dcd2eda1545afa64f26211d
+include/unicode/fieldpos.h: 7b200989ccaf13e87506ff8a9a8352c1
+include/unicode/fmtable.h: ef9c81283b88d29b6b77d2c68896d166
+include/unicode/format.h: 21bfd1ffede54a82d257a30f623ae117
+include/unicode/fpositer.h: 0b8be269e646080334eb0db252708fa1
+include/unicode/gender.h: f76ef0004a630139b9636327e22f52cf
+include/unicode/gregocal.h: dadf449275698c6eb227c86c90c84f5b
+include/unicode/icudataver.h: 64966d178a3ba96a36698afd0c9033ac
+include/unicode/icuplug.h: 1a4b0dfe535992811342f87165dfc128
+include/unicode/idna.h: 935119343007e6e8267e34d3217e73ef
+include/unicode/listformatter.h: 454de478acb396e0646bc756226986b0
+include/unicode/localpointer.h: 032493d057b13fcc5d7d264ec1349ecd
+include/unicode/locdspnm.h: 75098c2fc6615d040e8b5204e27918f8
+include/unicode/locid.h: 34733130bd4387fa544d6761034a0955
+include/unicode/measfmt.h: c289038b60c170659cec114a06b75ec4
+include/unicode/measunit.h: 9f937c7b82e74afdf577427e5abef253
+include/unicode/measure.h: 907a564bb50d5a3b3de69b61a095ac49
+include/unicode/messagepattern.h: ddb001f5da316149ced07415fddfbbe1
+include/unicode/msgfmt.h: 92fdcc17d1cc5be345a65b9c5028b814
+include/unicode/normalizer2.h: 1f8ec62f9f338f429627c61fb797d12a
+include/unicode/normlzr.h: 1acf5026f3c915a30405c961c5045f51
+include/unicode/numfmt.h: 2e869d45a97e3366930352561becf1f7
+include/unicode/numsys.h: 966281097c9a71c7ce80de4738bbaf4b
+include/unicode/parseerr.h: 82430679207228ecccebf2ac9a0dc226
+include/unicode/parsepos.h: d465f317154c05dae43efe1975c2254b
+include/unicode/platform.h: 8ccf4dfd92fdd1d8076ed97a83f4ff0e
+include/unicode/plurfmt.h: 7f33dc3d5b6c677e920b388e66688d6e
+include/unicode/plurrule.h: efb1059c8f408ab3df8a355625aa91ac
+include/unicode/ptypes.h: c124ecdb51748de2a5900c42f64fa33e
+include/unicode/putil.h: f594f056f0e8fa7e7d2ee9e3772f1465
+include/unicode/rbbi.h: 10e5ea07511aad18458a2bb59c302fce
+include/unicode/rbnf.h: 46a62b91bbf605d0fc90de27c0c28ade
+include/unicode/rbtz.h: 6adc59fe9f2ec0203fad1bb291ceb2be
+include/unicode/regex.h: 2e5c4264f79b43bc754a558f5d9ef81d
+include/unicode/region.h: 9975298932902d63b823382424ecb04f
+include/unicode/reldatefmt.h: fe0bf48d5fae4130b3e1d97da05b8147
+include/unicode/rep.h: ad2f3d61aabf5507f9670e17adc4f3e0
+include/unicode/resbund.h: 2e5313c39e2d8e644fefb5fda9830032
+include/unicode/schriter.h: 10ebc14456ec8a08190a1d8484d865c8
+include/unicode/scientificnumberformatter.h: 19c921c0a75274bdd13ae9e70354b9b9
+include/unicode/search.h: 3a213657ab777b638423df43e775ead6
+include/unicode/selfmt.h: f31478edaee06e562fc70fe4bffb39f7
+include/unicode/simpleformatter.h: 32f8edf8033ddcd3d89560aca235d2b1
+include/unicode/simpletz.h: b38692fd7ed1ecd8474412602bb43a7a
+include/unicode/smpdtfmt.h: 0cddd4d1f197beddae2bf6d6e569b414
+include/unicode/sortkey.h: 76daf42075f7fdeeb06215922144bd87
+include/unicode/std_string.h: 57499f3b70cb13b85da38ecaed834924
+include/unicode/strenum.h: e23cde5594426e607d37d59252ed7542
+include/unicode/stringpiece.h: 2c7657b53e2cd414c5dc2aac429e8be9
+include/unicode/stringtriebuilder.h: 596067734fd5ecbf08ef1a5b29f7c521
+include/unicode/stsearch.h: c75b420ffcf6cb64c1c70fbdce1ec303
+include/unicode/symtable.h: aaa0d4278cc7c873390133c81319afe4
+include/unicode/tblcoll.h: 593c21ed8376bcfab87993dfdb24f579
+include/unicode/timezone.h: e0b13f33042ae96d152da2dfac53895a
+include/unicode/tmunit.h: 47bad5bb37ad95cf4aa966962f672247
+include/unicode/tmutamt.h: 7e216295ad757e1e7050a27b4cbb04c4
+include/unicode/tmutfmt.h: 3e66e10feff34abe4f606c544bf56a98
+include/unicode/translit.h: cd5eb1480620fe72661af2c5420030c7
+include/unicode/tzfmt.h: cc77e978689ef62e83fbf50297da7068
+include/unicode/tznames.h: fc0fd902a3ab39c3ecd5376affa3e091
+include/unicode/tzrule.h: adc2e3690a81499fa482f09a7c891e3a
+include/unicode/tztrans.h: ddc16397303c7c3a6cdb51d6cae76c9c
+include/unicode/ubidi.h: 3c3447aff91ca3aba39294f283fc0a83
+include/unicode/ubrk.h: c4d61d02474b921b6deabf19730f2d93
+include/unicode/ucal.h: 85fbc0a93c781ff4f283abf56213548f
+include/unicode/ucasemap.h: bbc08907ca608e090dd2551dae7f5063
+include/unicode/ucat.h: 9887bf7cefa89c96630bcd3757663ec0
+include/unicode/uchar.h: d0caa0cad8f0760769e7269c8e27b2f0
+include/unicode/ucharstrie.h: a831881a1c5f601a27a96107a9c93b40
+include/unicode/ucharstriebuilder.h: aab813b785d803391adad3e89eae430b
+include/unicode/uchriter.h: 26dfb5f728be01852cb52402fc018235
+include/unicode/uclean.h: 7b7b73a66324b026c775cf2f467108f3
+include/unicode/ucnv.h: 8925fbf6e9921bf45b485c31ee4124ed
+include/unicode/ucnv_cb.h: 2132a185faeb5cd603344098e4f685f5
+include/unicode/ucnv_err.h: 641fb44cae3f286f307ce2e445b3589f
+include/unicode/ucnvsel.h: 5f129128041b8ec652fa13bc007c7168
+include/unicode/ucol.h: c1ae405a33aca9786cf4125a7ea30854
+include/unicode/ucoleitr.h: c5f7f5720c58a63df5277f4c275813f7
+include/unicode/uconfig.h: 9cd76a9d2008c77116c1e3d34cd5c20f
+include/unicode/ucsdet.h: 84999c29e225c4d11a89e2c691892c6a
+include/unicode/ucurr.h: 22ebc57d60d31ca6e5be08b5dcfabb36
+include/unicode/udat.h: 4fceb68710dfed43778da6b5dabf5b81
+include/unicode/udata.h: 8ffc7d27c431eaa31709bed2450b1987
+include/unicode/udateintervalformat.h: ec7b522f7376efc94280461a798e122e
+include/unicode/udatpg.h: c13609bba2d9cdd91475c80f2934e8b9
+include/unicode/udisplaycontext.h: d85a18d600e97fcdbb4177583633e20b
+include/unicode/uenum.h: 9f0843888060124393c5b6d3ac1d0494
+include/unicode/ufieldpositer.h: 9a2caec923d0bbc2c167e17a42e2ff74
+include/unicode/uformattable.h: 5a52db48b81c8e2d770353f347c64d1a
+include/unicode/ugender.h: 23ec9fe7670c419c57462625cc2afaee
+include/unicode/uidna.h: ffd28dd05da8ad3813d2d41b1f01c517
+include/unicode/uiter.h: 50847b964f6fb474e0290150338c9f27
+include/unicode/uldnames.h: 6fba02d8cd519586d066c4f4e5eb1640
+include/unicode/ulistformatter.h: 2d9feb1e057219dd43898dc23da7e476
+include/unicode/uloc.h: 03e3d991937d286c75e3206c5494646e
+include/unicode/ulocdata.h: f282e04c22e0616817a04f80f536f688
+include/unicode/umachine.h: 1d6f3281c1b8a8eb9ba4dbd670d6af7c
+include/unicode/umisc.h: c0dc3caac921970252ee4bbc1bddc43a
+include/unicode/umsg.h: ed50cc36346ea063fd3681385064ead3
+include/unicode/unifilt.h: 6e228f15b2fa8f564abb51500674d72b
+include/unicode/unifunct.h: a9f9e469e946e88a9c64919c468e5d62
+include/unicode/unimatch.h: 6c2cbf80f1f605b165bebc5ae8e12aaa
+include/unicode/unirepl.h: a021ccf09bb715625b9677bdc7700584
+include/unicode/uniset.h: 501821f127cc093433327c44909a7575
+include/unicode/unistr.h: 7dfa9c3626c3dcf71390eb50b57a3716
+include/unicode/unorm.h: 39bbe48ae8534029dab7f097188c8b31
+include/unicode/unorm2.h: eb8b5bb935701284a4480a2facb7f0b8
+include/unicode/unum.h: ac906837bfd6caac1259c6f7913b94a2
+include/unicode/unumsys.h: dfc4fd29fa10dea8de5981a79badf4ec
+include/unicode/uobject.h: 7cd3e374dd78321b69313bc3f416ed4c
+include/unicode/upluralrules.h: f2b80b6b9a9ea8edae1aba78830f4789
+include/unicode/uregex.h: bf69ecde49c5418db27194cdad8ee0ff
+include/unicode/uregion.h: 6d72ea56f92d9da81cc8b3e8d47a3f04
+include/unicode/ureldatefmt.h: 480530556bbe46fbd5996fa86a878b98
+include/unicode/urename.h: 0685d5314e8537121559a98ef7a143c4
+include/unicode/urep.h: 04cce4d1e9a074179ec8e7ba6f5f02ee
+include/unicode/ures.h: d9d89fedbe10df5011c03a8238572e07
+include/unicode/uscript.h: acd32dac19000101a28b81eeaec612e8
+include/unicode/usearch.h: afd9eb69236e27449e7249264bfeae56
+include/unicode/uset.h: 69481ff3106e5b8cc6f36cfa3c23225a
+include/unicode/usetiter.h: 3b9ae44eb5a47ce6e20ed00fc45c0cb6
+include/unicode/ushape.h: 1f89bcc0f93cb5df8059e8a2717009a7
+include/unicode/uspoof.h: 140a8c6518698a56c917d18ef6dbd2b7
+include/unicode/usprep.h: d4a57d01cb61f594c84c3fffac8a87d5
+include/unicode/ustdio.h: 7d32dbc31f136ce97096cd25429dceef
+include/unicode/ustream.h: 211a3e48dbe1921522d956bef0747361
+include/unicode/ustring.h: 12b77389aad7d0b76c86d405566840a9
+include/unicode/ustringtrie.h: 08f062a843c6bf78d8d95b1ba566d6ec
+include/unicode/utext.h: a8cf1115720b99ca855918f92343ce8b
+include/unicode/utf.h: b7827e05a4bc90b9ca27ab14491ca1bd
+include/unicode/utf16.h: 4447226555e524f4c0f596c197ae65d5
+include/unicode/utf32.h: 076c1d2025d949556d976b9e6aa01410
+include/unicode/utf8.h: 3afe43776eb2e8d3448551c9a6996a12
+include/unicode/utf_old.h: 0c46b30f4140adf50fe9ed350815a0d8
+include/unicode/utmscale.h: 8ea13d3120de87b49a240014ecfdce7f
+include/unicode/utrace.h: 0216d0e5e1e1e10e014f3a8882fa0760
+include/unicode/utrans.h: 25231668b49b0de8ca1db79ff0f348d8
+include/unicode/utypes.h: a3c935253e46b4c313b0ee58cadcd04d
+include/unicode/uvernum.h: 8044bea1ca820f40b1e82b2ae5cbfbfa
+include/unicode/uversion.h: b3e0658e920f56306839af39fa5f35b7
+include/unicode/vtzone.h: 138782b1f4177e15964c21e7e8cb21d3
+lib/icudt.lib: abf4c53a45afe7fe2232b7461db1f39c
+lib/icuin.lib: 469731f3bb6c6c483a42168a9afff5fc
+lib/icuio.lib: 62eebc954d46dbf22cf7e838f8bf0292
+lib/icutest.lib: 2dfda9f30ee5cd92c8e9752f19f1311f
+lib/icutu.lib: 2ddf814a788e2fb77a9d06f38142a3ce
+lib/icuuc.lib: 140e4ca5bbf6f88f504a2fd4bfafdd1d
diff --git a/coin/provisioning/common/conan_manifests/icu/59.1/vitallium/stable/package/c85f9b402dd4d46acdf074e1c63b768a41181d7a/conanmanifest.txt b/coin/provisioning/common/conan_manifests/icu/59.1/vitallium/stable/package/c85f9b402dd4d46acdf074e1c63b768a41181d7a/conanmanifest.txt
new file mode 100644
index 00000000..948bc2f1
--- /dev/null
+++ b/coin/provisioning/common/conan_manifests/icu/59.1/vitallium/stable/package/c85f9b402dd4d46acdf074e1c63b768a41181d7a/conanmanifest.txt
@@ -0,0 +1,187 @@
+1499329586
+bin/icudt59.dll: c23a39dad5b1810d53b142a79dd8040e
+bin/icuin59.dll: c6904963eefd97137dd301db55c28f52
+bin/icuio59.dll: bd28d124d21c1aff1b77de11ef952447
+bin/icutest59.dll: e59aadd25c91d6b21fbdca3f18c0f3c3
+bin/icutu59.dll: 2256b957799e3816cfaedc6871f0be90
+bin/icuuc59.dll: 9a9c7f35b1fa2f93e557710e89eede8a
+conaninfo.txt: 830576b304c6027b1312b1ed5165bd4b
+include/unicode/alphaindex.h: c4e73b7d46eacc8fa67691e4dd0b5ecc
+include/unicode/appendable.h: deea01996ebb26600e2dde91ed196395
+include/unicode/basictz.h: 01cabd21915d2cee7d2ef7787240e8f2
+include/unicode/brkiter.h: 03b569a42e7dae96c0c86ad2c8d3bd00
+include/unicode/bytestream.h: 61e720935437b6830d58b216918552d2
+include/unicode/bytestrie.h: b61efc3e639298f2a6c19fec6d0622f5
+include/unicode/bytestriebuilder.h: 62d2640165c997f0abe27994f59318e3
+include/unicode/calendar.h: 759cbc7bd35d6efc0a4976dd753eb485
+include/unicode/caniter.h: 330f1b6de404cfb24479f009926890f2
+include/unicode/casemap.h: 61bbc0c334ada3bea9920815ce033de4
+include/unicode/char16ptr.h: 06b3963db87be73f87dac310136fc58c
+include/unicode/chariter.h: 362ade4f54a9fa6f1c845078440e2b03
+include/unicode/choicfmt.h: b12a447a93d96d3a6080c978dfdecdb4
+include/unicode/coleitr.h: f03e36876d1a9829eae20fab28f32d6a
+include/unicode/coll.h: 7d6cddc98e3227bd2277afa6d7793a50
+include/unicode/compactdecimalformat.h: b3bdc4cc4ea3b3af9a930614ef68db37
+include/unicode/curramt.h: 323107674df349a27d624663757447e4
+include/unicode/currpinf.h: 18f3f5825fd0511a670d7eff90201719
+include/unicode/currunit.h: 4b1c4900fd9cee8de157f549cf8d47f0
+include/unicode/datefmt.h: c07976e59ac1c1c08c98bf9d4e4c3587
+include/unicode/dbbi.h: db0a5e6e9dd092466fbbe21e949e4820
+include/unicode/dcfmtsym.h: eafe4061e7fad4ebe1a3a11ea219c12b
+include/unicode/decimfmt.h: fec30b356bf6a646a172977caf2678ee
+include/unicode/docmain.h: 49875d4c4b781f05d1c51668c74b94bb
+include/unicode/dtfmtsym.h: 4fec8e6662b9914a8d99b2a75ce75a5a
+include/unicode/dtintrv.h: 05a46fbf5f15b7bb2ba59f44814ac095
+include/unicode/dtitvfmt.h: 5c42410d99e25e140d8e84af39139512
+include/unicode/dtitvinf.h: e7eddd3476b1aadb8bb17350985081d6
+include/unicode/dtptngen.h: 4edbf8188c936b808141a17e24f6c17e
+include/unicode/dtrule.h: c0ad9c5a662d96a067b3687c6b788fd6
+include/unicode/edits.h: 0d3660bc8cb14c5e78bb0fba7438e184
+include/unicode/enumset.h: 488a530c2f5d1727105b317bfb38ffab
+include/unicode/errorcode.h: 200ad3b02dcd2eda1545afa64f26211d
+include/unicode/fieldpos.h: 7b200989ccaf13e87506ff8a9a8352c1
+include/unicode/fmtable.h: ef9c81283b88d29b6b77d2c68896d166
+include/unicode/format.h: 21bfd1ffede54a82d257a30f623ae117
+include/unicode/fpositer.h: 0b8be269e646080334eb0db252708fa1
+include/unicode/gender.h: f76ef0004a630139b9636327e22f52cf
+include/unicode/gregocal.h: dadf449275698c6eb227c86c90c84f5b
+include/unicode/icudataver.h: 64966d178a3ba96a36698afd0c9033ac
+include/unicode/icuplug.h: 1a4b0dfe535992811342f87165dfc128
+include/unicode/idna.h: 935119343007e6e8267e34d3217e73ef
+include/unicode/listformatter.h: 454de478acb396e0646bc756226986b0
+include/unicode/localpointer.h: 032493d057b13fcc5d7d264ec1349ecd
+include/unicode/locdspnm.h: 75098c2fc6615d040e8b5204e27918f8
+include/unicode/locid.h: 34733130bd4387fa544d6761034a0955
+include/unicode/measfmt.h: c289038b60c170659cec114a06b75ec4
+include/unicode/measunit.h: 9f937c7b82e74afdf577427e5abef253
+include/unicode/measure.h: 907a564bb50d5a3b3de69b61a095ac49
+include/unicode/messagepattern.h: ddb001f5da316149ced07415fddfbbe1
+include/unicode/msgfmt.h: 92fdcc17d1cc5be345a65b9c5028b814
+include/unicode/normalizer2.h: 1f8ec62f9f338f429627c61fb797d12a
+include/unicode/normlzr.h: 1acf5026f3c915a30405c961c5045f51
+include/unicode/numfmt.h: 2e869d45a97e3366930352561becf1f7
+include/unicode/numsys.h: 966281097c9a71c7ce80de4738bbaf4b
+include/unicode/parseerr.h: 82430679207228ecccebf2ac9a0dc226
+include/unicode/parsepos.h: d465f317154c05dae43efe1975c2254b
+include/unicode/platform.h: 8ccf4dfd92fdd1d8076ed97a83f4ff0e
+include/unicode/plurfmt.h: 7f33dc3d5b6c677e920b388e66688d6e
+include/unicode/plurrule.h: efb1059c8f408ab3df8a355625aa91ac
+include/unicode/ptypes.h: c124ecdb51748de2a5900c42f64fa33e
+include/unicode/putil.h: f594f056f0e8fa7e7d2ee9e3772f1465
+include/unicode/rbbi.h: 10e5ea07511aad18458a2bb59c302fce
+include/unicode/rbnf.h: 46a62b91bbf605d0fc90de27c0c28ade
+include/unicode/rbtz.h: 6adc59fe9f2ec0203fad1bb291ceb2be
+include/unicode/regex.h: 2e5c4264f79b43bc754a558f5d9ef81d
+include/unicode/region.h: 9975298932902d63b823382424ecb04f
+include/unicode/reldatefmt.h: fe0bf48d5fae4130b3e1d97da05b8147
+include/unicode/rep.h: ad2f3d61aabf5507f9670e17adc4f3e0
+include/unicode/resbund.h: 2e5313c39e2d8e644fefb5fda9830032
+include/unicode/schriter.h: 10ebc14456ec8a08190a1d8484d865c8
+include/unicode/scientificnumberformatter.h: 19c921c0a75274bdd13ae9e70354b9b9
+include/unicode/search.h: 3a213657ab777b638423df43e775ead6
+include/unicode/selfmt.h: f31478edaee06e562fc70fe4bffb39f7
+include/unicode/simpleformatter.h: 32f8edf8033ddcd3d89560aca235d2b1
+include/unicode/simpletz.h: b38692fd7ed1ecd8474412602bb43a7a
+include/unicode/smpdtfmt.h: 0cddd4d1f197beddae2bf6d6e569b414
+include/unicode/sortkey.h: 76daf42075f7fdeeb06215922144bd87
+include/unicode/std_string.h: 57499f3b70cb13b85da38ecaed834924
+include/unicode/strenum.h: e23cde5594426e607d37d59252ed7542
+include/unicode/stringpiece.h: 2c7657b53e2cd414c5dc2aac429e8be9
+include/unicode/stringtriebuilder.h: 596067734fd5ecbf08ef1a5b29f7c521
+include/unicode/stsearch.h: c75b420ffcf6cb64c1c70fbdce1ec303
+include/unicode/symtable.h: aaa0d4278cc7c873390133c81319afe4
+include/unicode/tblcoll.h: 593c21ed8376bcfab87993dfdb24f579
+include/unicode/timezone.h: e0b13f33042ae96d152da2dfac53895a
+include/unicode/tmunit.h: 47bad5bb37ad95cf4aa966962f672247
+include/unicode/tmutamt.h: 7e216295ad757e1e7050a27b4cbb04c4
+include/unicode/tmutfmt.h: 3e66e10feff34abe4f606c544bf56a98
+include/unicode/translit.h: cd5eb1480620fe72661af2c5420030c7
+include/unicode/tzfmt.h: cc77e978689ef62e83fbf50297da7068
+include/unicode/tznames.h: fc0fd902a3ab39c3ecd5376affa3e091
+include/unicode/tzrule.h: adc2e3690a81499fa482f09a7c891e3a
+include/unicode/tztrans.h: ddc16397303c7c3a6cdb51d6cae76c9c
+include/unicode/ubidi.h: 3c3447aff91ca3aba39294f283fc0a83
+include/unicode/ubrk.h: c4d61d02474b921b6deabf19730f2d93
+include/unicode/ucal.h: 85fbc0a93c781ff4f283abf56213548f
+include/unicode/ucasemap.h: bbc08907ca608e090dd2551dae7f5063
+include/unicode/ucat.h: 9887bf7cefa89c96630bcd3757663ec0
+include/unicode/uchar.h: d0caa0cad8f0760769e7269c8e27b2f0
+include/unicode/ucharstrie.h: a831881a1c5f601a27a96107a9c93b40
+include/unicode/ucharstriebuilder.h: aab813b785d803391adad3e89eae430b
+include/unicode/uchriter.h: 26dfb5f728be01852cb52402fc018235
+include/unicode/uclean.h: 7b7b73a66324b026c775cf2f467108f3
+include/unicode/ucnv.h: 8925fbf6e9921bf45b485c31ee4124ed
+include/unicode/ucnv_cb.h: 2132a185faeb5cd603344098e4f685f5
+include/unicode/ucnv_err.h: 641fb44cae3f286f307ce2e445b3589f
+include/unicode/ucnvsel.h: 5f129128041b8ec652fa13bc007c7168
+include/unicode/ucol.h: c1ae405a33aca9786cf4125a7ea30854
+include/unicode/ucoleitr.h: c5f7f5720c58a63df5277f4c275813f7
+include/unicode/uconfig.h: 9cd76a9d2008c77116c1e3d34cd5c20f
+include/unicode/ucsdet.h: 84999c29e225c4d11a89e2c691892c6a
+include/unicode/ucurr.h: 22ebc57d60d31ca6e5be08b5dcfabb36
+include/unicode/udat.h: 4fceb68710dfed43778da6b5dabf5b81
+include/unicode/udata.h: 8ffc7d27c431eaa31709bed2450b1987
+include/unicode/udateintervalformat.h: ec7b522f7376efc94280461a798e122e
+include/unicode/udatpg.h: c13609bba2d9cdd91475c80f2934e8b9
+include/unicode/udisplaycontext.h: d85a18d600e97fcdbb4177583633e20b
+include/unicode/uenum.h: 9f0843888060124393c5b6d3ac1d0494
+include/unicode/ufieldpositer.h: 9a2caec923d0bbc2c167e17a42e2ff74
+include/unicode/uformattable.h: 5a52db48b81c8e2d770353f347c64d1a
+include/unicode/ugender.h: 23ec9fe7670c419c57462625cc2afaee
+include/unicode/uidna.h: ffd28dd05da8ad3813d2d41b1f01c517
+include/unicode/uiter.h: 50847b964f6fb474e0290150338c9f27
+include/unicode/uldnames.h: 6fba02d8cd519586d066c4f4e5eb1640
+include/unicode/ulistformatter.h: 2d9feb1e057219dd43898dc23da7e476
+include/unicode/uloc.h: 03e3d991937d286c75e3206c5494646e
+include/unicode/ulocdata.h: f282e04c22e0616817a04f80f536f688
+include/unicode/umachine.h: 1d6f3281c1b8a8eb9ba4dbd670d6af7c
+include/unicode/umisc.h: c0dc3caac921970252ee4bbc1bddc43a
+include/unicode/umsg.h: ed50cc36346ea063fd3681385064ead3
+include/unicode/unifilt.h: 6e228f15b2fa8f564abb51500674d72b
+include/unicode/unifunct.h: a9f9e469e946e88a9c64919c468e5d62
+include/unicode/unimatch.h: 6c2cbf80f1f605b165bebc5ae8e12aaa
+include/unicode/unirepl.h: a021ccf09bb715625b9677bdc7700584
+include/unicode/uniset.h: 501821f127cc093433327c44909a7575
+include/unicode/unistr.h: 7dfa9c3626c3dcf71390eb50b57a3716
+include/unicode/unorm.h: 39bbe48ae8534029dab7f097188c8b31
+include/unicode/unorm2.h: eb8b5bb935701284a4480a2facb7f0b8
+include/unicode/unum.h: ac906837bfd6caac1259c6f7913b94a2
+include/unicode/unumsys.h: dfc4fd29fa10dea8de5981a79badf4ec
+include/unicode/uobject.h: 7cd3e374dd78321b69313bc3f416ed4c
+include/unicode/upluralrules.h: f2b80b6b9a9ea8edae1aba78830f4789
+include/unicode/uregex.h: bf69ecde49c5418db27194cdad8ee0ff
+include/unicode/uregion.h: 6d72ea56f92d9da81cc8b3e8d47a3f04
+include/unicode/ureldatefmt.h: 480530556bbe46fbd5996fa86a878b98
+include/unicode/urename.h: 0685d5314e8537121559a98ef7a143c4
+include/unicode/urep.h: 04cce4d1e9a074179ec8e7ba6f5f02ee
+include/unicode/ures.h: d9d89fedbe10df5011c03a8238572e07
+include/unicode/uscript.h: acd32dac19000101a28b81eeaec612e8
+include/unicode/usearch.h: afd9eb69236e27449e7249264bfeae56
+include/unicode/uset.h: 69481ff3106e5b8cc6f36cfa3c23225a
+include/unicode/usetiter.h: 3b9ae44eb5a47ce6e20ed00fc45c0cb6
+include/unicode/ushape.h: 1f89bcc0f93cb5df8059e8a2717009a7
+include/unicode/uspoof.h: 140a8c6518698a56c917d18ef6dbd2b7
+include/unicode/usprep.h: d4a57d01cb61f594c84c3fffac8a87d5
+include/unicode/ustdio.h: 7d32dbc31f136ce97096cd25429dceef
+include/unicode/ustream.h: 211a3e48dbe1921522d956bef0747361
+include/unicode/ustring.h: 12b77389aad7d0b76c86d405566840a9
+include/unicode/ustringtrie.h: 08f062a843c6bf78d8d95b1ba566d6ec
+include/unicode/utext.h: a8cf1115720b99ca855918f92343ce8b
+include/unicode/utf.h: b7827e05a4bc90b9ca27ab14491ca1bd
+include/unicode/utf16.h: 4447226555e524f4c0f596c197ae65d5
+include/unicode/utf32.h: 076c1d2025d949556d976b9e6aa01410
+include/unicode/utf8.h: 3afe43776eb2e8d3448551c9a6996a12
+include/unicode/utf_old.h: 0c46b30f4140adf50fe9ed350815a0d8
+include/unicode/utmscale.h: 8ea13d3120de87b49a240014ecfdce7f
+include/unicode/utrace.h: 0216d0e5e1e1e10e014f3a8882fa0760
+include/unicode/utrans.h: 25231668b49b0de8ca1db79ff0f348d8
+include/unicode/utypes.h: a3c935253e46b4c313b0ee58cadcd04d
+include/unicode/uvernum.h: 8044bea1ca820f40b1e82b2ae5cbfbfa
+include/unicode/uversion.h: b3e0658e920f56306839af39fa5f35b7
+include/unicode/vtzone.h: 138782b1f4177e15964c21e7e8cb21d3
+lib/icudt.lib: 8521dc55a20637af8e7cae4453fdae92
+lib/icuin.lib: 0af113d81bab592d2b7c628476b0a715
+lib/icuio.lib: 6812ca214d913a3e0ea303ddf899ff71
+lib/icutest.lib: 1bd7477e81bf551abdd0e80412b85805
+lib/icutu.lib: a69d87281efd6ade323f7c449ded3bb4
+lib/icuuc.lib: 74d264685f3ac6b7df1333fcf486aa45
diff --git a/coin/provisioning/common/conan_manifests/icu/59.1/vitallium/stable/package/c97b9e1abccf18d0aefcbcdef01d2c4689917df6/conanmanifest.txt b/coin/provisioning/common/conan_manifests/icu/59.1/vitallium/stable/package/c97b9e1abccf18d0aefcbcdef01d2c4689917df6/conanmanifest.txt
new file mode 100644
index 00000000..e9b0ee71
--- /dev/null
+++ b/coin/provisioning/common/conan_manifests/icu/59.1/vitallium/stable/package/c97b9e1abccf18d0aefcbcdef01d2c4689917df6/conanmanifest.txt
@@ -0,0 +1,187 @@
+1499105682
+bin/icudt59.dll: 6f7abc01bb1d3d9b4a077c27ec228984
+bin/icuin59.dll: 5db6329ab0e0201d72025de56fa9d6a4
+bin/icuio59.dll: 6d3032695a7c12d3cce58a887f2bc644
+bin/icutest59.dll: 425538ed08d6785902b1238e877bc623
+bin/icutu59.dll: 83e15197d0b59cf5500c0c93aa186748
+bin/icuuc59.dll: 1eb31fe82fca12998a9a37c4852e7272
+conaninfo.txt: ad06024880f91bf13cbd6b54c13cf611
+include/unicode/alphaindex.h: c4e73b7d46eacc8fa67691e4dd0b5ecc
+include/unicode/appendable.h: deea01996ebb26600e2dde91ed196395
+include/unicode/basictz.h: 01cabd21915d2cee7d2ef7787240e8f2
+include/unicode/brkiter.h: 03b569a42e7dae96c0c86ad2c8d3bd00
+include/unicode/bytestream.h: 61e720935437b6830d58b216918552d2
+include/unicode/bytestrie.h: b61efc3e639298f2a6c19fec6d0622f5
+include/unicode/bytestriebuilder.h: 62d2640165c997f0abe27994f59318e3
+include/unicode/calendar.h: 759cbc7bd35d6efc0a4976dd753eb485
+include/unicode/caniter.h: 330f1b6de404cfb24479f009926890f2
+include/unicode/casemap.h: 61bbc0c334ada3bea9920815ce033de4
+include/unicode/char16ptr.h: 06b3963db87be73f87dac310136fc58c
+include/unicode/chariter.h: 362ade4f54a9fa6f1c845078440e2b03
+include/unicode/choicfmt.h: b12a447a93d96d3a6080c978dfdecdb4
+include/unicode/coleitr.h: f03e36876d1a9829eae20fab28f32d6a
+include/unicode/coll.h: 7d6cddc98e3227bd2277afa6d7793a50
+include/unicode/compactdecimalformat.h: b3bdc4cc4ea3b3af9a930614ef68db37
+include/unicode/curramt.h: 323107674df349a27d624663757447e4
+include/unicode/currpinf.h: 18f3f5825fd0511a670d7eff90201719
+include/unicode/currunit.h: 4b1c4900fd9cee8de157f549cf8d47f0
+include/unicode/datefmt.h: c07976e59ac1c1c08c98bf9d4e4c3587
+include/unicode/dbbi.h: db0a5e6e9dd092466fbbe21e949e4820
+include/unicode/dcfmtsym.h: eafe4061e7fad4ebe1a3a11ea219c12b
+include/unicode/decimfmt.h: fec30b356bf6a646a172977caf2678ee
+include/unicode/docmain.h: 49875d4c4b781f05d1c51668c74b94bb
+include/unicode/dtfmtsym.h: 4fec8e6662b9914a8d99b2a75ce75a5a
+include/unicode/dtintrv.h: 05a46fbf5f15b7bb2ba59f44814ac095
+include/unicode/dtitvfmt.h: 5c42410d99e25e140d8e84af39139512
+include/unicode/dtitvinf.h: e7eddd3476b1aadb8bb17350985081d6
+include/unicode/dtptngen.h: 4edbf8188c936b808141a17e24f6c17e
+include/unicode/dtrule.h: c0ad9c5a662d96a067b3687c6b788fd6
+include/unicode/edits.h: 0d3660bc8cb14c5e78bb0fba7438e184
+include/unicode/enumset.h: 488a530c2f5d1727105b317bfb38ffab
+include/unicode/errorcode.h: 200ad3b02dcd2eda1545afa64f26211d
+include/unicode/fieldpos.h: 7b200989ccaf13e87506ff8a9a8352c1
+include/unicode/fmtable.h: ef9c81283b88d29b6b77d2c68896d166
+include/unicode/format.h: 21bfd1ffede54a82d257a30f623ae117
+include/unicode/fpositer.h: 0b8be269e646080334eb0db252708fa1
+include/unicode/gender.h: f76ef0004a630139b9636327e22f52cf
+include/unicode/gregocal.h: dadf449275698c6eb227c86c90c84f5b
+include/unicode/icudataver.h: 64966d178a3ba96a36698afd0c9033ac
+include/unicode/icuplug.h: 1a4b0dfe535992811342f87165dfc128
+include/unicode/idna.h: 935119343007e6e8267e34d3217e73ef
+include/unicode/listformatter.h: 454de478acb396e0646bc756226986b0
+include/unicode/localpointer.h: 032493d057b13fcc5d7d264ec1349ecd
+include/unicode/locdspnm.h: 75098c2fc6615d040e8b5204e27918f8
+include/unicode/locid.h: 34733130bd4387fa544d6761034a0955
+include/unicode/measfmt.h: c289038b60c170659cec114a06b75ec4
+include/unicode/measunit.h: 9f937c7b82e74afdf577427e5abef253
+include/unicode/measure.h: 907a564bb50d5a3b3de69b61a095ac49
+include/unicode/messagepattern.h: ddb001f5da316149ced07415fddfbbe1
+include/unicode/msgfmt.h: 92fdcc17d1cc5be345a65b9c5028b814
+include/unicode/normalizer2.h: 1f8ec62f9f338f429627c61fb797d12a
+include/unicode/normlzr.h: 1acf5026f3c915a30405c961c5045f51
+include/unicode/numfmt.h: 2e869d45a97e3366930352561becf1f7
+include/unicode/numsys.h: 966281097c9a71c7ce80de4738bbaf4b
+include/unicode/parseerr.h: 82430679207228ecccebf2ac9a0dc226
+include/unicode/parsepos.h: d465f317154c05dae43efe1975c2254b
+include/unicode/platform.h: 8ccf4dfd92fdd1d8076ed97a83f4ff0e
+include/unicode/plurfmt.h: 7f33dc3d5b6c677e920b388e66688d6e
+include/unicode/plurrule.h: efb1059c8f408ab3df8a355625aa91ac
+include/unicode/ptypes.h: c124ecdb51748de2a5900c42f64fa33e
+include/unicode/putil.h: f594f056f0e8fa7e7d2ee9e3772f1465
+include/unicode/rbbi.h: 10e5ea07511aad18458a2bb59c302fce
+include/unicode/rbnf.h: 46a62b91bbf605d0fc90de27c0c28ade
+include/unicode/rbtz.h: 6adc59fe9f2ec0203fad1bb291ceb2be
+include/unicode/regex.h: 2e5c4264f79b43bc754a558f5d9ef81d
+include/unicode/region.h: 9975298932902d63b823382424ecb04f
+include/unicode/reldatefmt.h: fe0bf48d5fae4130b3e1d97da05b8147
+include/unicode/rep.h: ad2f3d61aabf5507f9670e17adc4f3e0
+include/unicode/resbund.h: 2e5313c39e2d8e644fefb5fda9830032
+include/unicode/schriter.h: 10ebc14456ec8a08190a1d8484d865c8
+include/unicode/scientificnumberformatter.h: 19c921c0a75274bdd13ae9e70354b9b9
+include/unicode/search.h: 3a213657ab777b638423df43e775ead6
+include/unicode/selfmt.h: f31478edaee06e562fc70fe4bffb39f7
+include/unicode/simpleformatter.h: 32f8edf8033ddcd3d89560aca235d2b1
+include/unicode/simpletz.h: b38692fd7ed1ecd8474412602bb43a7a
+include/unicode/smpdtfmt.h: 0cddd4d1f197beddae2bf6d6e569b414
+include/unicode/sortkey.h: 76daf42075f7fdeeb06215922144bd87
+include/unicode/std_string.h: 57499f3b70cb13b85da38ecaed834924
+include/unicode/strenum.h: e23cde5594426e607d37d59252ed7542
+include/unicode/stringpiece.h: 2c7657b53e2cd414c5dc2aac429e8be9
+include/unicode/stringtriebuilder.h: 596067734fd5ecbf08ef1a5b29f7c521
+include/unicode/stsearch.h: c75b420ffcf6cb64c1c70fbdce1ec303
+include/unicode/symtable.h: aaa0d4278cc7c873390133c81319afe4
+include/unicode/tblcoll.h: 593c21ed8376bcfab87993dfdb24f579
+include/unicode/timezone.h: e0b13f33042ae96d152da2dfac53895a
+include/unicode/tmunit.h: 47bad5bb37ad95cf4aa966962f672247
+include/unicode/tmutamt.h: 7e216295ad757e1e7050a27b4cbb04c4
+include/unicode/tmutfmt.h: 3e66e10feff34abe4f606c544bf56a98
+include/unicode/translit.h: cd5eb1480620fe72661af2c5420030c7
+include/unicode/tzfmt.h: cc77e978689ef62e83fbf50297da7068
+include/unicode/tznames.h: fc0fd902a3ab39c3ecd5376affa3e091
+include/unicode/tzrule.h: adc2e3690a81499fa482f09a7c891e3a
+include/unicode/tztrans.h: ddc16397303c7c3a6cdb51d6cae76c9c
+include/unicode/ubidi.h: 3c3447aff91ca3aba39294f283fc0a83
+include/unicode/ubrk.h: c4d61d02474b921b6deabf19730f2d93
+include/unicode/ucal.h: 85fbc0a93c781ff4f283abf56213548f
+include/unicode/ucasemap.h: bbc08907ca608e090dd2551dae7f5063
+include/unicode/ucat.h: 9887bf7cefa89c96630bcd3757663ec0
+include/unicode/uchar.h: d0caa0cad8f0760769e7269c8e27b2f0
+include/unicode/ucharstrie.h: a831881a1c5f601a27a96107a9c93b40
+include/unicode/ucharstriebuilder.h: aab813b785d803391adad3e89eae430b
+include/unicode/uchriter.h: 26dfb5f728be01852cb52402fc018235
+include/unicode/uclean.h: 7b7b73a66324b026c775cf2f467108f3
+include/unicode/ucnv.h: 8925fbf6e9921bf45b485c31ee4124ed
+include/unicode/ucnv_cb.h: 2132a185faeb5cd603344098e4f685f5
+include/unicode/ucnv_err.h: 641fb44cae3f286f307ce2e445b3589f
+include/unicode/ucnvsel.h: 5f129128041b8ec652fa13bc007c7168
+include/unicode/ucol.h: c1ae405a33aca9786cf4125a7ea30854
+include/unicode/ucoleitr.h: c5f7f5720c58a63df5277f4c275813f7
+include/unicode/uconfig.h: 9cd76a9d2008c77116c1e3d34cd5c20f
+include/unicode/ucsdet.h: 84999c29e225c4d11a89e2c691892c6a
+include/unicode/ucurr.h: 22ebc57d60d31ca6e5be08b5dcfabb36
+include/unicode/udat.h: 4fceb68710dfed43778da6b5dabf5b81
+include/unicode/udata.h: 8ffc7d27c431eaa31709bed2450b1987
+include/unicode/udateintervalformat.h: ec7b522f7376efc94280461a798e122e
+include/unicode/udatpg.h: c13609bba2d9cdd91475c80f2934e8b9
+include/unicode/udisplaycontext.h: d85a18d600e97fcdbb4177583633e20b
+include/unicode/uenum.h: 9f0843888060124393c5b6d3ac1d0494
+include/unicode/ufieldpositer.h: 9a2caec923d0bbc2c167e17a42e2ff74
+include/unicode/uformattable.h: 5a52db48b81c8e2d770353f347c64d1a
+include/unicode/ugender.h: 23ec9fe7670c419c57462625cc2afaee
+include/unicode/uidna.h: ffd28dd05da8ad3813d2d41b1f01c517
+include/unicode/uiter.h: 50847b964f6fb474e0290150338c9f27
+include/unicode/uldnames.h: 6fba02d8cd519586d066c4f4e5eb1640
+include/unicode/ulistformatter.h: 2d9feb1e057219dd43898dc23da7e476
+include/unicode/uloc.h: 03e3d991937d286c75e3206c5494646e
+include/unicode/ulocdata.h: f282e04c22e0616817a04f80f536f688
+include/unicode/umachine.h: 1d6f3281c1b8a8eb9ba4dbd670d6af7c
+include/unicode/umisc.h: c0dc3caac921970252ee4bbc1bddc43a
+include/unicode/umsg.h: ed50cc36346ea063fd3681385064ead3
+include/unicode/unifilt.h: 6e228f15b2fa8f564abb51500674d72b
+include/unicode/unifunct.h: a9f9e469e946e88a9c64919c468e5d62
+include/unicode/unimatch.h: 6c2cbf80f1f605b165bebc5ae8e12aaa
+include/unicode/unirepl.h: a021ccf09bb715625b9677bdc7700584
+include/unicode/uniset.h: 501821f127cc093433327c44909a7575
+include/unicode/unistr.h: 7dfa9c3626c3dcf71390eb50b57a3716
+include/unicode/unorm.h: 39bbe48ae8534029dab7f097188c8b31
+include/unicode/unorm2.h: eb8b5bb935701284a4480a2facb7f0b8
+include/unicode/unum.h: ac906837bfd6caac1259c6f7913b94a2
+include/unicode/unumsys.h: dfc4fd29fa10dea8de5981a79badf4ec
+include/unicode/uobject.h: 7cd3e374dd78321b69313bc3f416ed4c
+include/unicode/upluralrules.h: f2b80b6b9a9ea8edae1aba78830f4789
+include/unicode/uregex.h: bf69ecde49c5418db27194cdad8ee0ff
+include/unicode/uregion.h: 6d72ea56f92d9da81cc8b3e8d47a3f04
+include/unicode/ureldatefmt.h: 480530556bbe46fbd5996fa86a878b98
+include/unicode/urename.h: 0685d5314e8537121559a98ef7a143c4
+include/unicode/urep.h: 04cce4d1e9a074179ec8e7ba6f5f02ee
+include/unicode/ures.h: d9d89fedbe10df5011c03a8238572e07
+include/unicode/uscript.h: acd32dac19000101a28b81eeaec612e8
+include/unicode/usearch.h: afd9eb69236e27449e7249264bfeae56
+include/unicode/uset.h: 69481ff3106e5b8cc6f36cfa3c23225a
+include/unicode/usetiter.h: 3b9ae44eb5a47ce6e20ed00fc45c0cb6
+include/unicode/ushape.h: 1f89bcc0f93cb5df8059e8a2717009a7
+include/unicode/uspoof.h: 140a8c6518698a56c917d18ef6dbd2b7
+include/unicode/usprep.h: d4a57d01cb61f594c84c3fffac8a87d5
+include/unicode/ustdio.h: 7d32dbc31f136ce97096cd25429dceef
+include/unicode/ustream.h: 211a3e48dbe1921522d956bef0747361
+include/unicode/ustring.h: 12b77389aad7d0b76c86d405566840a9
+include/unicode/ustringtrie.h: 08f062a843c6bf78d8d95b1ba566d6ec
+include/unicode/utext.h: a8cf1115720b99ca855918f92343ce8b
+include/unicode/utf.h: b7827e05a4bc90b9ca27ab14491ca1bd
+include/unicode/utf16.h: 4447226555e524f4c0f596c197ae65d5
+include/unicode/utf32.h: 076c1d2025d949556d976b9e6aa01410
+include/unicode/utf8.h: 3afe43776eb2e8d3448551c9a6996a12
+include/unicode/utf_old.h: 0c46b30f4140adf50fe9ed350815a0d8
+include/unicode/utmscale.h: 8ea13d3120de87b49a240014ecfdce7f
+include/unicode/utrace.h: 0216d0e5e1e1e10e014f3a8882fa0760
+include/unicode/utrans.h: 25231668b49b0de8ca1db79ff0f348d8
+include/unicode/utypes.h: a3c935253e46b4c313b0ee58cadcd04d
+include/unicode/uvernum.h: 8044bea1ca820f40b1e82b2ae5cbfbfa
+include/unicode/uversion.h: b3e0658e920f56306839af39fa5f35b7
+include/unicode/vtzone.h: 138782b1f4177e15964c21e7e8cb21d3
+lib/icudt.lib: 0ad4d2a27d484d1ee141a17582758564
+lib/icuin.lib: 31a061da58f007137f4216294f7147ef
+lib/icuio.lib: 657f8b121afa93db8433e85c98b3a2bc
+lib/icutest.lib: 6d943d87ddd5a627f0c6bad0f5e13724
+lib/icutu.lib: 853af1f403ea9521004a933e91f5b508
+lib/icuuc.lib: 1e7a3fc48a7db11b6cfc16d455a4952b
diff --git a/coin/provisioning/common/conan_manifests/icu/59.1/vitallium/stable/package/ca0c09cfa678fd91b04c82824988c42e9ac40ddf/conanmanifest.txt b/coin/provisioning/common/conan_manifests/icu/59.1/vitallium/stable/package/ca0c09cfa678fd91b04c82824988c42e9ac40ddf/conanmanifest.txt
new file mode 100644
index 00000000..905c0750
--- /dev/null
+++ b/coin/provisioning/common/conan_manifests/icu/59.1/vitallium/stable/package/ca0c09cfa678fd91b04c82824988c42e9ac40ddf/conanmanifest.txt
@@ -0,0 +1,187 @@
+1499330414
+bin/icudt59.dll: f4f67e917d72982f4d38b95a4eebf789
+bin/icuin59.dll: 3aaa0a3bb318eb7da1732e2164c98624
+bin/icuio59.dll: eb2e025f5ebbc37da56a435727ddb27e
+bin/icutest59.dll: 86aa2a9fd01d121b419e9bfc821c541d
+bin/icutu59.dll: 740a6cf36312a3601813ffedb95548dc
+bin/icuuc59.dll: 77ffdc48d26d21580cea392387896d9f
+conaninfo.txt: 72e5f245a2656624132fba01b63171fd
+include/unicode/alphaindex.h: c4e73b7d46eacc8fa67691e4dd0b5ecc
+include/unicode/appendable.h: deea01996ebb26600e2dde91ed196395
+include/unicode/basictz.h: 01cabd21915d2cee7d2ef7787240e8f2
+include/unicode/brkiter.h: 03b569a42e7dae96c0c86ad2c8d3bd00
+include/unicode/bytestream.h: 61e720935437b6830d58b216918552d2
+include/unicode/bytestrie.h: b61efc3e639298f2a6c19fec6d0622f5
+include/unicode/bytestriebuilder.h: 62d2640165c997f0abe27994f59318e3
+include/unicode/calendar.h: 759cbc7bd35d6efc0a4976dd753eb485
+include/unicode/caniter.h: 330f1b6de404cfb24479f009926890f2
+include/unicode/casemap.h: 61bbc0c334ada3bea9920815ce033de4
+include/unicode/char16ptr.h: 06b3963db87be73f87dac310136fc58c
+include/unicode/chariter.h: 362ade4f54a9fa6f1c845078440e2b03
+include/unicode/choicfmt.h: b12a447a93d96d3a6080c978dfdecdb4
+include/unicode/coleitr.h: f03e36876d1a9829eae20fab28f32d6a
+include/unicode/coll.h: 7d6cddc98e3227bd2277afa6d7793a50
+include/unicode/compactdecimalformat.h: b3bdc4cc4ea3b3af9a930614ef68db37
+include/unicode/curramt.h: 323107674df349a27d624663757447e4
+include/unicode/currpinf.h: 18f3f5825fd0511a670d7eff90201719
+include/unicode/currunit.h: 4b1c4900fd9cee8de157f549cf8d47f0
+include/unicode/datefmt.h: c07976e59ac1c1c08c98bf9d4e4c3587
+include/unicode/dbbi.h: db0a5e6e9dd092466fbbe21e949e4820
+include/unicode/dcfmtsym.h: eafe4061e7fad4ebe1a3a11ea219c12b
+include/unicode/decimfmt.h: fec30b356bf6a646a172977caf2678ee
+include/unicode/docmain.h: 49875d4c4b781f05d1c51668c74b94bb
+include/unicode/dtfmtsym.h: 4fec8e6662b9914a8d99b2a75ce75a5a
+include/unicode/dtintrv.h: 05a46fbf5f15b7bb2ba59f44814ac095
+include/unicode/dtitvfmt.h: 5c42410d99e25e140d8e84af39139512
+include/unicode/dtitvinf.h: e7eddd3476b1aadb8bb17350985081d6
+include/unicode/dtptngen.h: 4edbf8188c936b808141a17e24f6c17e
+include/unicode/dtrule.h: c0ad9c5a662d96a067b3687c6b788fd6
+include/unicode/edits.h: 0d3660bc8cb14c5e78bb0fba7438e184
+include/unicode/enumset.h: 488a530c2f5d1727105b317bfb38ffab
+include/unicode/errorcode.h: 200ad3b02dcd2eda1545afa64f26211d
+include/unicode/fieldpos.h: 7b200989ccaf13e87506ff8a9a8352c1
+include/unicode/fmtable.h: ef9c81283b88d29b6b77d2c68896d166
+include/unicode/format.h: 21bfd1ffede54a82d257a30f623ae117
+include/unicode/fpositer.h: 0b8be269e646080334eb0db252708fa1
+include/unicode/gender.h: f76ef0004a630139b9636327e22f52cf
+include/unicode/gregocal.h: dadf449275698c6eb227c86c90c84f5b
+include/unicode/icudataver.h: 64966d178a3ba96a36698afd0c9033ac
+include/unicode/icuplug.h: 1a4b0dfe535992811342f87165dfc128
+include/unicode/idna.h: 935119343007e6e8267e34d3217e73ef
+include/unicode/listformatter.h: 454de478acb396e0646bc756226986b0
+include/unicode/localpointer.h: 032493d057b13fcc5d7d264ec1349ecd
+include/unicode/locdspnm.h: 75098c2fc6615d040e8b5204e27918f8
+include/unicode/locid.h: 34733130bd4387fa544d6761034a0955
+include/unicode/measfmt.h: c289038b60c170659cec114a06b75ec4
+include/unicode/measunit.h: 9f937c7b82e74afdf577427e5abef253
+include/unicode/measure.h: 907a564bb50d5a3b3de69b61a095ac49
+include/unicode/messagepattern.h: ddb001f5da316149ced07415fddfbbe1
+include/unicode/msgfmt.h: 92fdcc17d1cc5be345a65b9c5028b814
+include/unicode/normalizer2.h: 1f8ec62f9f338f429627c61fb797d12a
+include/unicode/normlzr.h: 1acf5026f3c915a30405c961c5045f51
+include/unicode/numfmt.h: 2e869d45a97e3366930352561becf1f7
+include/unicode/numsys.h: 966281097c9a71c7ce80de4738bbaf4b
+include/unicode/parseerr.h: 82430679207228ecccebf2ac9a0dc226
+include/unicode/parsepos.h: d465f317154c05dae43efe1975c2254b
+include/unicode/platform.h: 8ccf4dfd92fdd1d8076ed97a83f4ff0e
+include/unicode/plurfmt.h: 7f33dc3d5b6c677e920b388e66688d6e
+include/unicode/plurrule.h: efb1059c8f408ab3df8a355625aa91ac
+include/unicode/ptypes.h: c124ecdb51748de2a5900c42f64fa33e
+include/unicode/putil.h: f594f056f0e8fa7e7d2ee9e3772f1465
+include/unicode/rbbi.h: 10e5ea07511aad18458a2bb59c302fce
+include/unicode/rbnf.h: 46a62b91bbf605d0fc90de27c0c28ade
+include/unicode/rbtz.h: 6adc59fe9f2ec0203fad1bb291ceb2be
+include/unicode/regex.h: 2e5c4264f79b43bc754a558f5d9ef81d
+include/unicode/region.h: 9975298932902d63b823382424ecb04f
+include/unicode/reldatefmt.h: fe0bf48d5fae4130b3e1d97da05b8147
+include/unicode/rep.h: ad2f3d61aabf5507f9670e17adc4f3e0
+include/unicode/resbund.h: 2e5313c39e2d8e644fefb5fda9830032
+include/unicode/schriter.h: 10ebc14456ec8a08190a1d8484d865c8
+include/unicode/scientificnumberformatter.h: 19c921c0a75274bdd13ae9e70354b9b9
+include/unicode/search.h: 3a213657ab777b638423df43e775ead6
+include/unicode/selfmt.h: f31478edaee06e562fc70fe4bffb39f7
+include/unicode/simpleformatter.h: 32f8edf8033ddcd3d89560aca235d2b1
+include/unicode/simpletz.h: b38692fd7ed1ecd8474412602bb43a7a
+include/unicode/smpdtfmt.h: 0cddd4d1f197beddae2bf6d6e569b414
+include/unicode/sortkey.h: 76daf42075f7fdeeb06215922144bd87
+include/unicode/std_string.h: 57499f3b70cb13b85da38ecaed834924
+include/unicode/strenum.h: e23cde5594426e607d37d59252ed7542
+include/unicode/stringpiece.h: 2c7657b53e2cd414c5dc2aac429e8be9
+include/unicode/stringtriebuilder.h: 596067734fd5ecbf08ef1a5b29f7c521
+include/unicode/stsearch.h: c75b420ffcf6cb64c1c70fbdce1ec303
+include/unicode/symtable.h: aaa0d4278cc7c873390133c81319afe4
+include/unicode/tblcoll.h: 593c21ed8376bcfab87993dfdb24f579
+include/unicode/timezone.h: e0b13f33042ae96d152da2dfac53895a
+include/unicode/tmunit.h: 47bad5bb37ad95cf4aa966962f672247
+include/unicode/tmutamt.h: 7e216295ad757e1e7050a27b4cbb04c4
+include/unicode/tmutfmt.h: 3e66e10feff34abe4f606c544bf56a98
+include/unicode/translit.h: cd5eb1480620fe72661af2c5420030c7
+include/unicode/tzfmt.h: cc77e978689ef62e83fbf50297da7068
+include/unicode/tznames.h: fc0fd902a3ab39c3ecd5376affa3e091
+include/unicode/tzrule.h: adc2e3690a81499fa482f09a7c891e3a
+include/unicode/tztrans.h: ddc16397303c7c3a6cdb51d6cae76c9c
+include/unicode/ubidi.h: 3c3447aff91ca3aba39294f283fc0a83
+include/unicode/ubrk.h: c4d61d02474b921b6deabf19730f2d93
+include/unicode/ucal.h: 85fbc0a93c781ff4f283abf56213548f
+include/unicode/ucasemap.h: bbc08907ca608e090dd2551dae7f5063
+include/unicode/ucat.h: 9887bf7cefa89c96630bcd3757663ec0
+include/unicode/uchar.h: d0caa0cad8f0760769e7269c8e27b2f0
+include/unicode/ucharstrie.h: a831881a1c5f601a27a96107a9c93b40
+include/unicode/ucharstriebuilder.h: aab813b785d803391adad3e89eae430b
+include/unicode/uchriter.h: 26dfb5f728be01852cb52402fc018235
+include/unicode/uclean.h: 7b7b73a66324b026c775cf2f467108f3
+include/unicode/ucnv.h: 8925fbf6e9921bf45b485c31ee4124ed
+include/unicode/ucnv_cb.h: 2132a185faeb5cd603344098e4f685f5
+include/unicode/ucnv_err.h: 641fb44cae3f286f307ce2e445b3589f
+include/unicode/ucnvsel.h: 5f129128041b8ec652fa13bc007c7168
+include/unicode/ucol.h: c1ae405a33aca9786cf4125a7ea30854
+include/unicode/ucoleitr.h: c5f7f5720c58a63df5277f4c275813f7
+include/unicode/uconfig.h: 9cd76a9d2008c77116c1e3d34cd5c20f
+include/unicode/ucsdet.h: 84999c29e225c4d11a89e2c691892c6a
+include/unicode/ucurr.h: 22ebc57d60d31ca6e5be08b5dcfabb36
+include/unicode/udat.h: 4fceb68710dfed43778da6b5dabf5b81
+include/unicode/udata.h: 8ffc7d27c431eaa31709bed2450b1987
+include/unicode/udateintervalformat.h: ec7b522f7376efc94280461a798e122e
+include/unicode/udatpg.h: c13609bba2d9cdd91475c80f2934e8b9
+include/unicode/udisplaycontext.h: d85a18d600e97fcdbb4177583633e20b
+include/unicode/uenum.h: 9f0843888060124393c5b6d3ac1d0494
+include/unicode/ufieldpositer.h: 9a2caec923d0bbc2c167e17a42e2ff74
+include/unicode/uformattable.h: 5a52db48b81c8e2d770353f347c64d1a
+include/unicode/ugender.h: 23ec9fe7670c419c57462625cc2afaee
+include/unicode/uidna.h: ffd28dd05da8ad3813d2d41b1f01c517
+include/unicode/uiter.h: 50847b964f6fb474e0290150338c9f27
+include/unicode/uldnames.h: 6fba02d8cd519586d066c4f4e5eb1640
+include/unicode/ulistformatter.h: 2d9feb1e057219dd43898dc23da7e476
+include/unicode/uloc.h: 03e3d991937d286c75e3206c5494646e
+include/unicode/ulocdata.h: f282e04c22e0616817a04f80f536f688
+include/unicode/umachine.h: 1d6f3281c1b8a8eb9ba4dbd670d6af7c
+include/unicode/umisc.h: c0dc3caac921970252ee4bbc1bddc43a
+include/unicode/umsg.h: ed50cc36346ea063fd3681385064ead3
+include/unicode/unifilt.h: 6e228f15b2fa8f564abb51500674d72b
+include/unicode/unifunct.h: a9f9e469e946e88a9c64919c468e5d62
+include/unicode/unimatch.h: 6c2cbf80f1f605b165bebc5ae8e12aaa
+include/unicode/unirepl.h: a021ccf09bb715625b9677bdc7700584
+include/unicode/uniset.h: 501821f127cc093433327c44909a7575
+include/unicode/unistr.h: 7dfa9c3626c3dcf71390eb50b57a3716
+include/unicode/unorm.h: 39bbe48ae8534029dab7f097188c8b31
+include/unicode/unorm2.h: eb8b5bb935701284a4480a2facb7f0b8
+include/unicode/unum.h: ac906837bfd6caac1259c6f7913b94a2
+include/unicode/unumsys.h: dfc4fd29fa10dea8de5981a79badf4ec
+include/unicode/uobject.h: 7cd3e374dd78321b69313bc3f416ed4c
+include/unicode/upluralrules.h: f2b80b6b9a9ea8edae1aba78830f4789
+include/unicode/uregex.h: bf69ecde49c5418db27194cdad8ee0ff
+include/unicode/uregion.h: 6d72ea56f92d9da81cc8b3e8d47a3f04
+include/unicode/ureldatefmt.h: 480530556bbe46fbd5996fa86a878b98
+include/unicode/urename.h: 0685d5314e8537121559a98ef7a143c4
+include/unicode/urep.h: 04cce4d1e9a074179ec8e7ba6f5f02ee
+include/unicode/ures.h: d9d89fedbe10df5011c03a8238572e07
+include/unicode/uscript.h: acd32dac19000101a28b81eeaec612e8
+include/unicode/usearch.h: afd9eb69236e27449e7249264bfeae56
+include/unicode/uset.h: 69481ff3106e5b8cc6f36cfa3c23225a
+include/unicode/usetiter.h: 3b9ae44eb5a47ce6e20ed00fc45c0cb6
+include/unicode/ushape.h: 1f89bcc0f93cb5df8059e8a2717009a7
+include/unicode/uspoof.h: 140a8c6518698a56c917d18ef6dbd2b7
+include/unicode/usprep.h: d4a57d01cb61f594c84c3fffac8a87d5
+include/unicode/ustdio.h: 7d32dbc31f136ce97096cd25429dceef
+include/unicode/ustream.h: 211a3e48dbe1921522d956bef0747361
+include/unicode/ustring.h: 12b77389aad7d0b76c86d405566840a9
+include/unicode/ustringtrie.h: 08f062a843c6bf78d8d95b1ba566d6ec
+include/unicode/utext.h: a8cf1115720b99ca855918f92343ce8b
+include/unicode/utf.h: b7827e05a4bc90b9ca27ab14491ca1bd
+include/unicode/utf16.h: 4447226555e524f4c0f596c197ae65d5
+include/unicode/utf32.h: 076c1d2025d949556d976b9e6aa01410
+include/unicode/utf8.h: 3afe43776eb2e8d3448551c9a6996a12
+include/unicode/utf_old.h: 0c46b30f4140adf50fe9ed350815a0d8
+include/unicode/utmscale.h: 8ea13d3120de87b49a240014ecfdce7f
+include/unicode/utrace.h: 0216d0e5e1e1e10e014f3a8882fa0760
+include/unicode/utrans.h: 25231668b49b0de8ca1db79ff0f348d8
+include/unicode/utypes.h: a3c935253e46b4c313b0ee58cadcd04d
+include/unicode/uvernum.h: 8044bea1ca820f40b1e82b2ae5cbfbfa
+include/unicode/uversion.h: b3e0658e920f56306839af39fa5f35b7
+include/unicode/vtzone.h: 138782b1f4177e15964c21e7e8cb21d3
+lib/icudt.lib: a4bc5fec27a13bc471b747e67ec58bc4
+lib/icuin.lib: 452cfb482c2b072f99489029a9bb789c
+lib/icuio.lib: c9b9c1c8ef2f622825775a1fd10186c0
+lib/icutest.lib: 7408004f6b9d8318b10a631ed933353b
+lib/icutu.lib: 820e5a0e98bcc257822f254f73c7c682
+lib/icuuc.lib: 62326159fad7b218f3f8455c32da970c
diff --git a/coin/provisioning/qtci-windows-7-x86/conanfiles/qtwebkit.manifests/libxml2/2.9.4/annulen/stable/export/conanmanifest.txt b/coin/provisioning/common/conan_manifests/libxml2/2.9.4/annulen/stable/export/conanmanifest.txt
index c5714a18..c5714a18 100644
--- a/coin/provisioning/qtci-windows-7-x86/conanfiles/qtwebkit.manifests/libxml2/2.9.4/annulen/stable/export/conanmanifest.txt
+++ b/coin/provisioning/common/conan_manifests/libxml2/2.9.4/annulen/stable/export/conanmanifest.txt
diff --git a/coin/provisioning/qtci-windows-7-x86/conanfiles/qtwebkit.manifests/libxml2/2.9.4/annulen/stable/package/357fb491ae867cbbfe369d54132f4f21c3f13f7d/conanmanifest.txt b/coin/provisioning/common/conan_manifests/libxml2/2.9.4/annulen/stable/package/357fb491ae867cbbfe369d54132f4f21c3f13f7d/conanmanifest.txt
index b68bca2b..b68bca2b 100644
--- a/coin/provisioning/qtci-windows-7-x86/conanfiles/qtwebkit.manifests/libxml2/2.9.4/annulen/stable/package/357fb491ae867cbbfe369d54132f4f21c3f13f7d/conanmanifest.txt
+++ b/coin/provisioning/common/conan_manifests/libxml2/2.9.4/annulen/stable/package/357fb491ae867cbbfe369d54132f4f21c3f13f7d/conanmanifest.txt
diff --git a/coin/provisioning/common/conan_manifests/libxml2/2.9.4/vitallium/stable/export/conanmanifest.txt b/coin/provisioning/common/conan_manifests/libxml2/2.9.4/vitallium/stable/export/conanmanifest.txt
new file mode 100644
index 00000000..54a81a2e
--- /dev/null
+++ b/coin/provisioning/common/conan_manifests/libxml2/2.9.4/vitallium/stable/export/conanmanifest.txt
@@ -0,0 +1,2 @@
+1499347513
+conanfile.py: 13d33f258924b0e194abbae675d10623
diff --git a/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/libxml2/2.9.4/vitallium/stable/package/95a4a855074d4607ef02a5a86bf5ef1666dd773e/conanmanifest.txt b/coin/provisioning/common/conan_manifests/libxml2/2.9.4/vitallium/stable/package/3c9b592a3dd15507b8a6d90a8fcc34d2b4de2260/conanmanifest.txt
index 4b9ecc61..46e106f7 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/libxml2/2.9.4/vitallium/stable/package/95a4a855074d4607ef02a5a86bf5ef1666dd773e/conanmanifest.txt
+++ b/coin/provisioning/common/conan_manifests/libxml2/2.9.4/vitallium/stable/package/3c9b592a3dd15507b8a6d90a8fcc34d2b4de2260/conanmanifest.txt
@@ -1,6 +1,6 @@
-1482493354
-bin/libxml2.dll: 0b02196ac933431b150fb73a5bed7518
-conaninfo.txt: 29ccd6acef148fd29fc8ebee20216618
+1499348590
+bin/libxml2.dll: 21125a168735fe1f2da4ed04d7478ae6
+conaninfo.txt: 38d79dbe71569466f32385561d0a7c01
include/libxml/DOCBparser.h: 21e6523a86338325c527e1e8847adc1d
include/libxml/HTMLparser.h: 083a413aedc738e1903735b7f1678087
include/libxml/HTMLtree.h: 46cf4cefb419e18c40b8d5b6ac982f3f
@@ -43,13 +43,13 @@ include/libxml/xmlschemas.h: 44ee98f77e997b8843fe6e5c45aa4ab0
include/libxml/xmlschemastypes.h: 160197e01dfa56cd9ad09d201d5bdeb4
include/libxml/xmlstring.h: 82efb8a055d5fc8eb7d815ed471eca53
include/libxml/xmlunicode.h: b9f0b8acddfee9b620ea822978a51d29
-include/libxml/xmlversion.h: 0c268947477509833b9edc4ae096da41
+include/libxml/xmlversion.h: 3a4cd39c7bcdbe5358570771fa1f1c10
include/libxml/xmlwriter.h: 8694436144b1fb0aab2e2d6b725035e3
include/libxml/xpath.h: 2e60b359a61db15d05409ebef1b140b1
include/libxml/xpathInternals.h: c18fad3cce22369a75166afed6343bcd
include/libxml/xpointer.h: 5b8025430888d5b99d03d159ddc78388
include/win32config.h: 410df263529fb9ec616b22f590dbdd1d
include/wsockcompat.h: f975f4dc926c27ab755f05a79296bd72
-lib/libxml2.lib: 7ab0a2cf0511ea7eb2593a24e5a31750
-lib/libxml2_a.lib: a4d10046b1cf6910811687a04ef38d6f
-lib/libxml2_a_dll.lib: f785611927ed7f3a9514a1ccac31fd10
+lib/libxml2.lib: 8401cfb31c445b419fd36f7cca9287ba
+lib/libxml2_a.lib: b44b970cfaee62a922b7424646f07bbc
+lib/libxml2_a_dll.lib: b7a0af9a50e80ab55a92714e1068f48c
diff --git a/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.manifests/libxml2/2.9.4/vitallium/stable/package/0de2434f61f19881f1d4cfe60c583be521a65d08/conanmanifest.txt b/coin/provisioning/common/conan_manifests/libxml2/2.9.4/vitallium/stable/package/61c4f21bb72fcb92afb46571ac7caaa967c09c5d/conanmanifest.txt
index e16c2976..5aded80c 100644
--- a/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.manifests/libxml2/2.9.4/vitallium/stable/package/0de2434f61f19881f1d4cfe60c583be521a65d08/conanmanifest.txt
+++ b/coin/provisioning/common/conan_manifests/libxml2/2.9.4/vitallium/stable/package/61c4f21bb72fcb92afb46571ac7caaa967c09c5d/conanmanifest.txt
@@ -1,6 +1,6 @@
-1482493099
-bin/libxml2.dll: f43264365ba9d2681455ff106303a4e9
-conaninfo.txt: b51d149c110dea2bef2ab37017308696
+1499348835
+bin/libxml2.dll: d9a4499bddd011be860ed1414a2cbae4
+conaninfo.txt: 64d85058962adbbc211c59513c575f8e
include/libxml/DOCBparser.h: 21e6523a86338325c527e1e8847adc1d
include/libxml/HTMLparser.h: 083a413aedc738e1903735b7f1678087
include/libxml/HTMLtree.h: 46cf4cefb419e18c40b8d5b6ac982f3f
@@ -43,13 +43,13 @@ include/libxml/xmlschemas.h: 44ee98f77e997b8843fe6e5c45aa4ab0
include/libxml/xmlschemastypes.h: 160197e01dfa56cd9ad09d201d5bdeb4
include/libxml/xmlstring.h: 82efb8a055d5fc8eb7d815ed471eca53
include/libxml/xmlunicode.h: b9f0b8acddfee9b620ea822978a51d29
-include/libxml/xmlversion.h: 0c268947477509833b9edc4ae096da41
+include/libxml/xmlversion.h: 3a4cd39c7bcdbe5358570771fa1f1c10
include/libxml/xmlwriter.h: 8694436144b1fb0aab2e2d6b725035e3
include/libxml/xpath.h: 2e60b359a61db15d05409ebef1b140b1
include/libxml/xpathInternals.h: c18fad3cce22369a75166afed6343bcd
include/libxml/xpointer.h: 5b8025430888d5b99d03d159ddc78388
include/win32config.h: 410df263529fb9ec616b22f590dbdd1d
include/wsockcompat.h: f975f4dc926c27ab755f05a79296bd72
-lib/libxml2.lib: ec17f6714da6647f63d2cdc54d005e43
-lib/libxml2_a.lib: abae79bdfded67d5017604b7b7c8dd03
-lib/libxml2_a_dll.lib: f68e18d65520175beb3a8de99cbb7e9b
+lib/libxml2.lib: 1943502c63f1459602a39bd2323d38f6
+lib/libxml2_a.lib: fd6456fbcd17a0467525faad0666ff8b
+lib/libxml2_a_dll.lib: a4c27aa254afe3f1b0279a92421e7342
diff --git a/coin/provisioning/common/conan_manifests/libxml2/2.9.4/vitallium/stable/package/8ec39b27fb5828ba512b3f2dafe88cc0962c29b9/conanmanifest.txt b/coin/provisioning/common/conan_manifests/libxml2/2.9.4/vitallium/stable/package/8ec39b27fb5828ba512b3f2dafe88cc0962c29b9/conanmanifest.txt
new file mode 100644
index 00000000..e07078e6
--- /dev/null
+++ b/coin/provisioning/common/conan_manifests/libxml2/2.9.4/vitallium/stable/package/8ec39b27fb5828ba512b3f2dafe88cc0962c29b9/conanmanifest.txt
@@ -0,0 +1,55 @@
+1499348420
+bin/libxml2.dll: d97dd77e1ca7b5cc92bb16f1519c2f02
+conaninfo.txt: 2954c763996d7723b688af93f860be53
+include/libxml/DOCBparser.h: 21e6523a86338325c527e1e8847adc1d
+include/libxml/HTMLparser.h: 083a413aedc738e1903735b7f1678087
+include/libxml/HTMLtree.h: 46cf4cefb419e18c40b8d5b6ac982f3f
+include/libxml/SAX.h: bf46553ceac47b24126d4a1abb7b26fa
+include/libxml/SAX2.h: 226675de48e46a282141b438b0895db4
+include/libxml/c14n.h: 083bf52bbdd0563ff61605cb2bc9316f
+include/libxml/catalog.h: 1d5e464fe629dde9758d6c33ea7a3d8e
+include/libxml/chvalid.h: 4e1ca6554b98687e75d03662cd92d14e
+include/libxml/debugXML.h: 73816937df233c77ebfa261f3ca00dd8
+include/libxml/dict.h: 93b78165ce896cbda4417bd278259714
+include/libxml/encoding.h: e07b28c25a85356f585dd6891e0c7778
+include/libxml/entities.h: 16467595fdaff28420d1657b1658f267
+include/libxml/globals.h: 7dc017984a2a506caaeb45db0e895357
+include/libxml/hash.h: 747ad49c1a665e2eafaf052cbd9d165b
+include/libxml/list.h: a81670013af01c8003fa9fdbd9a8cad7
+include/libxml/nanoftp.h: a4aad060f2cedb04dacbe4c58969817a
+include/libxml/nanohttp.h: d31b62933eab6d58a46eb075b49b7715
+include/libxml/parser.h: 3ef7bece85150ab2319aed3fd0d36034
+include/libxml/parserInternals.h: c55ce5832dae535ce6d59b6aa10f6133
+include/libxml/pattern.h: db123ed3ecc27ab31b3f808e96edb492
+include/libxml/relaxng.h: 348c151f5b45a3543862c0e280f9fbba
+include/libxml/schemasInternals.h: 28ed78fdce3dbad508a6381dd580d1e7
+include/libxml/schematron.h: 96d9e0c083c4949e246ce02cf31de483
+include/libxml/threads.h: 2c630b6409352bcd1e10d94177215265
+include/libxml/tree.h: f2a9a61c9a96a73c293f57bff2913ffb
+include/libxml/uri.h: 032d430e35153af35f2fe17a9e9c37bf
+include/libxml/valid.h: 3c082c0a5b81e1bc9fd9a21b69014584
+include/libxml/xinclude.h: 1f8b2beb8f49da4bf3a658d31dccb2ef
+include/libxml/xlink.h: 8b82b67e61ebffc721bd23af66724f49
+include/libxml/xmlIO.h: 31c8dfbaee25e20cd0d6eb2549929f5d
+include/libxml/xmlautomata.h: 3c3c0a7d353bacfbede7c2decf27e62a
+include/libxml/xmlerror.h: 9f03d7b7788f158e68a75132e9249975
+include/libxml/xmlexports.h: c7982540f18e547b3ca70c7259c59e4c
+include/libxml/xmlmemory.h: c0167c625ecaf670d76480506425b472
+include/libxml/xmlmodule.h: de174bf853776e7e653c66c059d19e61
+include/libxml/xmlreader.h: dbd5ae99042659a13427209a2bc0041f
+include/libxml/xmlregexp.h: fea3110c96e8cd9013900e1c8e5b6c0b
+include/libxml/xmlsave.h: eed2463cad941f74f99b8b9bc03aa74d
+include/libxml/xmlschemas.h: 44ee98f77e997b8843fe6e5c45aa4ab0
+include/libxml/xmlschemastypes.h: 160197e01dfa56cd9ad09d201d5bdeb4
+include/libxml/xmlstring.h: 82efb8a055d5fc8eb7d815ed471eca53
+include/libxml/xmlunicode.h: b9f0b8acddfee9b620ea822978a51d29
+include/libxml/xmlversion.h: 3a4cd39c7bcdbe5358570771fa1f1c10
+include/libxml/xmlwriter.h: 8694436144b1fb0aab2e2d6b725035e3
+include/libxml/xpath.h: 2e60b359a61db15d05409ebef1b140b1
+include/libxml/xpathInternals.h: c18fad3cce22369a75166afed6343bcd
+include/libxml/xpointer.h: 5b8025430888d5b99d03d159ddc78388
+include/win32config.h: 410df263529fb9ec616b22f590dbdd1d
+include/wsockcompat.h: f975f4dc926c27ab755f05a79296bd72
+lib/libxml2.lib: 63bd590c414dfc9907df9e8cea6c3ba6
+lib/libxml2_a.lib: e811e6c280f3715f435ea3d7cebda6c2
+lib/libxml2_a_dll.lib: e2c6edb8085198269970611c68edffaf
diff --git a/coin/provisioning/common/conan_manifests/libxml2/2.9.4/vitallium/stable/package/e08083f0910e4ba3ae89c4298d94b672829af1fe/conanmanifest.txt b/coin/provisioning/common/conan_manifests/libxml2/2.9.4/vitallium/stable/package/e08083f0910e4ba3ae89c4298d94b672829af1fe/conanmanifest.txt
new file mode 100644
index 00000000..75b0084f
--- /dev/null
+++ b/coin/provisioning/common/conan_manifests/libxml2/2.9.4/vitallium/stable/package/e08083f0910e4ba3ae89c4298d94b672829af1fe/conanmanifest.txt
@@ -0,0 +1,55 @@
+1499348033
+bin/libxml2.dll: 41e781ae591bbf0b36780ccce4565226
+conaninfo.txt: 6ef37ed57f0f92d64efc139dff95365b
+include/libxml/DOCBparser.h: 21e6523a86338325c527e1e8847adc1d
+include/libxml/HTMLparser.h: 083a413aedc738e1903735b7f1678087
+include/libxml/HTMLtree.h: 46cf4cefb419e18c40b8d5b6ac982f3f
+include/libxml/SAX.h: bf46553ceac47b24126d4a1abb7b26fa
+include/libxml/SAX2.h: 226675de48e46a282141b438b0895db4
+include/libxml/c14n.h: 083bf52bbdd0563ff61605cb2bc9316f
+include/libxml/catalog.h: 1d5e464fe629dde9758d6c33ea7a3d8e
+include/libxml/chvalid.h: 4e1ca6554b98687e75d03662cd92d14e
+include/libxml/debugXML.h: 73816937df233c77ebfa261f3ca00dd8
+include/libxml/dict.h: 93b78165ce896cbda4417bd278259714
+include/libxml/encoding.h: e07b28c25a85356f585dd6891e0c7778
+include/libxml/entities.h: 16467595fdaff28420d1657b1658f267
+include/libxml/globals.h: 7dc017984a2a506caaeb45db0e895357
+include/libxml/hash.h: 747ad49c1a665e2eafaf052cbd9d165b
+include/libxml/list.h: a81670013af01c8003fa9fdbd9a8cad7
+include/libxml/nanoftp.h: a4aad060f2cedb04dacbe4c58969817a
+include/libxml/nanohttp.h: d31b62933eab6d58a46eb075b49b7715
+include/libxml/parser.h: 3ef7bece85150ab2319aed3fd0d36034
+include/libxml/parserInternals.h: c55ce5832dae535ce6d59b6aa10f6133
+include/libxml/pattern.h: db123ed3ecc27ab31b3f808e96edb492
+include/libxml/relaxng.h: 348c151f5b45a3543862c0e280f9fbba
+include/libxml/schemasInternals.h: 28ed78fdce3dbad508a6381dd580d1e7
+include/libxml/schematron.h: 96d9e0c083c4949e246ce02cf31de483
+include/libxml/threads.h: 2c630b6409352bcd1e10d94177215265
+include/libxml/tree.h: f2a9a61c9a96a73c293f57bff2913ffb
+include/libxml/uri.h: 032d430e35153af35f2fe17a9e9c37bf
+include/libxml/valid.h: 3c082c0a5b81e1bc9fd9a21b69014584
+include/libxml/xinclude.h: 1f8b2beb8f49da4bf3a658d31dccb2ef
+include/libxml/xlink.h: 8b82b67e61ebffc721bd23af66724f49
+include/libxml/xmlIO.h: 31c8dfbaee25e20cd0d6eb2549929f5d
+include/libxml/xmlautomata.h: 3c3c0a7d353bacfbede7c2decf27e62a
+include/libxml/xmlerror.h: 9f03d7b7788f158e68a75132e9249975
+include/libxml/xmlexports.h: c7982540f18e547b3ca70c7259c59e4c
+include/libxml/xmlmemory.h: c0167c625ecaf670d76480506425b472
+include/libxml/xmlmodule.h: de174bf853776e7e653c66c059d19e61
+include/libxml/xmlreader.h: dbd5ae99042659a13427209a2bc0041f
+include/libxml/xmlregexp.h: fea3110c96e8cd9013900e1c8e5b6c0b
+include/libxml/xmlsave.h: eed2463cad941f74f99b8b9bc03aa74d
+include/libxml/xmlschemas.h: 44ee98f77e997b8843fe6e5c45aa4ab0
+include/libxml/xmlschemastypes.h: 160197e01dfa56cd9ad09d201d5bdeb4
+include/libxml/xmlstring.h: 82efb8a055d5fc8eb7d815ed471eca53
+include/libxml/xmlunicode.h: b9f0b8acddfee9b620ea822978a51d29
+include/libxml/xmlversion.h: 3a4cd39c7bcdbe5358570771fa1f1c10
+include/libxml/xmlwriter.h: 8694436144b1fb0aab2e2d6b725035e3
+include/libxml/xpath.h: 2e60b359a61db15d05409ebef1b140b1
+include/libxml/xpathInternals.h: c18fad3cce22369a75166afed6343bcd
+include/libxml/xpointer.h: 5b8025430888d5b99d03d159ddc78388
+include/win32config.h: 410df263529fb9ec616b22f590dbdd1d
+include/wsockcompat.h: f975f4dc926c27ab755f05a79296bd72
+lib/libxml2.lib: d7556bca5f0c194de00b118175c9e786
+lib/libxml2_a.lib: 2e4f2027834a545ab38246c576ff0f31
+lib/libxml2_a_dll.lib: 1932915fa9f066097c72915cabea32a0
diff --git a/coin/provisioning/qtci-windows-7-x86/conanfiles/qtwebkit.manifests/libxslt/1.1.29/annulen/stable/export/conanmanifest.txt b/coin/provisioning/common/conan_manifests/libxslt/1.1.29/annulen/stable/export/conanmanifest.txt
index 73d392f3..73d392f3 100644
--- a/coin/provisioning/qtci-windows-7-x86/conanfiles/qtwebkit.manifests/libxslt/1.1.29/annulen/stable/export/conanmanifest.txt
+++ b/coin/provisioning/common/conan_manifests/libxslt/1.1.29/annulen/stable/export/conanmanifest.txt
diff --git a/coin/provisioning/qtci-windows-7-x86/conanfiles/qtwebkit.manifests/libxslt/1.1.29/annulen/stable/package/30620cba1eaf28add40f441a20f7d1be9a5c636c/conanmanifest.txt b/coin/provisioning/common/conan_manifests/libxslt/1.1.29/annulen/stable/package/30620cba1eaf28add40f441a20f7d1be9a5c636c/conanmanifest.txt
index ead7f1ca..ead7f1ca 100644
--- a/coin/provisioning/qtci-windows-7-x86/conanfiles/qtwebkit.manifests/libxslt/1.1.29/annulen/stable/package/30620cba1eaf28add40f441a20f7d1be9a5c636c/conanmanifest.txt
+++ b/coin/provisioning/common/conan_manifests/libxslt/1.1.29/annulen/stable/package/30620cba1eaf28add40f441a20f7d1be9a5c636c/conanmanifest.txt
diff --git a/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.manifests/libxslt/1.1.29/vitallium/stable/export/conanmanifest.txt b/coin/provisioning/common/conan_manifests/libxslt/1.1.29/vitallium/stable/export/conanmanifest.txt
index be77d721..de2aa3a0 100644
--- a/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.manifests/libxslt/1.1.29/vitallium/stable/export/conanmanifest.txt
+++ b/coin/provisioning/common/conan_manifests/libxslt/1.1.29/vitallium/stable/export/conanmanifest.txt
@@ -1,2 +1,2 @@
-1478438034
+1482494842
conanfile.py: 2472a82109b2d59062d3e50a54d08a4a
diff --git a/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/libxslt/1.1.29/vitallium/stable/package/19663639a14063d996b277c7fac0e00264689c20/conanmanifest.txt b/coin/provisioning/common/conan_manifests/libxslt/1.1.29/vitallium/stable/package/19663639a14063d996b277c7fac0e00264689c20/conanmanifest.txt
index 0820b583..0820b583 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/libxslt/1.1.29/vitallium/stable/package/19663639a14063d996b277c7fac0e00264689c20/conanmanifest.txt
+++ b/coin/provisioning/common/conan_manifests/libxslt/1.1.29/vitallium/stable/package/19663639a14063d996b277c7fac0e00264689c20/conanmanifest.txt
diff --git a/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.manifests/libxslt/1.1.29/vitallium/stable/package/466fc39fa8b7a19ee2095aa945fff98630acdd12/conanmanifest.txt b/coin/provisioning/common/conan_manifests/libxslt/1.1.29/vitallium/stable/package/466fc39fa8b7a19ee2095aa945fff98630acdd12/conanmanifest.txt
index 22a7c428..22a7c428 100644
--- a/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.manifests/libxslt/1.1.29/vitallium/stable/package/466fc39fa8b7a19ee2095aa945fff98630acdd12/conanmanifest.txt
+++ b/coin/provisioning/common/conan_manifests/libxslt/1.1.29/vitallium/stable/package/466fc39fa8b7a19ee2095aa945fff98630acdd12/conanmanifest.txt
diff --git a/coin/provisioning/common/conan_manifests/libxslt/1.1.29/vitallium/stable/package/8c83c725f7fefe466a2c6c18ff17d3b0b91202c6/conanmanifest.txt b/coin/provisioning/common/conan_manifests/libxslt/1.1.29/vitallium/stable/package/8c83c725f7fefe466a2c6c18ff17d3b0b91202c6/conanmanifest.txt
new file mode 100644
index 00000000..0501df3e
--- /dev/null
+++ b/coin/provisioning/common/conan_manifests/libxslt/1.1.29/vitallium/stable/package/8c83c725f7fefe466a2c6c18ff17d3b0b91202c6/conanmanifest.txt
@@ -0,0 +1,38 @@
+1499348623
+bin/libexslt.dll: 27d2ff4cdff16eb9dd4944ef27cb467a
+bin/libxslt.dll: b33bd4f30819263259ab52ee0cd9b7ff
+conaninfo.txt: 00cd7d1f6493ac337bb709aedcabcc77
+include/libexslt/exslt.h: f01af3bf058520059ba6d50f42133717
+include/libexslt/exsltconfig.h: a36134fd73a90b0c39ba3eb4fa8833b9
+include/libexslt/exsltexports.h: 079c35b6fa14302aad0764c1dee57809
+include/libexslt/libexslt.h: 2a281322663dba16ccf7b4ed1eb5858f
+include/libxslt/attributes.h: 32e43c08f66b85266c391301d322a21f
+include/libxslt/documents.h: 22a35bd1102fd1ac301e50cf650a8b8a
+include/libxslt/extensions.h: 0396b6be07f707b0c6ee171a63b2e520
+include/libxslt/extra.h: 6d41618d5d9708628ec9b33a587f06c3
+include/libxslt/functions.h: b5ad00884390fb9b86c55a2628e9f6a0
+include/libxslt/imports.h: 66e26ad969e3c37fdeedcbc2716d7cf3
+include/libxslt/keys.h: 77a11ee3de841d02d3461b829cfcc11e
+include/libxslt/libxslt.h: 11c489a4083c7d341b70e8693676852f
+include/libxslt/namespaces.h: c784b4b8e80274491fe023ce26d4847b
+include/libxslt/numbersInternals.h: 27c2c21ab1535f84710fe1c8c8829018
+include/libxslt/pattern.h: 1d928199f1adf63d79d9ec6aa7eb060f
+include/libxslt/preproc.h: 829de337aca8b15f699708e6b7340549
+include/libxslt/security.h: 1b24b61ea6afe01d18c647c94b1245c7
+include/libxslt/templates.h: 6901f4c8fad239b588b9f6d4cdfef5ac
+include/libxslt/transform.h: 060c2e753adea589569d2835a006075e
+include/libxslt/trio.h: 7da7b1fcf378330699c7ecdd96908641
+include/libxslt/triodef.h: e41149b088de4a04c067c85969f4db3c
+include/libxslt/variables.h: ee9c8174c5a42ab6821d2e28f0a15661
+include/libxslt/win32config.h: c64153b1a2c8bba1a8aa600741f04690
+include/libxslt/xslt.h: 0c08b8e7223b72f822a58457520b6387
+include/libxslt/xsltInternals.h: 4b93c6b8abdb8f67a5718ed98a2b2e6e
+include/libxslt/xsltconfig.h: 047bffd75335b6951063c467c91973a7
+include/libxslt/xsltexports.h: 207ffe4e458a8c24635b3eb24bdd8000
+include/libxslt/xsltlocale.h: b934279cc2a6556075638425e5634b07
+include/libxslt/xsltutils.h: c190bd536ce0cffe1ccba74c68f7b0c9
+include/libxslt/xsltwin32config.h: 8a3a4b0359659042a66603eb59cc4001
+lib/libexslt.lib: c491b1f54d162d9d5d42271d49315fee
+lib/libexslt_a.lib: 7be28465f2df067865a4edd9a70fca92
+lib/libxslt.lib: 5392c2fe22b1ee711bd469eb1cfdceae
+lib/libxslt_a.lib: 8f62e865d164a187b5b8c43d07315363
diff --git a/coin/provisioning/common/conan_manifests/libxslt/1.1.29/vitallium/stable/package/f8cbe39e2f6584ea05b56c1f3dd9b0a99f522727/conanmanifest.txt b/coin/provisioning/common/conan_manifests/libxslt/1.1.29/vitallium/stable/package/f8cbe39e2f6584ea05b56c1f3dd9b0a99f522727/conanmanifest.txt
new file mode 100644
index 00000000..db328396
--- /dev/null
+++ b/coin/provisioning/common/conan_manifests/libxslt/1.1.29/vitallium/stable/package/f8cbe39e2f6584ea05b56c1f3dd9b0a99f522727/conanmanifest.txt
@@ -0,0 +1,38 @@
+1499348859
+bin/libexslt.dll: d2372193eb260a7b2351402a8e14b0f8
+bin/libxslt.dll: 9f8883be8f7b3df46f0d7b1c6312e191
+conaninfo.txt: fab5795c699ab977ff1852840f4d1c77
+include/libexslt/exslt.h: f01af3bf058520059ba6d50f42133717
+include/libexslt/exsltconfig.h: a36134fd73a90b0c39ba3eb4fa8833b9
+include/libexslt/exsltexports.h: 079c35b6fa14302aad0764c1dee57809
+include/libexslt/libexslt.h: 2a281322663dba16ccf7b4ed1eb5858f
+include/libxslt/attributes.h: 32e43c08f66b85266c391301d322a21f
+include/libxslt/documents.h: 22a35bd1102fd1ac301e50cf650a8b8a
+include/libxslt/extensions.h: 0396b6be07f707b0c6ee171a63b2e520
+include/libxslt/extra.h: 6d41618d5d9708628ec9b33a587f06c3
+include/libxslt/functions.h: b5ad00884390fb9b86c55a2628e9f6a0
+include/libxslt/imports.h: 66e26ad969e3c37fdeedcbc2716d7cf3
+include/libxslt/keys.h: 77a11ee3de841d02d3461b829cfcc11e
+include/libxslt/libxslt.h: 11c489a4083c7d341b70e8693676852f
+include/libxslt/namespaces.h: c784b4b8e80274491fe023ce26d4847b
+include/libxslt/numbersInternals.h: 27c2c21ab1535f84710fe1c8c8829018
+include/libxslt/pattern.h: 1d928199f1adf63d79d9ec6aa7eb060f
+include/libxslt/preproc.h: 829de337aca8b15f699708e6b7340549
+include/libxslt/security.h: 1b24b61ea6afe01d18c647c94b1245c7
+include/libxslt/templates.h: 6901f4c8fad239b588b9f6d4cdfef5ac
+include/libxslt/transform.h: 060c2e753adea589569d2835a006075e
+include/libxslt/trio.h: 7da7b1fcf378330699c7ecdd96908641
+include/libxslt/triodef.h: e41149b088de4a04c067c85969f4db3c
+include/libxslt/variables.h: ee9c8174c5a42ab6821d2e28f0a15661
+include/libxslt/win32config.h: c64153b1a2c8bba1a8aa600741f04690
+include/libxslt/xslt.h: 0c08b8e7223b72f822a58457520b6387
+include/libxslt/xsltInternals.h: 4b93c6b8abdb8f67a5718ed98a2b2e6e
+include/libxslt/xsltconfig.h: 047bffd75335b6951063c467c91973a7
+include/libxslt/xsltexports.h: 207ffe4e458a8c24635b3eb24bdd8000
+include/libxslt/xsltlocale.h: b934279cc2a6556075638425e5634b07
+include/libxslt/xsltutils.h: c190bd536ce0cffe1ccba74c68f7b0c9
+include/libxslt/xsltwin32config.h: 8a3a4b0359659042a66603eb59cc4001
+lib/libexslt.lib: 0c2503b1eca0a09387fda8cc216dd487
+lib/libexslt_a.lib: 24a3c1b936b7433a786954203dea83cd
+lib/libxslt.lib: bfbf055a6a5fb8aa246bf4b094669fd9
+lib/libxslt_a.lib: 49538c60313cbfc216007fa1ec3fc6a7
diff --git a/coin/provisioning/qtci-windows-7-x86/conanfiles/qtwebkit.manifests/zlib/1.2.8/annulen/stable/export/conanmanifest.txt b/coin/provisioning/common/conan_manifests/zlib/1.2.8/annulen/stable/export/conanmanifest.txt
index d7806e94..d7806e94 100644
--- a/coin/provisioning/qtci-windows-7-x86/conanfiles/qtwebkit.manifests/zlib/1.2.8/annulen/stable/export/conanmanifest.txt
+++ b/coin/provisioning/common/conan_manifests/zlib/1.2.8/annulen/stable/export/conanmanifest.txt
diff --git a/coin/provisioning/qtci-windows-7-x86/conanfiles/qtwebkit.manifests/zlib/1.2.8/annulen/stable/package/a990f14748d35a55b067140a0973ea7204f67350/conanmanifest.txt b/coin/provisioning/common/conan_manifests/zlib/1.2.8/annulen/stable/package/a990f14748d35a55b067140a0973ea7204f67350/conanmanifest.txt
index 88b5c152..88b5c152 100644
--- a/coin/provisioning/qtci-windows-7-x86/conanfiles/qtwebkit.manifests/zlib/1.2.8/annulen/stable/package/a990f14748d35a55b067140a0973ea7204f67350/conanmanifest.txt
+++ b/coin/provisioning/common/conan_manifests/zlib/1.2.8/annulen/stable/package/a990f14748d35a55b067140a0973ea7204f67350/conanmanifest.txt
diff --git a/coin/provisioning/common/helpers.ps1 b/coin/provisioning/common/helpers.ps1
index af7f79ff..1d624243 100644
--- a/coin/provisioning/common/helpers.ps1
+++ b/coin/provisioning/common/helpers.ps1
@@ -53,6 +53,32 @@ function Extract-Zip
$destinationFolder.CopyHere($zipfile.Items(), 16)
}
+function Extract-Dev-Folders-From-Zip
+{
+ Param (
+ [string]$package,
+ [string]$zipDir,
+ [string]$installPath
+ )
+
+ $shell = new-object -com shell.application
+
+ echo "Extracting contents of $package"
+ foreach ($subDir in "lib", "include", "bin", "share") {
+ $zip = $shell.Namespace($package + "\" + $zipDir + "\" + $subDir)
+ if ($zip) {
+ Write-Host "Extracting $subDir from zip archive"
+ } else {
+ Write-Host "$subDir is missing from zip archive - skipping"
+ continue
+ }
+ $destDir = $installPath + "\" + $subdir
+ New-Item $destDir -type directory
+ $destinationFolder = $shell.Namespace($destDir)
+ $destinationFolder.CopyHere($zip.Items(), 16)
+ }
+}
+
function BadParam
{
Param ([string]$Description)
@@ -67,7 +93,11 @@ function Download
[string] $Destination = $(BadParam("a download target location"))
)
try {
- Invoke-WebRequest -UseBasicParsing $CachedUrl -OutFile $Destination
+ if ($CachedUrl.StartsWith("http")) {
+ Invoke-WebRequest -UseBasicParsing $CachedUrl -OutFile $Destination
+ } else {
+ Copy-Item $CachedUrl $Destination
+ }
} catch {
Invoke-WebRequest -UseBasicParsing $OfficialUrl -OutFile $Destination
}
diff --git a/coin/provisioning/common/homebrew.sh b/coin/provisioning/common/homebrew.sh
new file mode 100755
index 00000000..a6efe123
--- /dev/null
+++ b/coin/provisioning/common/homebrew.sh
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+# Will install homebrew package manager for macOS
+/usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)" </dev/null
diff --git a/coin/provisioning/common/install_xcode.sh b/coin/provisioning/common/install_xcode.sh
new file mode 100755
index 00000000..f8336bad
--- /dev/null
+++ b/coin/provisioning/common/install_xcode.sh
@@ -0,0 +1,83 @@
+#!/bin/bash
+
+#############################################################################
+##
+## Copyright (C) 2017 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the provisioning scripts of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL21$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://www.qt.io/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 or version 3 as published by the Free
+## Software Foundation and appearing in the file LICENSE.LGPLv21 and
+## LICENSE.LGPLv3 included in the packaging of this file. Please review the
+## following information to ensure the GNU Lesser General Public License
+## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## As a special exception, The Qt Company gives you certain additional
+## rights. These rights are described in The Qt Company LGPL Exception
+## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+# This script installs Xcode
+# Prerequisites: Have Xcode prefetched to local cache as xz compressed.
+# This can be achieved by fetching Xcode_8.xip from Apple Store.
+# Uncompress it with 'xar -xf Xcode_8.xip'
+# Then get https://gist.githubusercontent.com/pudquick/ff412bcb29c9c1fa4b8d/raw/24b25538ea8df8d0634a2a6189aa581ccc6a5b4b/parse_pbzx2.py
+# with which you can run 'python parse_pbzx2.py Content'.
+# This will give you a file called "Content.part00.cpio.xz" that
+# can be renamed to Xcode_8.xz for this script.
+
+
+
+# shellcheck source=../common/try_catch.sh
+source "${BASH_SOURCE%/*}/try_catch.sh"
+
+function InstallXCode()
+{
+ ExceptionCPIO=103
+ ExceptionAcceptLicense=105
+
+ sourceFile=$1
+ version=$2
+
+ try
+ (
+ echo "Uncompressing and installing '$sourceFile'"
+ xzcat < "$sourceFile" | (cd /Applications/ && sudo cpio -vdmi) || throw $ExceptionCPIO
+
+ echo "Accept license"
+ sudo xcodebuild -license accept || throw $ExceptionAcceptLicense
+
+ echo "Xcode = $version" >> ~/versions.txt
+ )
+ catch || {
+ case $ex_code in
+ $ExceptionCPIO)
+ echo "Failed to unarchive .cpio."
+ exit 1;
+ ;;
+ $ExceptionAcceptLicense)
+ echo "Failed to accept license."
+ exit 1;
+ ;;
+
+ esac
+ }
+
+}
+
diff --git a/coin/provisioning/common/libclang.ps1 b/coin/provisioning/common/libclang.ps1
new file mode 100644
index 00000000..a4a9c870
--- /dev/null
+++ b/coin/provisioning/common/libclang.ps1
@@ -0,0 +1,32 @@
+param([Int32]$archVer=32)
+. "$PSScriptRoot\..\common\helpers.ps1"
+
+# 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.
+
+Get-Content "$PSScriptRoot\..\common\sw_versions.txt" | Foreach-Object {
+ $var = $_.Split('=')
+ New-Variable -Name $var[0] -Value $var[1]
+ $libclang_version = $libclang_version -replace '["."]'
+}
+
+if ( $archVer -eq 64 ) {
+ $sha1 = "dc42beb0efff130c4d7dfef3c97adf26f1ab04e0"
+ $url = "https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_$libclang_version-windows-vs2015_64.7z"
+} else {
+ $sha1 = "64e826c00ae632fbb28655e6e1fa9194980e1205"
+ $url = "https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_$libclang_version-windows-vs2015_32.7z"
+}
+
+$zip = "c:\users\qt\downloads\libclang.7z"
+$destination = "C:\Utils\libclang-" + $libclang_version
+
+Download $url $url $zip
+Verify-Checksum $zip $sha1
+
+C:\Utils\sevenzip\7z.exe x $zip -oC:\Utils\
+Rename-Item C:\Utils\libclang $destination
+
+[Environment]::SetEnvironmentVariable("LLVM_INSTALL_DIR", $destination, [EnvironmentVariableTarget]::Machine)
+del $zip
+echo "libClang = $libclang_version" >> ~/versions.txt
diff --git a/coin/provisioning/common/libclang.sh b/coin/provisioning/common/libclang.sh
new file mode 100755
index 00000000..381127b1
--- /dev/null
+++ b/coin/provisioning/common/libclang.sh
@@ -0,0 +1,73 @@
+#!/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
+
+BASEDIR=$(dirname "$0")
+. $BASEDIR/sw_versions.txt
+url=$1
+sha1=$2
+version=$3
+if [ $# -eq 0 ]
+ then
+ # The default values are for macOS package
+ echo "Using macOS defaults"
+ version=$libclang_version
+ url="https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_${version//\./}-mac.7z"
+ sha1="4781d154b274b2aec99b878c364f0ea80ff00a80"
+fi
+
+zip="libclang.7z"
+destination="/usr/local/libclang-$version"
+
+curl --fail -L --retry 5 --retry-delay 5 -o "$zip" "$url"
+_shasum=sha1sum
+if [[ "$OSTYPE" == "darwin"* ]]; then
+ echo "DARWIN"
+ _shasum=/usr/bin/shasum
+fi
+echo "$sha1 $zip" | $_shasum --check
+7z x $zip -o/tmp/
+rm -rf $zip
+
+sudo mv /tmp/libclang $destination
+
+echo "export LLVM_INSTALL_DIR=$destination" >> ~/.bash_profile
+echo "libClang = $version" >> ~/versions.txt
diff --git a/coin/provisioning/common/msvc_2015_update3_patch.ps1 b/coin/provisioning/common/msvc_2015_update3_patch.ps1
new file mode 100644
index 00000000..6a02f6bd
--- /dev/null
+++ b/coin/provisioning/common/msvc_2015_update3_patch.ps1
@@ -0,0 +1,60 @@
+#############################################################################
+##
+## Copyright (C) 2017 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the provisioning scripts of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL21$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://www.qt.io/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 or version 3 as published by the Free
+## Software Foundation and appearing in the file LICENSE.LGPLv21 and
+## LICENSE.LGPLv3 included in the packaging of this file. Please review the
+## following information to ensure the GNU Lesser General Public License
+## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## As a special exception, The Qt Company gives you certain additional
+## rights. These rights are described in The Qt Company LGPL Exception
+## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+. "$PSScriptRoot\..\common\helpers.ps1"
+
+# Install Cumulative Servicing Release Visual Studio 2015 update 3
+# Original download page: https://msdn.microsoft.com/en-us/library/mt752379.aspx
+
+$version = "2015 update3 (KB3165756)"
+$package = "C:\Windows\Temp\vs14-kb3165756.exe"
+$url_cache = "http://ci-files01-hki.ci.local/input/windows/vs14-kb3165756.exe"
+$url_official = "http://go.microsoft.com/fwlink/?LinkID=816878"
+$sha1 = "6a21d9b291ca75d44baad95e278fdc0d05d84c02"
+$preparedPackage="\\ci-files01-hki.ci.local\provisioning\windows\vs14-kb3165756-update"
+
+if (Test-Path $preparedPackage) {
+ echo "Using prepared package"
+ pushd $preparedPackage
+ $commandLine = "$preparedPackage\vs14-kb3165756.exe"
+} else {
+ echo "Fetching patch for Visual Studio $version..."
+ Download $url_official $url_cache $package
+ Verify-Checksum $package $sha1
+ $commandLine = $package
+}
+echo "Installing patch for Visual Studio $version..."
+. $commandLine /norestart /passive
+
+if ($commandLine.StartsWith("C:\Windows")) {
+ remove-item $package
+}
diff --git a/coin/provisioning/common/ninja.ps1 b/coin/provisioning/common/ninja.ps1
new file mode 100644
index 00000000..75d74d36
--- /dev/null
+++ b/coin/provisioning/common/ninja.ps1
@@ -0,0 +1,12 @@
+. "$PSScriptRoot\helpers.ps1"
+
+$zip = "c:\users\qt\downloads\ninja-1.6.0-win-x86.zip"
+
+Download https://github.com/ninja-build/ninja/releases/download/v1.6.0/ninja-win.zip \\ci-files01-hki.ci.local\provisioning\ninja\ninja-1.6.0-win-x86.zip $zip
+Verify-Checksum $zip "E01093F6533818425F8EFB0843CED7DCAABEA3B2"
+
+Extract-Zip $zip C:\Utils\Ninja
+Remove-Item $zip
+
+$machinePath = [Environment]::GetEnvironmentVariable('Path', [EnvironmentVariableTarget]::Machine)
+[Environment]::SetEnvironmentVariable("Path", $machinePath + ";C:\Utils\Ninja", [EnvironmentVariableTarget]::Machine)
diff --git a/coin/provisioning/common/python.ps1 b/coin/provisioning/common/python.ps1
index 3edbc412..ef4be200 100644
--- a/coin/provisioning/common/python.ps1
+++ b/coin/provisioning/common/python.ps1
@@ -43,12 +43,12 @@ $package = "C:\Windows\temp\python-$version.msi"
if ( $archVer -eq 64 ) {
echo "Running in 64 bit system"
$externalUrl = "https://www.python.org/ftp/python/$version/python-$version.amd64.msi"
- $internalUrl = "http://ci-files01-hki.ci.local/input/windows/python-$version.amd64.msi"
+ $internalUrl = "\\ci-files01-hki.ci.local\provisioning\windows\python-$version.amd64.msi"
$sha1 = "d9113142bae8829365c595735e1ad1f9f5e2894c"
}
else {
$externalUrl = "https://www.python.org/ftp/python/$version/python-$version.msi"
- $internalUrl = "http://ci-files01-hki.ci.local/input/windows/python-$version.msi"
+ $internalUrl = "\\ci-files01-hki.ci.local\provisioning\windows\python-$version.msi"
$sha1 = "7e3b54236dbdbea8fe2458db501176578a4d59c0"
}
diff --git a/coin/provisioning/common/sw_versions.txt b/coin/provisioning/common/sw_versions.txt
new file mode 100644
index 00000000..cc165dd5
--- /dev/null
+++ b/coin/provisioning/common/sw_versions.txt
@@ -0,0 +1 @@
+libclang_version="4.0"
diff --git a/coin/provisioning/common/01-windows_removethemall.ps1 b/coin/provisioning/common/windows_removethemall.ps1
index ebbf15dd..0e584900 100644
--- a/coin/provisioning/common/01-windows_removethemall.ps1
+++ b/coin/provisioning/common/windows_removethemall.ps1
@@ -56,6 +56,6 @@ Function Remove-Path {
}
# Remove Android sdk and ndk
-Remove C:\utils\android*
+dir c:\utils\android* | ForEach { Rename-Item $_ $_"-deleted" }
[Environment]::SetEnvironmentVariable("ANDROID_NDK_HOME",$null,"User")
[Environment]::SetEnvironmentVariable("ANDROID_SDK_HOME",$null,"User")
diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-libclang.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-libclang.sh
new file mode 100755
index 00000000..aa64a892
--- /dev/null
+++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-libclang.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+BASEDIR=$(dirname "$0")
+. $BASEDIR/../common/sw_versions.txt
+VERSION=$libclang_version
+URL="https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_${VERSION//\./}-linux-Rhel6.6-gcc4.9-x86_64.7z"
+SHA1="c7466109628418a6aa3db8b3f5825f847f1c4952"
+
+$BASEDIR/../common/libclang.sh "$URL" "$SHA1" "$VERSION"
diff --git a/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/08-libclang.sh b/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/08-libclang.sh
new file mode 100755
index 00000000..abbda212
--- /dev/null
+++ b/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/08-libclang.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+BASEDIR=$(dirname "$0")
+. $BASEDIR/../common/sw_versions.txt
+VERSION=$libclang_version
+URL="https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_${VERSION//\./}-linux-Rhel7.2-gcc5.3-x86_64.7z"
+SHA1="bbdbbc0296f42310077539b7247d285386119ef4"
+
+$BASEDIR/../common/libclang.sh "$URL" "$SHA1" "$VERSION"
diff --git a/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/10-qnx_700.sh b/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/10-qnx_700.sh
new file mode 100644
index 00000000..8a38c054
--- /dev/null
+++ b/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/10-qnx_700.sh
@@ -0,0 +1,64 @@
+#!/bin/env bash
+
+#############################################################################
+##
+## Copyright (C) 2017 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the provisioning scripts of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL21$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://www.qt.io/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 or version 3 as published by the Free
+## Software Foundation and appearing in the file LICENSE.LGPLv21 and
+## LICENSE.LGPLv3 included in the packaging of this file. Please review the
+## following information to ensure the GNU Lesser General Public License
+## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## As a special exception, The Qt Company gives you certain additional
+## rights. These rights are described in The Qt Company LGPL Exception
+## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+# This script installs QNX 7.
+
+set -e
+targetFolder="/opt/"
+sourceFile="http://ci-files01-hki.ci.local/input/qnx/qnx700.tar.xz"
+sha1="949a87c5f00d0756956cb4b1b3b213ecaeee9113"
+folderName="qnx700"
+targetFile="qnx700.tar.xz"
+wget --tries=5 --waitretry=5 --output-document="$targetFile" "$sourceFile" || echo "Failed to download '$url' multiple times"
+echo "$sha1 $targetFile" | sha1sum --check || echo "Failed to check sha1sum"
+if [ ! -d "$targetFolder" ]; then
+ mkdir -p $targetFolder
+fi
+if [ -d "$targetFolder/$folderName" ]; then
+ rm -rf $targetFolder/$folderName
+fi
+sudo tar -C $targetFolder -Jxf $targetFile|| echo "Failed to extract $targetFile"
+sudo chown -R qt:users "$targetFolder"/"$folderName"
+
+# Verify that we have last file in tar
+if [ ! -f $targetFolder/$folderName/qnxsdp-env.sh ]; then
+ echo "Installation failed!"
+ exit -1
+fi
+
+rm -rf $targetFile
+# Set env variables
+echo 'export QNX_700=$targetFolder/$folderName' >> ~/.bashrc
+echo "QNX SDP = 7.0.0" >> ~/versions.txt
diff --git a/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/30-integrity.sh b/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/30-integrity.sh
new file mode 100755
index 00000000..ae637a44
--- /dev/null
+++ b/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/30-integrity.sh
@@ -0,0 +1,55 @@
+#!/bin/bash
+
+#############################################################################
+##
+## Copyright (C) 2017 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the provisioning scripts of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL21$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://www.qt.io/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 or version 3 as published by the Free
+## Software Foundation and appearing in the file LICENSE.LGPLv21 and
+## LICENSE.LGPLv3 included in the packaging of this file. Please review the
+## following information to ensure the GNU Lesser General Public License
+## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## As a special exception, The Qt Company gives you certain additional
+## rights. These rights are described in The Qt Company LGPL Exception
+## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+# This script installs INTEGRITY
+
+source "${BASH_SOURCE%/*}/../common/InstallFromCompressedFileFromURL.sh"
+
+version="11.4.4"
+PrimaryUrl="http://ci-files01-hki.ci.local/input/integrity/ghs_$version.tar.gz"
+AltUrl="$PrimaryUrl" # we lack an external source for this
+SHA1="4afa3c15e13c91734951b73f6b21388294c5d794"
+targetFolder="/opt/ghs"
+appPrefix=""
+
+InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$targetFolder" "$appPrefix"
+
+echo "export INTEGRITY_BSP=platform-cortex-a9" >> ~/.bashrc
+echo "export INTEGRITY_PATH=$targetFolder/comp_201654" >> ~/.bashrc
+echo "export INTEGRITY_DIR=$targetFolder/int1144" >> ~/.bashrc
+echo "export INTEGRITY_GL_INC_DIR=\$INTEGRITY_DIR/INTEGRITY-include/Vivante/sdk/inc" >> ~/.bashrc
+echo "export INTEGRITY_GL_LIB_DIR=\$INTEGRITY_DIR/libs/Vivante" >> ~/.bashrc
+
+echo "INTEGRITY = $version" >> ~/versions.txt
diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/001-systemsetup.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/001-systemsetup.sh
index 1881ae0b..2498e441 100755
--- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/001-systemsetup.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/001-systemsetup.sh
@@ -44,7 +44,6 @@ ExceptionGsettings1=100
ExceptionGsettings2=101
ExceptionGsettings3=102
ExceptionNTS=103
-ExceptionDISPLAY=104
try
(
@@ -57,8 +56,6 @@ try
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 || throw $ExceptionNTS
- echo "Set DISPLAY"
- echo 'export DISPLAY=":0"' >> ~/.bashrc || throw $ExceptionDISPLAY
)
catch || {
case $ex_code in
@@ -78,10 +75,6 @@ catch || {
echo "Failed to set network teset server address into /etc/hosts."
exit 1;
;;
- $ExceptionDISPLAY)
- echo "Failed to set DISPLAY into ~/.bashrc."
- exit 1;
- ;;
esac
}
diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/003-qemu.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/003-qemu.sh
index f978003b..9c906562 100755
--- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/003-qemu.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/003-qemu.sh
@@ -64,3 +64,15 @@ sudo update-binfmts --package qemu-arm --install arm \
# doesn't help since host version creates cache for a wrong architecture and running
# armv7 fc-cache segfaults on QEMU.
sudo DEBIAN_FRONTEND=noninteractive apt-get -y remove fonts-noto-cjk
+
+# If normal fontconfig paths are used, qemu parses what ever files it finds from
+# the toolchain sysroot and the rest from the system fonts. Fix by copying the
+# system font configurations to a location which prefix that can't be found from
+# the toolchain sysroot. Links must also be dereferenced or their targets remain
+# pointing to the toolchain sysroot.
+QEMU_FONTCONFPATH=~/qemu_fonts
+QEMU_FONTCONFFILE=$QEMU_FONTCONFPATH/fonts.qemu.conf
+mkdir -p $QEMU_FONTCONFPATH
+cp -Lr /etc/fonts/* $QEMU_FONTCONFPATH
+sed $QEMU_FONTCONFPATH/fonts.conf -e "s:conf.d:$QEMU_FONTCONFPATH/conf.d:" > $QEMU_FONTCONFFILE
+echo "export QEMU_SET_ENV=\"FONTCONFIG_FILE=$QEMU_FONTCONFFILE,FONTCONFIG_PATH=$QEMU_FONTCONFPATH\"" >> ~/.profile
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/005-systemsetup.sh b/coin/provisioning/qtci-macos-10.12-x86_64/005-systemsetup.sh
index 48430389..5819e9de 100755
--- a/coin/provisioning/qtci-macos-10.12-x86_64/005-systemsetup.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/005-systemsetup.sh
@@ -46,10 +46,15 @@ ExceptionSetInitialDelay=101
ExceptionSetDelay=102
ExceptionVNC=103
ExceptionNTS=104
+ExceptionDisableScreensaverPassword=105
try
(
echo "Disable Screensaver"
+ # For current session
+ defaults -currentHost write com.apple.screensaver idleTime 0 || throw $ExceptionDisableScreensaver
+
+ # For session after a reboot
mkdir -p "$HOME/Library/LaunchAgents" || throw $ExceptionDisableScreensaver
(
cat >"$HOME/Library/LaunchAgents/no-screensaver.plist" <<EOT
@@ -78,6 +83,8 @@ try
EOT
) || throw $ExceptionDisableScreensaver
+ defaults write com.apple.screensaver askForPassword -int 0 || throw $ExceptionDisableScreensaverPassword
+
echo "Set keyboard type rates and delays"
# normal minimum is 15 (225 ms)
defaults write -g InitialKeyRepeat -int 15 || throw $ExceptionSetInitialDelay
@@ -113,5 +120,9 @@ catch || {
echo "Failed to set NTS."
exit 1;
;;
+ $ExceptionDisableScreensaverPassword)
+ echo "Failed to disable requiring of password after screensaver is enabled."
+ exit 1;
+ ;;
esac
}
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/007-SSL_keychain.sh b/coin/provisioning/qtci-macos-10.12-x86_64/007-SSL_keychain.sh
new file mode 100755
index 00000000..61406203
--- /dev/null
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/007-SSL_keychain.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+# Enables the usage of temporary keychains for SSL autotests
+echo "export QT_SSL_USE_TEMPORARY_KEYCHAIN=1" >> ~/.bashrc
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/020-java.sh b/coin/provisioning/qtci-macos-10.12-x86_64/020-java.sh
new file mode 100755
index 00000000..a9776ba6
--- /dev/null
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/020-java.sh
@@ -0,0 +1,129 @@
+#!/bin/bash
+
+#############################################################################
+##
+## Copyright (C) 2017 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the provisioning scripts of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL21$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://www.qt.io/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 or version 3 as published by the Free
+## Software Foundation and appearing in the file LICENSE.LGPLv21 and
+## LICENSE.LGPLv3 included in the packaging of this file. Please review the
+## following information to ensure the GNU Lesser General Public License
+## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## As a special exception, The Qt Company gives you certain additional
+## rights. These rights are described in The Qt Company LGPL Exception
+## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+# This script installs JDK
+echo "Installing Java Development Kit"
+
+# shellcheck source=../common/try_catch.sh
+source "${BASH_SOURCE%/*}/../common/try_catch.sh"
+
+ExceptionDownloadPrimaryUrl=100
+ExceptionDownloadAltUrl=101
+ExceptionSHA1=102
+ExceptionAttachImage=103
+ExceptionInstall=104
+ExceptionDetachImage=105
+ExceptionRemoveTmpFile=106
+ExceptionDisableAutoUpdate=107
+
+
+url=http://ci-files01-hki.ci.local/input/mac/macos_10.12_sierra/jdk-8u102-macosx-x64.dmg
+url_alt=http://download.oracle.com/otn-pub/java/jdk/8u102-b14/jdk-8u102-macosx-x64.dmg
+targetFile=/tmp/jdk-8u102-macosx-x64.dmg
+expectedSha1=1405af955f14e32aae187b5754a716307db22104
+
+try
+(
+ try
+ (
+ echo "Downloading from primary URL '$url'"
+ curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$url" || throw $ExceptionDownloadPrimaryUrl
+ )
+ catch || {
+ case $ex_code in
+ $ExceptionDownloadPrimaryUrl)
+ echo "Failed to download '$url' multiple times"
+ echo "Downloading tar.gz from alternative URL '$url_alt'"
+ curl --fail -L --retry 5 --retry-delay 5 -j -k -H "Cookie: oraclelicense=accept-securebackup-cookie" -o "$targetFile" "$url_alt" || throw $ExceptionDownloadAltUrl
+ ;;
+ esac
+ }
+ echo "Checking SHA1 on '$targetFile'"
+ echo "$expectedSha1 *$targetFile" | shasum --check || throw $ExceptionSHA1
+
+ echo Mounting DMG
+ hdiutil attach "$targetFile" || throw $ExceptionAttachImage
+
+ echo Installing JDK
+ (cd /Volumes/JDK\ 8\ Update\ 102/ && sudo installer -package JDK\ 8\ Update\ 102.pkg -target /) || throw $ExceptionInstall
+
+ disk=`hdiutil info | grep '/Volumes/JDK 8 Update 102' | awk '{print $1}'`
+ hdiutil detach $disk || throw $ExceptionDetachImage
+
+ echo "Removing temporary file '$targetFile'"
+ rm "$targetFile" || throw $ExceptionRemoveTmpFile
+
+ echo "Disable auto update"
+ sudo defaults write /Library/Preferences/com.oracle.java.Java-Updater JavaAutoUpdateEnabled -bool false || throw $ExceptionDisableAutoUpdate
+
+ echo "JDK Version = 8 update 102" >> ~/versions.txt
+)
+catch || {
+ case $ex_code in
+ $ExceptionDownloadPrimaryUrl)
+ echo "Failed to download JDK from primary URL."
+ exit 1;
+ ;;
+ $ExceptionDownloadAltUrl)
+ echo "Failed to download JDK from alternative URL."
+ exit 1;
+ ;;
+ $ExceptionSHA1)
+ echo "Failed to check SHA1."
+ exit 1;
+ ;;
+ $ExceptionAttachImage)
+ echo "Failed to attach image."
+ exit 1;
+ ;;
+ $ExceptionInstall)
+ echo "Failed to install JDK."
+ exit 1;
+ ;;
+ $ExceptionDetachImage)
+ echo "Failed to detach image."
+ exit 1;
+ ;;
+ $ExceptionRemoveTmpFile)
+ echo "Failed to remove temporary file."
+ exit 1;
+ ;;
+ $ExceptionDisableAutoUpdate)
+ echo "Failed to disable auto update."
+ exit 1;
+ ;;
+
+ esac
+}
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/020-xcode.sh b/coin/provisioning/qtci-macos-10.12-x86_64/020-xcode.sh
index 7c70d954..272952ed 100755
--- a/coin/provisioning/qtci-macos-10.12-x86_64/020-xcode.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/020-xcode.sh
@@ -45,66 +45,7 @@
# shellcheck source=../common/try_catch.sh
source "${BASH_SOURCE%/*}/../common/try_catch.sh"
-ExceptionDownloadUrl=100
-ExceptionSHA1=101
-ExceptionUnXZ=102
-ExceptionCPIO=103
-ExceptionDelete=104
-ExceptionAcceptLicense=105
+# shellcheck source=../common/install_xcode.sh
+source "${BASH_SOURCE%/*}/../common/install_xcode.sh"
-
-url=http://ci-files01-hki.ci.local/input/mac/Xcode_8.3.1.xz
-targetFile=/tmp/Xcode_8.3.1.xz
-expectedSha1=4ecdba2e563229034802a4ee9a0800b947d05a8e
-
-try
-(
- echo "Downloading Xcode from primary URL '$url'"
- curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$url" || throw $ExceptionDownloadUrl
-
- echo "Checking SHA1 on $targetFile"
- echo "$expectedSha1 *$targetFile" | shasum --check || throw $ExceptionSHA1
-
- echo "Uncompressing '$targetFile'"
- xz -d "$targetFile" || throw $ExceptionUnXZ
-
- echo "Unarchiving '${targetFile%.*}'"
- (cd /Applications/ && sudo cpio -dmiI "${targetFile%.*}") || throw $ExceptionCPIO
-
- echo "Deleting '${targetFile%.*}'"
- rm "${targetFile%.*}" || throw $ExceptionDelete
-
- echo "Accept license"
- sudo xcodebuild -license accept || throw $ExceptionAcceptLicense
-
- echo "XCode = 8.3.1" >> ~/versions.txt
-)
-catch || {
- case $ex_code in
- $ExceptionDownloadUrl)
- echo "Failed to download Xcode."
- exit 1;
- ;;
- $ExceptionSHA1)
- echo "Failed to check SHA1."
- exit 1;
- ;;
- $ExceptionUnXZ)
- echo "Failed to uncompress .xz"
- exit 1;
- ;;
- $ExceptionCPIO)
- echo "Failed to unarchive .cpio."
- exit 1;
- ;;
- $ExceptionDelete)
- echo "Failed to delete temporary file."
- exit 1;
- ;;
- $ExceptionAcceptLicense)
- echo "Failed to accept license."
- exit 1;
- ;;
-
- esac
-}
+InstallXCode /net/ci-files01-hki.ci.local/hdd/www/input/mac/Xcode_8.3.1.xz 8.3.1
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/030-android.sh b/coin/provisioning/qtci-macos-10.12-x86_64/030-android.sh
new file mode 100755
index 00000000..c6a17530
--- /dev/null
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/030-android.sh
@@ -0,0 +1,116 @@
+#!/bin/bash
+
+#############################################################################
+##
+## Copyright (C) 2017 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the provisioning scripts of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL21$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://www.qt.io/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 or version 3 as published by the Free
+## Software Foundation and appearing in the file LICENSE.LGPLv21 and
+## LICENSE.LGPLv3 included in the packaging of this file. Please review the
+## following information to ensure the GNU Lesser General Public License
+## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## As a special exception, The Qt Company gives you certain additional
+## rights. These rights are described in The Qt Company LGPL Exception
+## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+# This script install Android sdk and ndk.
+
+# It also runs update for SDK API, latest SDK tools, latest platform-tools and build-tools version
+
+# shellcheck source=../common/try_catch.sh
+source "${BASH_SOURCE%/*}/../common/try_catch.sh"
+
+targetFolder="/opt/android"
+sdkTargetFolder="$targetFolder/sdk"
+
+basePath="/net/ci-files01-hki.ci.local/hdd/www/input/android"
+
+toolsVersion="r25.2.5"
+toolsFile="tools_$toolsVersion-macosx.zip"
+ndkVersion="r10e"
+ndkFile="android-ndk-$ndkVersion-darwin-x86_64.zip"
+sdkBuildToolsVersion="25.0.2"
+sdkApiLevel="android-21"
+
+toolsSha1="d2168d963ac5b616e3d3ddaf21511d084baf3659"
+ndkSha1="6be8598e4ed3d9dd42998c8cb666f0ee502b1294"
+
+toolsTargetFile="/tmp/$toolsFile"
+toolsSourceFile="$basePath/$toolsFile"
+ndkTargetFile="/tmp/$ndkFile"
+ndkSourceFile="$basePath/$ndkFile"
+
+ExceptionUnzipTools=100
+ExceptionUnzipNdk=101
+ExceptionRmTools=102
+ExceptionRmNdk=103
+ExceptionSdkManager=104
+
+try
+(
+ echo "Unzipping Android NDK to '$targetFolder'"
+ sudo unzip -q "$ndkSourceFile" -d "$targetFolder" || throw $ExceptionUnzipNdk
+ echo "Unzipping Android Tools to '$sdkTargetFolder'"
+ sudo unzip -q "$toolsSourceFile" -d "$sdkTargetFolder" || throw $ExceptionUnzipTools
+
+ echo "Changing ownership of Android files."
+ sudo chown -R qt:wheel "$targetFolder"
+
+ echo "Running SDK manager for platforms;$sdkApiLevel, tools, platform-tools and build-tools;$sdkBuildToolsVersion."
+ echo "y" |"$sdkTargetFolder/tools/bin/sdkmanager" "platforms;$sdkApiLevel" "tools" "platform-tools" "build-tools;$sdkBuildToolsVersion" || throw $ExceptionSdkManager
+
+ echo "export ANDROID_SDK_ROOT=$sdkTargetFolder" >> ~/.bashrc
+ echo "export ANDROID_NDK_HOME=$targetFolder/android-ndk-$ndkVersion" >> ~/.bashrc
+ echo "export ANDROID_NDK_HOST=darwin-x86_64" >> ~/.bashrc
+ echo "export ANDROID_API_VERSION=$sdkApiLevel" >> ~/.bashrc
+
+ echo "Android SDK tools = $toolsVersion" >> ~/version.txt
+ echo "Android SDK Build Tools = $sdkBuildToolsVersion" >> ~/version.txt
+ echo "Android SDK API level = $sdkApiLevel" >> ~/version.txt
+ echo "Android NDK = $ndkVersion" >> ~/version.txt
+)
+catch || {
+ case $ex_code in
+ $ExceptionUnzipTools)
+ echo "Failed to unzip Android SDK Tools."
+ exit 1;
+ ;;
+ $ExceptionUnzipNdk)
+ echo "Failed to unzip Android NDK."
+ exit 1;
+ ;;
+ $ExceptionRmTools)
+ echo "Failed to remove temporary tools package '$toolsTargetFile'."
+ exit 1;
+ ;;
+ $ExceptionRmNdk)
+ echo "Failed to remove temporary NDK package '$ndkTargetFile'."
+ exit 1;
+ ;;
+ $ExceptionSdkManager)
+ echo "Failed to run sdkmanager."
+ exit 1;
+ ;;
+ esac
+}
+
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/035-openssl.sh b/coin/provisioning/qtci-macos-10.12-x86_64/035-openssl.sh
new file mode 100755
index 00000000..acd0bd74
--- /dev/null
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/035-openssl.sh
@@ -0,0 +1,117 @@
+#!/bin/bash
+
+#############################################################################
+##
+## Copyright (C) 2017 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the provisioning scripts of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL21$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://www.qt.io/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 or version 3 as published by the Free
+## Software Foundation and appearing in the file LICENSE.LGPLv21 and
+## LICENSE.LGPLv3 included in the packaging of this file. Please review the
+## following information to ensure the GNU Lesser General Public License
+## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## As a special exception, The Qt Company gives you certain additional
+## rights. These rights are described in The Qt Company LGPL Exception
+## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+# This script install OpenSSL
+
+# shellcheck source=../common/try_catch.sh
+source "${BASH_SOURCE%/*}/../common/try_catch.sh"
+# shellcheck source=../common/InstallFromCompressedFileFromURL.sh
+source "${BASH_SOURCE%/*}/../common/InstallFromCompressedFileFromURL.sh"
+
+opensslVersion="1.0.2k"
+opensslFile="openssl-$opensslVersion.tar.gz"
+opensslDlUrl="http://ci-files01-hki.ci.local/input/openssl/$opensslFile"
+opensslAltDlUrl="https://www.openssl.org/source/$opensslFile"
+opensslSha1="5f26a624479c51847ebd2f22bb9f84b3b44dcb44"
+
+# Below target location has been hard coded into Coin.
+# QTQAINFRA-1195
+opensslTargetLocation="/usr/local/opt/openssl"
+
+ExceptionCD=100
+ExceptionConfig=101
+ExceptionMake=102
+ExceptionInstall=103
+ExceptionLN=104
+ExceptionCertificate=105
+ExceptionCleanup=106
+
+try
+(
+ InstallFromCompressedFileFromURL "$opensslDlUrl" "$opensslAltDlUrl" "$opensslSha1" "/tmp/openssl-$opensslVersion" "openssl-$opensslVersion"
+ cd "/tmp/openssl-$opensslVersion" || throw $ExceptionCD
+ pwd
+ sudo ./config --prefix=/usr/local/openssl-$opensslVersion || throw $ExceptionConfig
+ echo "Running 'make' for OpenSSL"
+ sudo make --silent > /tmp/openssl_make.log 2>&1 || throw $ExceptionMake
+ echo "Running 'make install' for OpenSSL"
+ sudo make --silent install > /tmp/openssl_make_install.log 2>&1 || throw $ExceptionInstall
+
+ path=$(echo "$opensslTargetLocation" | sed -E 's/(.*)\/.*$/\1/')
+ sudo mkdir -p "$path"
+ sudo ln -s /usr/local/openssl-$opensslVersion $opensslTargetLocation || throw $ExceptionLN
+
+ echo "export PATH=\"$opensslTargetLocation/bin:$PATH\"" >> ~/.bashrc
+ echo "export MANPATH=\"$opensslTargetLocation/share/man:$MANPATH\"" >> ~/.bashrc
+
+ security find-certificate -a -p /Library/Keychains/System.keychain | sudo tee -a $opensslTargetLocation/ssl/cert.pem || throw $ExceptionCertificate
+ security find-certificate -a -p /System/Library/Keychains/SystemRootCertificates.keychain | sudo tee -a $opensslTargetLocation/ssl/cert.pem || throw $ExceptionCertificate
+
+ sudo rm -rf /tmp/openssl-$opensslVersion || throw $ExceptionCleanup
+
+ echo "OpenSSL = $opensslVersion" >> ~/versions.txt
+)
+catch || {
+ case $ex_code in
+ $ExceptionCD)
+ echo "Failed to change directory to /tmp/openssl-$opensslVersion."
+ exit 1;
+ ;;
+ $ExceptionConfig)
+ echo "Failed to run config for OpenSSL."
+ exit 1;
+ ;;
+ $ExceptionMake)
+ echo "Failed to run 'make' for OpenSSL."
+ exit 1;
+ ;;
+ $ExceptionInstall)
+ echo "Failed to run 'make install' for OpenSSL."
+ exit 1;
+ ;;
+ $ExceptionLN)
+ echo "Failed to create a soft link for OpenSSL."
+ exit 1;
+ ;;
+ $ExceptionCertificate)
+ echo "Failed to install Certificate for OpenSSL."
+ exit 1;
+ ;;
+ $ExceptionCleanup)
+ echo "Failed to clean up /tmp/openssl-$opensslVersion."
+ exit 1;
+ ;;
+ esac
+}
diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/08-libclang.sh b/coin/provisioning/qtci-osx-10.10-x86_64/08-libclang.sh
new file mode 100755
index 00000000..d257ffa1
--- /dev/null
+++ b/coin/provisioning/qtci-osx-10.10-x86_64/08-libclang.sh
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+BASEDIR=$(dirname "$0")
+# There is only one mac package and common script uses it as a default
+$BASEDIR/../common/libclang.sh
diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/android.sh b/coin/provisioning/qtci-osx-10.10-x86_64/android.sh
deleted file mode 100644
index fae4f7b9..00000000
--- a/coin/provisioning/qtci-osx-10.10-x86_64/android.sh
+++ /dev/null
@@ -1,103 +0,0 @@
-#!/bin/sh
-
-#############################################################################
-##
-## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
-##
-## This file is part of the test suite of the Qt Toolkit.
-##
-## $QT_BEGIN_LICENSE:LGPL21$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
-##
-## GNU Lesser General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU Lesser
-## General Public License version 2.1 or version 3 as published by the Free
-## Software Foundation and appearing in the file LICENSE.LGPLv21 and
-## LICENSE.LGPLv3 included in the packaging of this file. Please review the
-## following information to ensure the GNU Lesser General Public License
-## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-##
-## As a special exception, The Qt Company gives you certain additional
-## rights. These rights are described in The Qt Company LGPL Exception
-## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
-
-# This script install Android sdk and ndk.
-
-# It also runs update for SDK API level 21, latest SDK tools, latest platform-tools and - build-tools
-
-# Android 16 is the minimum requirement for Qt 5.7 applications, but we need something more recent than that for building Qt itself.
-# E.g The Bluetooth features that require Android 21 will disable themselves dynamically when running on an Android 16 device.
-# That's why we need to use Andoid-21 API version in Qt 5.9.
-
-
-set -e
-targetFolder="/opt/android"
-baseUrl="http://ci-files01-hki.ci.local/input/android"
-
-# SDK
-sdkVersion="android-sdk_r24.4.1-macosx.zip"
-sdkBuildToolsVersion="24.0.2"
-sdkApiLevel="android-21"
-sdkUrl="$baseUrl/$sdkVersion"
-sdkSha1="85a9cccb0b1f9e6f1f616335c5f07107553840cd"
-sdkTargetFile="$targetFolder/$sdkVersion"
-sdkExtract="unzip $sdkTargetFile -d $targetFolder"
-sdkFolderName="android-sdk-macosx"
-sdkName="sdk"
-
-# NDK
-ndkVersion="android-ndk-r10e-darwin-x86_64.zip"
-ndkUrl="$baseUrl/$ndkVersion"
-ndkSha1="6be8598e4ed3d9dd42998c8cb666f0ee502b1294"
-ndkTargetFile="$targetFolder/$ndkVersion"
-ndkExtract="unzip $ndkTargetFile -d $targetFolder"
-ndkFolderName="android-ndk-r10e"
-ndkName="ndk"
-
-function InstallAndroidPackage {
- targetFolder=$1
- version=$2
- url=$3
- sha1=$4
- targetFile=$5
- extract=$6
- folderName=$7
- name=$8
-
- sudo curl --retry 5 --retry-delay 10 --retry-max-time 60 $url -o $targetFile || echo "Failed to download '$url' multiple times"
- shasum $targetFile |grep $sha1 || echo "shasum check failed !"
- sudo chmod 755 $targetFile
- sudo $extract || echo "Failed to extract $url"
- sudo chown -R qt:wheel $targetFolder/$folderName
- sudo mv $targetFolder/$folderName $targetFolder/$name || echo "Failed to rename $name"
- sudo rm -fr $targetFolder/$version || echo "Failed to remove $targetFolder/$version"
-}
-
-sudo mkdir $targetFolder
-# Install Android SDK
-echo "Installing Android SDK version $sdkVersion..."
-InstallAndroidPackage $targetFolder $sdkVersion $sdkUrl $sdkSha1 $sdkTargetFile "$sdkExtract" $sdkFolderName $sdkName
-
-# Install Android NDK
-echo "Installing Android NDK version $ndkVersion..."
-InstallAndroidPackage $targetFolder $ndkVersion $ndkUrl $ndkSha1 $ndkTargetFile "$ndkExtract" $ndkFolderName $ndkName
-
-# run update for Android SDK and install SDK API version 21, latest SDK tools, platform-tools and build-tools
-echo "Running Android SDK update for API version 21, SDK-tools, platform-tools and build-tools-$sdkBuildToolsVersion..."
-echo "y" |$targetFolder/sdk/tools/android update sdk --no-ui --all --filter $sdkApiLevel,tools,platform-tools,build-tools-$sdkBuildToolsVersion || echo "Failed to run update"
-
-# For Qt 5.6, we by default require API levels 10, 11, 16 and 21, but we can override this by setting ANDROID_API_VERSION=android-21
-# From Qt 5.7 forward, if android-16 is not installed, Qt will automatically use more recent one.
-echo 'export ANDROID_API_VERSION=android-21' >> ~/.bashrc
diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/005-systemsetup.sh b/coin/provisioning/qtci-osx-10.11-x86_64/005-systemsetup.sh
index 47bf03f8..4a07bbbe 100755
--- a/coin/provisioning/qtci-osx-10.11-x86_64/005-systemsetup.sh
+++ b/coin/provisioning/qtci-osx-10.11-x86_64/005-systemsetup.sh
@@ -46,10 +46,15 @@ ExceptionSetInitialDelay=101
ExceptionSetDelay=102
ExceptionVNC=103
ExceptionNTS=104
+ExceptionDisableScreensaverPassword=105
try
(
echo "Disable Screensaver"
+ # For current session
+ defaults -currentHost write com.apple.screensaver idleTime 0 || throw $ExceptionDisableScreensaver
+
+ # For session after a reboot
mkdir -p "$HOME/Library/LaunchAgents" || throw $ExceptionDisableScreensaver
(
cat >"$HOME/Library/LaunchAgents/no-screensaver.plist" <<EOT
@@ -78,6 +83,8 @@ try
EOT
) || throw $ExceptionDisableScreensaver
+ defaults write com.apple.screensaver askForPassword -int 0 || throw $ExceptionDisableScreensaverPassword
+
echo "Set keyboard type rates and delays"
# normal minimum is 15 (225 ms)
defaults write -g InitialKeyRepeat -int 15 || throw $ExceptionSetInitialDelay
@@ -113,6 +120,10 @@ catch || {
echo "Failed to set NTS."
exit 1;
;;
+ $ExceptionDisableScreensaverPassword)
+ echo "Failed to disable requiring of password after screensaver is enabled."
+ exit 1;
+ ;;
esac
}
diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/007-SSL_keychain.sh b/coin/provisioning/qtci-osx-10.11-x86_64/007-SSL_keychain.sh
new file mode 100755
index 00000000..61406203
--- /dev/null
+++ b/coin/provisioning/qtci-osx-10.11-x86_64/007-SSL_keychain.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+# Enables the usage of temporary keychains for SSL autotests
+echo "export QT_SSL_USE_TEMPORARY_KEYCHAIN=1" >> ~/.bashrc
diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/020-xcode.sh b/coin/provisioning/qtci-osx-10.11-x86_64/020-xcode.sh
index 44453e55..7555c752 100755
--- a/coin/provisioning/qtci-osx-10.11-x86_64/020-xcode.sh
+++ b/coin/provisioning/qtci-osx-10.11-x86_64/020-xcode.sh
@@ -47,68 +47,7 @@
# shellcheck source=../common/try_catch.sh
source "${BASH_SOURCE%/*}/../common/try_catch.sh"
-ExceptionDownloadUrl=100
-ExceptionSHA1=101
-ExceptionUnXZ=102
-ExceptionCPIO=103
-ExceptionDelete=104
-ExceptionAcceptLicense=105
-
-
-url=http://ci-files01-hki.ci.local/input/mac/Xcode_8.2.xz
-targetFile=/tmp/Xcode_8.2.xz
-expectedSha1=46edc920955e315d946e36c45f629d5ee9dc9d59
-
-try
-(
- echo "Downloading Xcode from primary URL '$url'"
- curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$url" || throw $ExceptionDownloadUrl
-
- echo "Checking SHA1 on $targetFile"
- echo "$expectedSha1 *$targetFile" | shasum --check || throw $ExceptionSHA1
-
- echo "Uncompressing '$targetFile'"
- xz -d "$targetFile" || throw $ExceptionUnXZ
-
- echo "Unarchiving '${targetFile%.*}'"
- (cd /Applications/ && sudo cpio -dmiI "${targetFile%.*}") || throw $ExceptionCPIO
-
- echo "Deleting '${targetFile%.*}'"
- rm "${targetFile%.*}" || throw $ExceptionDelete
-
- echo "Accept license"
- sudo xcodebuild -license accept || throw $ExceptionAcceptLicense
-
- echo "Xcode = 8.2" >> ~/versions.txt
-)
-catch || {
- case $ex_code in
- $ExceptionDownloadUrl)
- echo "Failed to download Xcode."
- exit 1;
- ;;
- $ExceptionSHA1)
- echo "Failed to check SHA1."
- exit 1;
- ;;
- $ExceptionUnXZ)
- echo "Failed to uncompress .xz"
- exit 1;
- ;;
- $ExceptionCPIO)
- echo "Failed to unarchive .cpio."
- exit 1;
- ;;
- $ExceptionDelete)
- echo "Failed to delete temporary file."
- exit 1;
- ;;
- $ExceptionAcceptLicense)
- echo "Failed to accept license."
- exit 1;
- ;;
-
- esac
-}
-
+# shellcheck source=../common/install_xcode.sh
+source "${BASH_SOURCE%/*}/../common/install_xcode.sh"
+InstallXCode /net/ci-files01-hki.ci.local/hdd/www/input/mac/Xcode_8.2.xz 8.2
diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/025-homebrew.sh b/coin/provisioning/qtci-osx-10.11-x86_64/025-homebrew.sh
new file mode 100755
index 00000000..63ec9b69
--- /dev/null
+++ b/coin/provisioning/qtci-osx-10.11-x86_64/025-homebrew.sh
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+
+BASEDIR=$(dirname "$0")
+$BASEDIR/../common/homebrew.sh
diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/026-p7zip.sh b/coin/provisioning/qtci-osx-10.11-x86_64/026-p7zip.sh
new file mode 100755
index 00000000..4fb9ddbc
--- /dev/null
+++ b/coin/provisioning/qtci-osx-10.11-x86_64/026-p7zip.sh
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+# Install 7z to be used from command line
+brew update
+brew install p7zip
diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/08-libclang.sh b/coin/provisioning/qtci-osx-10.11-x86_64/08-libclang.sh
new file mode 100755
index 00000000..d257ffa1
--- /dev/null
+++ b/coin/provisioning/qtci-osx-10.11-x86_64/08-libclang.sh
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+BASEDIR=$(dirname "$0")
+# There is only one mac package and common script uses it as a default
+$BASEDIR/../common/libclang.sh
diff --git a/coin/provisioning/qtci-osx-10.8-x86_64/001-crashreporter.sh b/coin/provisioning/qtci-osx-10.8-x86_64/001-crashreporter.sh
deleted file mode 100644
index ba8dbdd3..00000000
--- a/coin/provisioning/qtci-osx-10.8-x86_64/001-crashreporter.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-defaults write com.apple.CrashReporter DialogType server
diff --git a/coin/provisioning/qtci-osx-10.8-x86_64/002-disable-screensaver.sh b/coin/provisioning/qtci-osx-10.8-x86_64/002-disable-screensaver.sh
deleted file mode 100644
index 44df94e7..00000000
--- a/coin/provisioning/qtci-osx-10.8-x86_64/002-disable-screensaver.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-
-mkdir -p $HOME/Library/LaunchAgents
-cat >$HOME/Library/LaunchAgents/no-screensaver.plist <<EOT
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple/DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
- <dict>
- <key>Label</key>
- <string>org.qt.io.screensaver_disable</string>
- <key>ProgramArguments</key>
- <array>
- <string>defaults</string>
- <string>-currentHost</string>
- <string>write</string>
- <string>com.apple.screensaver</string>
- <string>idleTime</string>
- <string>0</string>
- </array>
- <key>RunAtLoad</key>
- <true/>
- <key>KeepAlive</key>
- <false/>
- </dict>
-</plist>
-EOT
diff --git a/coin/provisioning/qtci-osx-10.8-x86_64/08-libclang.sh b/coin/provisioning/qtci-osx-10.8-x86_64/08-libclang.sh
new file mode 100755
index 00000000..d257ffa1
--- /dev/null
+++ b/coin/provisioning/qtci-osx-10.8-x86_64/08-libclang.sh
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+BASEDIR=$(dirname "$0")
+# There is only one mac package and common script uses it as a default
+$BASEDIR/../common/libclang.sh
diff --git a/coin/provisioning/qtci-osx-10.9-x86_64/001-crashreporter.sh b/coin/provisioning/qtci-osx-10.9-x86_64/001-crashreporter.sh
deleted file mode 100644
index ba8dbdd3..00000000
--- a/coin/provisioning/qtci-osx-10.9-x86_64/001-crashreporter.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-defaults write com.apple.CrashReporter DialogType server
diff --git a/coin/provisioning/qtci-osx-10.9-x86_64/002-disable-screensaver.sh b/coin/provisioning/qtci-osx-10.9-x86_64/002-disable-screensaver.sh
deleted file mode 100644
index 44df94e7..00000000
--- a/coin/provisioning/qtci-osx-10.9-x86_64/002-disable-screensaver.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-
-mkdir -p $HOME/Library/LaunchAgents
-cat >$HOME/Library/LaunchAgents/no-screensaver.plist <<EOT
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple/DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
- <dict>
- <key>Label</key>
- <string>org.qt.io.screensaver_disable</string>
- <key>ProgramArguments</key>
- <array>
- <string>defaults</string>
- <string>-currentHost</string>
- <string>write</string>
- <string>com.apple.screensaver</string>
- <string>idleTime</string>
- <string>0</string>
- </array>
- <key>RunAtLoad</key>
- <true/>
- <key>KeepAlive</key>
- <false/>
- </dict>
-</plist>
-EOT
diff --git a/coin/provisioning/qtci-osx-10.9-x86_64/08-libclang.sh b/coin/provisioning/qtci-osx-10.9-x86_64/08-libclang.sh
new file mode 100755
index 00000000..d257ffa1
--- /dev/null
+++ b/coin/provisioning/qtci-osx-10.9-x86_64/08-libclang.sh
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+BASEDIR=$(dirname "$0")
+# There is only one mac package and common script uses it as a default
+$BASEDIR/../common/libclang.sh
diff --git a/coin/provisioning/qtci-windows-10-x86/01-windows_removethemall.ps1 b/coin/provisioning/qtci-windows-10-x86/01-windows_removethemall.ps1
index 3bb0af0e..dfca166f 100644
--- a/coin/provisioning/qtci-windows-10-x86/01-windows_removethemall.ps1
+++ b/coin/provisioning/qtci-windows-10-x86/01-windows_removethemall.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\01-windows_removethemall.ps1"
+. "$PSScriptRoot\..\common\windows_removethemall.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86/03-conan.ps1 b/coin/provisioning/qtci-windows-10-x86/03-conan.ps1
index 4ba6c70c..2fc36311 100644
--- a/coin/provisioning/qtci-windows-10-x86/03-conan.ps1
+++ b/coin/provisioning/qtci-windows-10-x86/03-conan.ps1
@@ -7,3 +7,11 @@ Run-Conan-Install `
-Compiler "Visual Studio" `
-CompilerVersion 14 `
-CompilerRuntime MD
+
+Run-Conan-Install `
+ -ConanfilesDir "$PSScriptRoot\conanfiles" `
+ -BuildinfoDir MSVC2017-x86 `
+ -Arch x86 `
+ -Compiler "Visual Studio" `
+ -CompilerVersion 15 `
+ -CompilerRuntime MD
diff --git a/coin/provisioning/qtci-windows-10-x86/06-ninja.ps1 b/coin/provisioning/qtci-windows-10-x86/06-ninja.ps1
new file mode 100644
index 00000000..e46361a0
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86/06-ninja.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\ninja.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86/08-libclang.ps1 b/coin/provisioning/qtci-windows-10-x86/08-libclang.ps1
new file mode 100644
index 00000000..cc8be923
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86/08-libclang.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\libclang.ps1" 32
diff --git a/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.manifests/icu/57.1/vitallium/stable/export/conanmanifest.txt b/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.manifests/icu/57.1/vitallium/stable/export/conanmanifest.txt
deleted file mode 100644
index 392eb24f..00000000
--- a/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.manifests/icu/57.1/vitallium/stable/export/conanmanifest.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-1482492127
-conanfile.py: 7edc28cf26a4c3acd9b1c9f08ea8cba3
diff --git a/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.manifests/icu/57.1/vitallium/stable/package/08d619707be406a9063a13de35af19767e64a982/conanmanifest.txt b/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.manifests/icu/57.1/vitallium/stable/package/08d619707be406a9063a13de35af19767e64a982/conanmanifest.txt
deleted file mode 100644
index ab1bd501..00000000
--- a/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.manifests/icu/57.1/vitallium/stable/package/08d619707be406a9063a13de35af19767e64a982/conanmanifest.txt
+++ /dev/null
@@ -1,180 +0,0 @@
-1482491156
-bin/icudt57.dll: 31229bc6cadb43b991620f7d9e9baa06
-bin/icuin57.dll: 3f0eb9f4e2b0e4012afa16f83e9ff0dc
-bin/icutest57.dll: ff878466aa02fa1bddfb94ba17b246a8
-bin/icutu57.dll: fef065fefce5fc67ef4a43b666d147d0
-bin/icuuc57.dll: cc8db4d8a1ee20f4e8a46041ef06862f
-conaninfo.txt: 13f4fa914f5920b05e5b228be8679454
-include/unicode/alphaindex.h: e74fcba85b76577d32b90bc0056ee5d9
-include/unicode/appendable.h: 5c2d97a96252e2c959d4c226a554575b
-include/unicode/basictz.h: 444077f7dd19bd6dbe24034360356e8a
-include/unicode/brkiter.h: 0a5796a84c272600a360dc5918899492
-include/unicode/bytestream.h: f828cc9f542c232d2aadb09b9099c559
-include/unicode/bytestrie.h: 765c037e45325e1970e839349df7c28c
-include/unicode/bytestriebuilder.h: 634c9203ef678ee0d8fd9baffa8e3e46
-include/unicode/calendar.h: e360220586bcd0c3ea93b610bf4fe202
-include/unicode/caniter.h: f6de1e31cdc53563f35b093f8f8a07d8
-include/unicode/chariter.h: d6030b3dffd5355f9377318f76dd69de
-include/unicode/choicfmt.h: e86083f42af655ca0806ce1ed3dc55a0
-include/unicode/coleitr.h: 9a393483da6d9daae0bf18dd997abcfa
-include/unicode/coll.h: 06d3855e97984cd27579ec69b1985cc1
-include/unicode/compactdecimalformat.h: d1cca4ce6027a3d42a29b55e9ce0b82c
-include/unicode/curramt.h: efd2919661fe8dbc23f6b0f5bd33e685
-include/unicode/currpinf.h: b3cf75cd234ec080a7fee08e20906be6
-include/unicode/currunit.h: f8b67c06aa5547b9911378f39e70bc5d
-include/unicode/datefmt.h: 034fcd313ba7753923be9b30833ff13e
-include/unicode/dbbi.h: 3435ff244bdf7d248fa81c8162f6da9c
-include/unicode/dcfmtsym.h: e4935f31b8f97b149fa686a9996f6758
-include/unicode/decimfmt.h: e4fcfcfcb4bb45e7935cec1ec41ba359
-include/unicode/docmain.h: 81c20148681a5d7598d33fe1e49f3c5b
-include/unicode/dtfmtsym.h: 4a7ee444945513d0939376634f42d0ec
-include/unicode/dtintrv.h: 9d0929775a3d4599f90020ffb304d66c
-include/unicode/dtitvfmt.h: d42ce527e4a5eb3138782d92acd97b88
-include/unicode/dtitvinf.h: c7cedf40b871f6d3c77cc013d06983f7
-include/unicode/dtptngen.h: b7e58f01d5e588371e22e55a2d255208
-include/unicode/dtrule.h: 9b687ce82b426bfd8b67f2a743f9114c
-include/unicode/enumset.h: 9b15421cfac73c8845562dc2eba0f2e9
-include/unicode/errorcode.h: 28c37140645dfa2f430cf531131a2cbb
-include/unicode/fieldpos.h: ae206bb308885c2dae6bd15792512e6f
-include/unicode/fmtable.h: fe37b4f3f1862172fcf708a8913b5d90
-include/unicode/format.h: 637778c5df6458f3f90d6f87e7d6a694
-include/unicode/fpositer.h: 276908f795beea88cd9d3f6f43ff82b2
-include/unicode/gender.h: 05bdc8c839f568e55c1d5d57c034dd36
-include/unicode/gregocal.h: 165eb6c7ffe6d914240c4bc0a2d7e5e0
-include/unicode/icudataver.h: 6b463f7d991d4cf4b0278bda90d4419f
-include/unicode/icuplug.h: 2688326bbc6184edbfb04a9e398a363a
-include/unicode/idna.h: b7885800ec0092f7b0411810ef0a0150
-include/unicode/listformatter.h: 8e460de80d6cb5701b3fcc2a3e704c14
-include/unicode/localpointer.h: ef6f8ec1d09bcfd660632f2df08c8d30
-include/unicode/locdspnm.h: df688f9f85fa7927b037811db0a5a934
-include/unicode/locid.h: 7d2c34577acdb5d7372ab35b02068581
-include/unicode/measfmt.h: fdd0cbd2a7f3af228f25560a3f63c4ad
-include/unicode/measunit.h: 54bcc9c8bd45f4d61baad1ecfda8874d
-include/unicode/measure.h: 3a03dc0bc233874de9b869a64a057835
-include/unicode/messagepattern.h: e3ae4457660d55835e42d88c3338a661
-include/unicode/msgfmt.h: de76868b18a099b367a685c31c0a14d8
-include/unicode/normalizer2.h: 0b96e4e3fe2db9df3ea140dbbe8ea140
-include/unicode/normlzr.h: 850f123dce4120db36601bcd4a77e925
-include/unicode/numfmt.h: c45e7b584738ae545937b3431a7e97b7
-include/unicode/numsys.h: 3b40734e737a0328f7c63124f07727e4
-include/unicode/parseerr.h: aa97d4d0cb5ef66baf1652c46223a81f
-include/unicode/parsepos.h: 408632c4f4a0ec42811b50295be88ec9
-include/unicode/platform.h: fceecfa20a56af2a62a310d3d9fd1b14
-include/unicode/plurfmt.h: 06a5b724a0cdc04673d2467002605b50
-include/unicode/plurrule.h: 19d8e5c3f59ac4a833883da7fc52279c
-include/unicode/ptypes.h: 93226b56866b0001f58f0319e430da08
-include/unicode/putil.h: 12979acdf705cac063a0f7862a20907b
-include/unicode/rbbi.h: f0fe0af5306ea31bcb128a57dad17785
-include/unicode/rbnf.h: fa3ee91ae518f46628171c5eda544702
-include/unicode/rbtz.h: 76eb867d186e64e6bd425561d9371d7d
-include/unicode/regex.h: 3ef7c102b12d3167fa019d203f524ec4
-include/unicode/region.h: 149a3b19b81a6e9093cb40f63a688fe7
-include/unicode/reldatefmt.h: 0f38d6b83c8a59898e4b546bd00bb459
-include/unicode/rep.h: 5fa4336c1302e276e81d2716a9789511
-include/unicode/resbund.h: 8c9bf16c940d2fa6d27e92b4b9023b1c
-include/unicode/schriter.h: fcb1bcf67285e897acf621e937b13010
-include/unicode/scientificnumberformatter.h: 0f0c586dcb3cb2d59c10f9a42490e81f
-include/unicode/search.h: ddfee95357399f1840854929715a99f3
-include/unicode/selfmt.h: cf18d9ce0e01636d74c14aac25dea995
-include/unicode/simpleformatter.h: aa8128e6a7368689e974552143be3c55
-include/unicode/simpletz.h: 0c847bdd492d23c7d78993e03d8364b8
-include/unicode/smpdtfmt.h: 19192d367d28f9812c71588222331218
-include/unicode/sortkey.h: 323299d4a40734274de910e74e6b7714
-include/unicode/std_string.h: e019f8e200de712588502817a22e5049
-include/unicode/strenum.h: cece8736aaa78de5edb80b2d8bcf2339
-include/unicode/stringpiece.h: 707434771237dbc6467f49aebc26f7f7
-include/unicode/stringtriebuilder.h: 251396f1c130290458da7553cca598f6
-include/unicode/stsearch.h: 70a69561b21c1a8e14f7d1a4e0760392
-include/unicode/symtable.h: dd632a7e27832b5992d4a54205c599c4
-include/unicode/tblcoll.h: 95b69fba4fd024406b9e4d991f1ad7c7
-include/unicode/timezone.h: 3e88d71098f36369b9892baff81c603c
-include/unicode/tmunit.h: b946f43e7c8bec8aa50ddd6120671446
-include/unicode/tmutamt.h: e67a0e5e8b642aee17578411d554bcc2
-include/unicode/tmutfmt.h: 9d7e425317331c3ed890cefb0f654004
-include/unicode/translit.h: 9eb1419219ba781ff4653b4983a4e33c
-include/unicode/tzfmt.h: 31ad89c49cc59da450befd0a9c2cee84
-include/unicode/tznames.h: 72003f95cbf6b2bb6acc12d3b4b3f41a
-include/unicode/tzrule.h: 6416905b7247c15c939cc0e2d32a6510
-include/unicode/tztrans.h: 223b5af929e494c1894c6a24e8685f44
-include/unicode/ubidi.h: 66179ab0b99a5d356dba19e14eb5ecd3
-include/unicode/ubrk.h: 117eb54e39da5ce3dba2c9679707b0b7
-include/unicode/ucal.h: 70b7c32899132549a87577d2e96d8b75
-include/unicode/ucasemap.h: 1f64f081f3d1ee03e17d9cebb4b39c34
-include/unicode/ucat.h: 7420c409443c281d0396a824f7ce954c
-include/unicode/uchar.h: 6049da45cae06c38009809cd701e8fc8
-include/unicode/ucharstrie.h: cdd315664d45ceeb931f740427eba956
-include/unicode/ucharstriebuilder.h: 08b57db9db7ec6c83a727b4e7e93a84c
-include/unicode/uchriter.h: 26aecb73ed6c3b66d45920b6edc82e94
-include/unicode/uclean.h: 220a7ed9637f6d08844892406ee12fd7
-include/unicode/ucnv.h: 90e6635683216cf04e9e51c7793cce02
-include/unicode/ucnv_cb.h: 29d1534d54197074136641f9e73bca3a
-include/unicode/ucnv_err.h: 0b8f3b01f733daf5fa2bab7d0c77a83f
-include/unicode/ucnvsel.h: af61d762e6c51d92c6191a6234eba4c0
-include/unicode/ucol.h: 5794231873c0168366cac78abd7b9ba8
-include/unicode/ucoleitr.h: 2960fa61e49001636797afbc1cbd3e61
-include/unicode/uconfig.h: 2bc6d6073763aa34555775d5868dec4e
-include/unicode/ucsdet.h: 77f79ed197997607ad82834cddcecee3
-include/unicode/ucurr.h: 4e010cfe5251e583c06597df3dbbd7c8
-include/unicode/udat.h: 03876d47a6da7ae776311f580635c003
-include/unicode/udata.h: ca1f4a55a240ea9586f2cca1ea4764c8
-include/unicode/udateintervalformat.h: 6f55cc14a063de8c79b74a7316d93e6f
-include/unicode/udatpg.h: fd44f3f982452c68cdf6b1f3b159f068
-include/unicode/udisplaycontext.h: cdd37d6941337b96a75801e0716ca045
-include/unicode/uenum.h: 0f39322455d626debaf0bbe476a77c54
-include/unicode/ufieldpositer.h: 68ae4017d10f71b84083c24b2e09b536
-include/unicode/uformattable.h: 257f1dd17c788b7f5eab9ee3627f654c
-include/unicode/ugender.h: be7155c7b25e2a7b7ea4d22ffc939557
-include/unicode/uidna.h: 851038bc78b135bf99c65dd0648e78f7
-include/unicode/uiter.h: 8e6b6197795cb2d42f8c80922d28ccf2
-include/unicode/uldnames.h: 8545429414195c42ee9a05694540bd8d
-include/unicode/ulistformatter.h: 56cc2f8025387fcb18422300373a6e47
-include/unicode/uloc.h: b048d6c8e26ed8a65d0403d90ea4081c
-include/unicode/ulocdata.h: 0803ed6ac97fbf4a10c3ca436f903fb2
-include/unicode/umachine.h: 8946d5b383646c9de9fc8c84eb0456fd
-include/unicode/umisc.h: 3f34c9d536fdd5d4fddca2cf952bcfaa
-include/unicode/umsg.h: 8880b14654d63c6e78a50d8f569b2766
-include/unicode/unifilt.h: 3b0368ea2da9a503aa47803e395b513e
-include/unicode/unifunct.h: 3d37601bd3ae27b4e51431713d9f7533
-include/unicode/unimatch.h: e1a18096e0c7c7220c5c9149cd2d184c
-include/unicode/unirepl.h: 7f1973a960a652ff74fa63e21969bab9
-include/unicode/uniset.h: fa3cfc8b4883a69120bf35e65f5d75ec
-include/unicode/unistr.h: 975e37994ae2d3197a86284f1bdacdf3
-include/unicode/unorm.h: a04a23023daa99571ef2b7edca9dc6d2
-include/unicode/unorm2.h: 5ab66d75a9251a8df00f2075128ab010
-include/unicode/unum.h: 6e24b3d63e65f4d0a3076d33708a96d7
-include/unicode/unumsys.h: d239b6c2f97f51c221fcd66865adbaf9
-include/unicode/uobject.h: 07ebe875a9d304f71f525d2a71b20ddc
-include/unicode/upluralrules.h: d9a66886a7585743cc8abe54af8e5955
-include/unicode/uregex.h: 6eb3c76e7d6fa2fed34b77f7fcc5cc85
-include/unicode/uregion.h: 0819c20dc8e0b5aebc5ec527828f565e
-include/unicode/ureldatefmt.h: 057a6220b33c1c81e0cebc9a5da40929
-include/unicode/urename.h: 73c3a4cd707c1549f27341c859b099bb
-include/unicode/urep.h: dc3eaf59ed5c198facce9f4a97a79ecf
-include/unicode/ures.h: 6b374e2d473dfab51bcf7306c46f9eb6
-include/unicode/uscript.h: baaefbb5a6c5e251da2bb1800626d9e4
-include/unicode/usearch.h: 3e51b12fdf6a1adfc4696946ac0a4b6c
-include/unicode/uset.h: 62d5813111f8391b4f616da08802aa24
-include/unicode/usetiter.h: 6baeb6276d80be18739355f9549b38e7
-include/unicode/ushape.h: f87732f736df2bbb90d46a10779876e7
-include/unicode/uspoof.h: a6510014653e0576fcf39c9dfd74f955
-include/unicode/usprep.h: 4ea1ec6a6d4fcbf2c1a239f23873da98
-include/unicode/ustring.h: 49c56a6248a7c92ee93a11331d2a6364
-include/unicode/ustringtrie.h: 08470063002ce9a8df978481b0d5588d
-include/unicode/utext.h: c83e4d6390b463b28168cf90a734966e
-include/unicode/utf.h: 0d1807bea996ca42bad86a938ba69453
-include/unicode/utf16.h: b376232af20fa9f77c983c6cc91800cf
-include/unicode/utf32.h: ed15f0927cec48cab1922d08e1fdcce1
-include/unicode/utf8.h: 0d3fb609e35e2c67dce1a4889973bebd
-include/unicode/utf_old.h: fce92682d7539e0fde301c54ef9e8760
-include/unicode/utmscale.h: 267dcde091ed1b81f03b1fff49c05e69
-include/unicode/utrace.h: 25f64a4cd8fc8a13bdfadd59bb287d49
-include/unicode/utrans.h: cc28e262a704403f38c26becae727165
-include/unicode/utypes.h: 21e5e8cc7dc66bdb83f70971bed1a5e4
-include/unicode/uvernum.h: d878c9e384487c8668c122712134c0f1
-include/unicode/uversion.h: 140b36fa9bffd2cb2b1c7f02691923e6
-include/unicode/vtzone.h: 90e065183436be0a94918465f66be863
-lib/icudt.lib: 6ca31dc410effd400636e14cbc616324
-lib/icuin.lib: d3a00a713d384bd66094e2270d98ad2d
-lib/icutest.lib: 4ee3e48e551b0f14c992cafd5f5565ba
-lib/icutu.lib: d3b931010519ec185efa3b41837f6a72
-lib/icuuc.lib: 209fc74475de9d7244b0780771a4d8ed
diff --git a/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.manifests/libxml2/2.9.4/vitallium/stable/export/conanmanifest.txt b/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.manifests/libxml2/2.9.4/vitallium/stable/export/conanmanifest.txt
deleted file mode 100644
index c958bb87..00000000
--- a/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.manifests/libxml2/2.9.4/vitallium/stable/export/conanmanifest.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-1482493404
-conanfile.py: 4c879159bebcecec85173f085cd4c3c7
diff --git a/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt b/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt
index fe3c3e96..30979954 100644
--- a/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt
+++ b/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt
@@ -1,5 +1,5 @@
[requires]
-icu/57.1@vitallium/stable
+icu/59.1@vitallium/stable
libxml2/2.9.4@vitallium/stable
libxslt/1.1.29@vitallium/stable
diff --git a/coin/provisioning/qtci-linux-OpenSuSE-13.01-x86_64/openssl_allow_ssl2.sh b/coin/provisioning/qtci-windows-10-x86/msvc.ps1
index e958ea87..1de57a66 100755..100644
--- a/coin/provisioning/qtci-linux-OpenSuSE-13.01-x86_64/openssl_allow_ssl2.sh
+++ b/coin/provisioning/qtci-windows-10-x86/msvc.ps1
@@ -1,11 +1,9 @@
-#!/bin/bash
-
#############################################################################
##
-## Copyright (C) 2016 The Qt Company Ltd.
+## Copyright (C) 2017 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
-## This file is part of the test suite of the Qt Toolkit.
+## This file is part of the provisioning scripts of the Qt Toolkit.
##
## $QT_BEGIN_LICENSE:LGPL21$
## Commercial License Usage
@@ -33,6 +31,13 @@
##
#############################################################################
-# hack: it seems that opensuse patched their openssl in a way that
-# disables ssl 2 without allowing configure's compile detection to work
-echo "export OPENSSL_ALLOW_SSL2=1" >>~/.bashrc
+# Visual Studios are pre-provisioned to tier1 images
+
+# MSVC 2015 Update 3
+echo "Visual Studio 2015 = Version 14.0.25421.3 Update 3" >> ~\versions.txt
+
+# MSVC 2017
+echo "Visual Studio 2017 = Version 15.1 (26403.7)" >> ~\versions.txt
+
+# MSVC 2017 Build Tools
+echo "Visual Studio 2017 Build Tools = Version 15.1 (26403.7)" >> ~\versions.txt
diff --git a/coin/provisioning/qtci-windows-10-x86/msvc_2015_update3_patch.ps1 b/coin/provisioning/qtci-windows-10-x86/msvc_2015_update3_patch.ps1
index f16b5ef4..37af7119 100644
--- a/coin/provisioning/qtci-windows-10-x86/msvc_2015_update3_patch.ps1
+++ b/coin/provisioning/qtci-windows-10-x86/msvc_2015_update3_patch.ps1
@@ -30,21 +30,5 @@
## $QT_END_LICENSE$
##
#############################################################################
-. "$PSScriptRoot\..\common\helpers.ps1"
+. "$PSScriptRoot\..\common\msvc_2015_update3_patch.ps1"
-# Install Cumulative Servicing Release Visual Studio 2015 update 3
-# Original download page: https://msdn.microsoft.com/en-us/library/mt752379.aspx
-# http://ci-files01-hki.ci.local/input/windows/vs14-kb3165756.exe
-
-$version = "2015 update3 (KB3165756)"
-$package = "C:\Windows\Temp\vs14-kb3165756.exe"
-$url_cache = "http://ci-files01-hki.ci.local/input/windows/vs14-kb3165756.exe"
-$url_official = "http://go.microsoft.com/fwlink/?LinkID=816878"
-$sha1 = "6a21d9b291ca75d44baad95e278fdc0d05d84c02"
-
-echo "Fetching patch for Visual Studio $version..."
-Download $url_official $url_cache $package
-Verify-Checksum $package $sha1
-echo "Installing patch for Visual Studio $version..."
-cmd /c "$package /norestart /Quiet"
-remove-item $package
diff --git a/coin/provisioning/qtci-windows-10-x86_64/01-windows_removethemall.ps1 b/coin/provisioning/qtci-windows-10-x86_64/01-windows_removethemall.ps1
index 3bb0af0e..dfca166f 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/01-windows_removethemall.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/01-windows_removethemall.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\01-windows_removethemall.ps1"
+. "$PSScriptRoot\..\common\windows_removethemall.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/03-conan.ps1 b/coin/provisioning/qtci-windows-10-x86_64/03-conan.ps1
index 78de7043..65aee221 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/03-conan.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/03-conan.ps1
@@ -7,3 +7,27 @@ Run-Conan-Install `
-Compiler "Visual Studio" `
-CompilerVersion 14 `
-CompilerRuntime MD
+
+Run-Conan-Install `
+ -ConanfilesDir "$PSScriptRoot\conanfiles" `
+ -BuildinfoDir MSVC2015-x86 `
+ -Arch x86 `
+ -Compiler "Visual Studio" `
+ -CompilerVersion 14 `
+ -CompilerRuntime MD
+
+Run-Conan-Install `
+ -ConanfilesDir "$PSScriptRoot\conanfiles" `
+ -BuildinfoDir MSVC2017-x86_64 `
+ -Arch x86_64 `
+ -Compiler "Visual Studio" `
+ -CompilerVersion 15 `
+ -CompilerRuntime MD
+
+Run-Conan-Install `
+ -ConanfilesDir "$PSScriptRoot\conanfiles" `
+ -BuildinfoDir MSVC2017-x86 `
+ -Arch x86 `
+ -Compiler "Visual Studio" `
+ -CompilerVersion 15 `
+ -CompilerRuntime MD
diff --git a/coin/provisioning/qtci-windows-10-x86_64/05-mingw53.ps1 b/coin/provisioning/qtci-windows-10-x86_64/05-mingw53.ps1
new file mode 100644
index 00000000..d4439856
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86_64/05-mingw53.ps1
@@ -0,0 +1,48 @@
+#############################################################################
+##
+## Copyright (C) 2017 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the provisioning scripts of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL21$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://www.qt.io/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 or version 3 as published by the Free
+## Software Foundation and appearing in the file LICENSE.LGPLv21 and
+## LICENSE.LGPLv3 included in the packaging of this file. Please review the
+## following information to ensure the GNU Lesser General Public License
+## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## As a special exception, The Qt Company gives you certain additional
+## rights. These rights are described in The Qt Company LGPL Exception
+## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+. "$PSScriptRoot\..\common\helpers.ps1"
+
+# This script installs MinGW 5.3
+
+
+$zip = "c:\users\qt\downloads\i686-5.3.0-release-posix-dwarf-rt_v4-rev0.7z"
+
+Invoke-WebRequest -UseBasicParsing http://download.qt.io/development_releases/prebuilt/mingw_32/i686-5.3.0-release-posix-dwarf-rt_v4-rev0.7z -OutFile $zip
+Verify-Checksum $zip "d4f21d25f3454f8efdada50e5ad799a0a9e07c6a"
+Extract-7Zip $zip C:\
+Rename-Item -path C:\mingw32 -newName C:\MinGW530
+
+[Environment]::SetEnvironmentVariable("MINGW530", "C:\MinGW530", "Machine")
+echo "MinGW = 5.3.0" >> ~/versions.txt
+del $zip
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
new file mode 100644
index 00000000..cc00fe0d
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1
@@ -0,0 +1,46 @@
+#############################################################################
+##
+## Copyright (C) 2017 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the provisioning scripts of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL21$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://www.qt.io/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 or version 3 as published by the Free
+## Software Foundation and appearing in the file LICENSE.LGPLv21 and
+## LICENSE.LGPLv3 included in the packaging of this file. Please review the
+## following information to ensure the GNU Lesser General Public License
+## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## As a special exception, The Qt Company gives you certain additional
+## rights. These rights are described in The Qt Company LGPL Exception
+## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+. "$PSScriptRoot\..\common\helpers.ps1"
+
+# This script installs QNX SDP 7.0
+
+$zip = "c:\users\qt\downloads\qnx700.7z"
+
+Invoke-WebRequest -UseBasicParsing http://ci-files01-hki.ci.local/input/qnx/qnx700.7z -OutFile $zip
+Verify-Checksum $zip "2eab8bcf993056f79c9e2585c9c05e05658ba8bb"
+Extract-7Zip $zip C:\
+
+[Environment]::SetEnvironmentVariable("QNX_700", "C:\QNX700", "Machine")
+echo "QNX SDP = 7.0.0" >> ~/versions.txt
+del $zip
diff --git a/coin/provisioning/qtci-windows-10-x86_64/06-ninja.ps1 b/coin/provisioning/qtci-windows-10-x86_64/06-ninja.ps1
new file mode 100644
index 00000000..e46361a0
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86_64/06-ninja.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\ninja.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/08-libclang.ps1 b/coin/provisioning/qtci-windows-10-x86_64/08-libclang.ps1
new file mode 100644
index 00000000..7eeb0a37
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86_64/08-libclang.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\libclang.ps1" 64
diff --git a/coin/provisioning/qtci-windows-10-x86_64/3dstudio_3rdparty.ps1 b/coin/provisioning/qtci-windows-10-x86_64/3dstudio_3rdparty.ps1
new file mode 100644
index 00000000..3bc58072
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86_64/3dstudio_3rdparty.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\3dstudio_3rdparty.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/icu/57.1/vitallium/stable/export/conanmanifest.txt b/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/icu/57.1/vitallium/stable/export/conanmanifest.txt
deleted file mode 100644
index 392eb24f..00000000
--- a/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/icu/57.1/vitallium/stable/export/conanmanifest.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-1482492127
-conanfile.py: 7edc28cf26a4c3acd9b1c9f08ea8cba3
diff --git a/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/icu/57.1/vitallium/stable/package/c4195ae4643996fbb226d1e0265076354ac622bb/conanmanifest.txt b/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/icu/57.1/vitallium/stable/package/c4195ae4643996fbb226d1e0265076354ac622bb/conanmanifest.txt
deleted file mode 100644
index d2d84a21..00000000
--- a/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/icu/57.1/vitallium/stable/package/c4195ae4643996fbb226d1e0265076354ac622bb/conanmanifest.txt
+++ /dev/null
@@ -1,180 +0,0 @@
-1482492365
-bin/icudt57.dll: 9424922f2422576e81509aad8911629d
-bin/icuin57.dll: 731ea41a670e4913d4dbeb9cf2fb300d
-bin/icutest57.dll: 0103d75f36194e398d8b89c12a6fb6f3
-bin/icutu57.dll: a94d3824640e025353d025a3f50caf10
-bin/icuuc57.dll: 96ecbd9165898f291b3920609ade6096
-conaninfo.txt: 05bf80d930c44b525645a86d8fd1084d
-include/unicode/alphaindex.h: e74fcba85b76577d32b90bc0056ee5d9
-include/unicode/appendable.h: 5c2d97a96252e2c959d4c226a554575b
-include/unicode/basictz.h: 444077f7dd19bd6dbe24034360356e8a
-include/unicode/brkiter.h: 0a5796a84c272600a360dc5918899492
-include/unicode/bytestream.h: f828cc9f542c232d2aadb09b9099c559
-include/unicode/bytestrie.h: 765c037e45325e1970e839349df7c28c
-include/unicode/bytestriebuilder.h: 634c9203ef678ee0d8fd9baffa8e3e46
-include/unicode/calendar.h: e360220586bcd0c3ea93b610bf4fe202
-include/unicode/caniter.h: f6de1e31cdc53563f35b093f8f8a07d8
-include/unicode/chariter.h: d6030b3dffd5355f9377318f76dd69de
-include/unicode/choicfmt.h: e86083f42af655ca0806ce1ed3dc55a0
-include/unicode/coleitr.h: 9a393483da6d9daae0bf18dd997abcfa
-include/unicode/coll.h: 06d3855e97984cd27579ec69b1985cc1
-include/unicode/compactdecimalformat.h: d1cca4ce6027a3d42a29b55e9ce0b82c
-include/unicode/curramt.h: efd2919661fe8dbc23f6b0f5bd33e685
-include/unicode/currpinf.h: b3cf75cd234ec080a7fee08e20906be6
-include/unicode/currunit.h: f8b67c06aa5547b9911378f39e70bc5d
-include/unicode/datefmt.h: 034fcd313ba7753923be9b30833ff13e
-include/unicode/dbbi.h: 3435ff244bdf7d248fa81c8162f6da9c
-include/unicode/dcfmtsym.h: e4935f31b8f97b149fa686a9996f6758
-include/unicode/decimfmt.h: e4fcfcfcb4bb45e7935cec1ec41ba359
-include/unicode/docmain.h: 81c20148681a5d7598d33fe1e49f3c5b
-include/unicode/dtfmtsym.h: 4a7ee444945513d0939376634f42d0ec
-include/unicode/dtintrv.h: 9d0929775a3d4599f90020ffb304d66c
-include/unicode/dtitvfmt.h: d42ce527e4a5eb3138782d92acd97b88
-include/unicode/dtitvinf.h: c7cedf40b871f6d3c77cc013d06983f7
-include/unicode/dtptngen.h: b7e58f01d5e588371e22e55a2d255208
-include/unicode/dtrule.h: 9b687ce82b426bfd8b67f2a743f9114c
-include/unicode/enumset.h: 9b15421cfac73c8845562dc2eba0f2e9
-include/unicode/errorcode.h: 28c37140645dfa2f430cf531131a2cbb
-include/unicode/fieldpos.h: ae206bb308885c2dae6bd15792512e6f
-include/unicode/fmtable.h: fe37b4f3f1862172fcf708a8913b5d90
-include/unicode/format.h: 637778c5df6458f3f90d6f87e7d6a694
-include/unicode/fpositer.h: 276908f795beea88cd9d3f6f43ff82b2
-include/unicode/gender.h: 05bdc8c839f568e55c1d5d57c034dd36
-include/unicode/gregocal.h: 165eb6c7ffe6d914240c4bc0a2d7e5e0
-include/unicode/icudataver.h: 6b463f7d991d4cf4b0278bda90d4419f
-include/unicode/icuplug.h: 2688326bbc6184edbfb04a9e398a363a
-include/unicode/idna.h: b7885800ec0092f7b0411810ef0a0150
-include/unicode/listformatter.h: 8e460de80d6cb5701b3fcc2a3e704c14
-include/unicode/localpointer.h: ef6f8ec1d09bcfd660632f2df08c8d30
-include/unicode/locdspnm.h: df688f9f85fa7927b037811db0a5a934
-include/unicode/locid.h: 7d2c34577acdb5d7372ab35b02068581
-include/unicode/measfmt.h: fdd0cbd2a7f3af228f25560a3f63c4ad
-include/unicode/measunit.h: 54bcc9c8bd45f4d61baad1ecfda8874d
-include/unicode/measure.h: 3a03dc0bc233874de9b869a64a057835
-include/unicode/messagepattern.h: e3ae4457660d55835e42d88c3338a661
-include/unicode/msgfmt.h: de76868b18a099b367a685c31c0a14d8
-include/unicode/normalizer2.h: 0b96e4e3fe2db9df3ea140dbbe8ea140
-include/unicode/normlzr.h: 850f123dce4120db36601bcd4a77e925
-include/unicode/numfmt.h: c45e7b584738ae545937b3431a7e97b7
-include/unicode/numsys.h: 3b40734e737a0328f7c63124f07727e4
-include/unicode/parseerr.h: aa97d4d0cb5ef66baf1652c46223a81f
-include/unicode/parsepos.h: 408632c4f4a0ec42811b50295be88ec9
-include/unicode/platform.h: fceecfa20a56af2a62a310d3d9fd1b14
-include/unicode/plurfmt.h: 06a5b724a0cdc04673d2467002605b50
-include/unicode/plurrule.h: 19d8e5c3f59ac4a833883da7fc52279c
-include/unicode/ptypes.h: 93226b56866b0001f58f0319e430da08
-include/unicode/putil.h: 12979acdf705cac063a0f7862a20907b
-include/unicode/rbbi.h: f0fe0af5306ea31bcb128a57dad17785
-include/unicode/rbnf.h: fa3ee91ae518f46628171c5eda544702
-include/unicode/rbtz.h: 76eb867d186e64e6bd425561d9371d7d
-include/unicode/regex.h: 3ef7c102b12d3167fa019d203f524ec4
-include/unicode/region.h: 149a3b19b81a6e9093cb40f63a688fe7
-include/unicode/reldatefmt.h: 0f38d6b83c8a59898e4b546bd00bb459
-include/unicode/rep.h: 5fa4336c1302e276e81d2716a9789511
-include/unicode/resbund.h: 8c9bf16c940d2fa6d27e92b4b9023b1c
-include/unicode/schriter.h: fcb1bcf67285e897acf621e937b13010
-include/unicode/scientificnumberformatter.h: 0f0c586dcb3cb2d59c10f9a42490e81f
-include/unicode/search.h: ddfee95357399f1840854929715a99f3
-include/unicode/selfmt.h: cf18d9ce0e01636d74c14aac25dea995
-include/unicode/simpleformatter.h: aa8128e6a7368689e974552143be3c55
-include/unicode/simpletz.h: 0c847bdd492d23c7d78993e03d8364b8
-include/unicode/smpdtfmt.h: 19192d367d28f9812c71588222331218
-include/unicode/sortkey.h: 323299d4a40734274de910e74e6b7714
-include/unicode/std_string.h: e019f8e200de712588502817a22e5049
-include/unicode/strenum.h: cece8736aaa78de5edb80b2d8bcf2339
-include/unicode/stringpiece.h: 707434771237dbc6467f49aebc26f7f7
-include/unicode/stringtriebuilder.h: 251396f1c130290458da7553cca598f6
-include/unicode/stsearch.h: 70a69561b21c1a8e14f7d1a4e0760392
-include/unicode/symtable.h: dd632a7e27832b5992d4a54205c599c4
-include/unicode/tblcoll.h: 95b69fba4fd024406b9e4d991f1ad7c7
-include/unicode/timezone.h: 3e88d71098f36369b9892baff81c603c
-include/unicode/tmunit.h: b946f43e7c8bec8aa50ddd6120671446
-include/unicode/tmutamt.h: e67a0e5e8b642aee17578411d554bcc2
-include/unicode/tmutfmt.h: 9d7e425317331c3ed890cefb0f654004
-include/unicode/translit.h: 9eb1419219ba781ff4653b4983a4e33c
-include/unicode/tzfmt.h: 31ad89c49cc59da450befd0a9c2cee84
-include/unicode/tznames.h: 72003f95cbf6b2bb6acc12d3b4b3f41a
-include/unicode/tzrule.h: 6416905b7247c15c939cc0e2d32a6510
-include/unicode/tztrans.h: 223b5af929e494c1894c6a24e8685f44
-include/unicode/ubidi.h: 66179ab0b99a5d356dba19e14eb5ecd3
-include/unicode/ubrk.h: 117eb54e39da5ce3dba2c9679707b0b7
-include/unicode/ucal.h: 70b7c32899132549a87577d2e96d8b75
-include/unicode/ucasemap.h: 1f64f081f3d1ee03e17d9cebb4b39c34
-include/unicode/ucat.h: 7420c409443c281d0396a824f7ce954c
-include/unicode/uchar.h: 6049da45cae06c38009809cd701e8fc8
-include/unicode/ucharstrie.h: cdd315664d45ceeb931f740427eba956
-include/unicode/ucharstriebuilder.h: 08b57db9db7ec6c83a727b4e7e93a84c
-include/unicode/uchriter.h: 26aecb73ed6c3b66d45920b6edc82e94
-include/unicode/uclean.h: 220a7ed9637f6d08844892406ee12fd7
-include/unicode/ucnv.h: 90e6635683216cf04e9e51c7793cce02
-include/unicode/ucnv_cb.h: 29d1534d54197074136641f9e73bca3a
-include/unicode/ucnv_err.h: 0b8f3b01f733daf5fa2bab7d0c77a83f
-include/unicode/ucnvsel.h: af61d762e6c51d92c6191a6234eba4c0
-include/unicode/ucol.h: 5794231873c0168366cac78abd7b9ba8
-include/unicode/ucoleitr.h: 2960fa61e49001636797afbc1cbd3e61
-include/unicode/uconfig.h: 2bc6d6073763aa34555775d5868dec4e
-include/unicode/ucsdet.h: 77f79ed197997607ad82834cddcecee3
-include/unicode/ucurr.h: 4e010cfe5251e583c06597df3dbbd7c8
-include/unicode/udat.h: 03876d47a6da7ae776311f580635c003
-include/unicode/udata.h: ca1f4a55a240ea9586f2cca1ea4764c8
-include/unicode/udateintervalformat.h: 6f55cc14a063de8c79b74a7316d93e6f
-include/unicode/udatpg.h: fd44f3f982452c68cdf6b1f3b159f068
-include/unicode/udisplaycontext.h: cdd37d6941337b96a75801e0716ca045
-include/unicode/uenum.h: 0f39322455d626debaf0bbe476a77c54
-include/unicode/ufieldpositer.h: 68ae4017d10f71b84083c24b2e09b536
-include/unicode/uformattable.h: 257f1dd17c788b7f5eab9ee3627f654c
-include/unicode/ugender.h: be7155c7b25e2a7b7ea4d22ffc939557
-include/unicode/uidna.h: 851038bc78b135bf99c65dd0648e78f7
-include/unicode/uiter.h: 8e6b6197795cb2d42f8c80922d28ccf2
-include/unicode/uldnames.h: 8545429414195c42ee9a05694540bd8d
-include/unicode/ulistformatter.h: 56cc2f8025387fcb18422300373a6e47
-include/unicode/uloc.h: b048d6c8e26ed8a65d0403d90ea4081c
-include/unicode/ulocdata.h: 0803ed6ac97fbf4a10c3ca436f903fb2
-include/unicode/umachine.h: 8946d5b383646c9de9fc8c84eb0456fd
-include/unicode/umisc.h: 3f34c9d536fdd5d4fddca2cf952bcfaa
-include/unicode/umsg.h: 8880b14654d63c6e78a50d8f569b2766
-include/unicode/unifilt.h: 3b0368ea2da9a503aa47803e395b513e
-include/unicode/unifunct.h: 3d37601bd3ae27b4e51431713d9f7533
-include/unicode/unimatch.h: e1a18096e0c7c7220c5c9149cd2d184c
-include/unicode/unirepl.h: 7f1973a960a652ff74fa63e21969bab9
-include/unicode/uniset.h: fa3cfc8b4883a69120bf35e65f5d75ec
-include/unicode/unistr.h: 975e37994ae2d3197a86284f1bdacdf3
-include/unicode/unorm.h: a04a23023daa99571ef2b7edca9dc6d2
-include/unicode/unorm2.h: 5ab66d75a9251a8df00f2075128ab010
-include/unicode/unum.h: 6e24b3d63e65f4d0a3076d33708a96d7
-include/unicode/unumsys.h: d239b6c2f97f51c221fcd66865adbaf9
-include/unicode/uobject.h: 07ebe875a9d304f71f525d2a71b20ddc
-include/unicode/upluralrules.h: d9a66886a7585743cc8abe54af8e5955
-include/unicode/uregex.h: 6eb3c76e7d6fa2fed34b77f7fcc5cc85
-include/unicode/uregion.h: 0819c20dc8e0b5aebc5ec527828f565e
-include/unicode/ureldatefmt.h: 057a6220b33c1c81e0cebc9a5da40929
-include/unicode/urename.h: 73c3a4cd707c1549f27341c859b099bb
-include/unicode/urep.h: dc3eaf59ed5c198facce9f4a97a79ecf
-include/unicode/ures.h: 6b374e2d473dfab51bcf7306c46f9eb6
-include/unicode/uscript.h: baaefbb5a6c5e251da2bb1800626d9e4
-include/unicode/usearch.h: 3e51b12fdf6a1adfc4696946ac0a4b6c
-include/unicode/uset.h: 62d5813111f8391b4f616da08802aa24
-include/unicode/usetiter.h: 6baeb6276d80be18739355f9549b38e7
-include/unicode/ushape.h: f87732f736df2bbb90d46a10779876e7
-include/unicode/uspoof.h: a6510014653e0576fcf39c9dfd74f955
-include/unicode/usprep.h: 4ea1ec6a6d4fcbf2c1a239f23873da98
-include/unicode/ustring.h: 49c56a6248a7c92ee93a11331d2a6364
-include/unicode/ustringtrie.h: 08470063002ce9a8df978481b0d5588d
-include/unicode/utext.h: c83e4d6390b463b28168cf90a734966e
-include/unicode/utf.h: 0d1807bea996ca42bad86a938ba69453
-include/unicode/utf16.h: b376232af20fa9f77c983c6cc91800cf
-include/unicode/utf32.h: ed15f0927cec48cab1922d08e1fdcce1
-include/unicode/utf8.h: 0d3fb609e35e2c67dce1a4889973bebd
-include/unicode/utf_old.h: fce92682d7539e0fde301c54ef9e8760
-include/unicode/utmscale.h: 267dcde091ed1b81f03b1fff49c05e69
-include/unicode/utrace.h: 25f64a4cd8fc8a13bdfadd59bb287d49
-include/unicode/utrans.h: cc28e262a704403f38c26becae727165
-include/unicode/utypes.h: 21e5e8cc7dc66bdb83f70971bed1a5e4
-include/unicode/uvernum.h: d878c9e384487c8668c122712134c0f1
-include/unicode/uversion.h: 140b36fa9bffd2cb2b1c7f02691923e6
-include/unicode/vtzone.h: 90e065183436be0a94918465f66be863
-lib/icudt.lib: cf92bb1d1fc1ffea58e7058134fd0f71
-lib/icuin.lib: eca7f889859a2078dba5ae0c228bb45f
-lib/icutest.lib: daf163f500ea14d3eafcb2e7885b5f2f
-lib/icutu.lib: 6236376ec549a1daba31f7b34cdbb957
-lib/icuuc.lib: f3cfefda92e691c3f81cae2ac3fdff14
diff --git a/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/libxml2/2.9.4/vitallium/stable/export/conanmanifest.txt b/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/libxml2/2.9.4/vitallium/stable/export/conanmanifest.txt
deleted file mode 100644
index c958bb87..00000000
--- a/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/libxml2/2.9.4/vitallium/stable/export/conanmanifest.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-1482493404
-conanfile.py: 4c879159bebcecec85173f085cd4c3c7
diff --git a/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/libxslt/1.1.29/vitallium/stable/export/conanmanifest.txt b/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/libxslt/1.1.29/vitallium/stable/export/conanmanifest.txt
deleted file mode 100644
index be77d721..00000000
--- a/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/libxslt/1.1.29/vitallium/stable/export/conanmanifest.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-1478438034
-conanfile.py: 2472a82109b2d59062d3e50a54d08a4a
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 fe3c3e96..30979954 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.txt
+++ b/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.txt
@@ -1,5 +1,5 @@
[requires]
-icu/57.1@vitallium/stable
+icu/59.1@vitallium/stable
libxml2/2.9.4@vitallium/stable
libxslt/1.1.29@vitallium/stable
diff --git a/coin/provisioning/qtci-windows-10-x86_64/msvc.ps1 b/coin/provisioning/qtci-windows-10-x86_64/msvc.ps1
new file mode 100644
index 00000000..1de57a66
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86_64/msvc.ps1
@@ -0,0 +1,43 @@
+#############################################################################
+##
+## 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$
+##
+#############################################################################
+
+# Visual Studios are pre-provisioned to tier1 images
+
+# MSVC 2015 Update 3
+echo "Visual Studio 2015 = Version 14.0.25421.3 Update 3" >> ~\versions.txt
+
+# MSVC 2017
+echo "Visual Studio 2017 = Version 15.1 (26403.7)" >> ~\versions.txt
+
+# MSVC 2017 Build Tools
+echo "Visual Studio 2017 Build Tools = Version 15.1 (26403.7)" >> ~\versions.txt
diff --git a/coin/provisioning/qtci-windows-10-x86_64/msvc_2015_update3_patch.ps1 b/coin/provisioning/qtci-windows-10-x86_64/msvc_2015_update3_patch.ps1
index f16b5ef4..37af7119 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/msvc_2015_update3_patch.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/msvc_2015_update3_patch.ps1
@@ -30,21 +30,5 @@
## $QT_END_LICENSE$
##
#############################################################################
-. "$PSScriptRoot\..\common\helpers.ps1"
+. "$PSScriptRoot\..\common\msvc_2015_update3_patch.ps1"
-# Install Cumulative Servicing Release Visual Studio 2015 update 3
-# Original download page: https://msdn.microsoft.com/en-us/library/mt752379.aspx
-# http://ci-files01-hki.ci.local/input/windows/vs14-kb3165756.exe
-
-$version = "2015 update3 (KB3165756)"
-$package = "C:\Windows\Temp\vs14-kb3165756.exe"
-$url_cache = "http://ci-files01-hki.ci.local/input/windows/vs14-kb3165756.exe"
-$url_official = "http://go.microsoft.com/fwlink/?LinkID=816878"
-$sha1 = "6a21d9b291ca75d44baad95e278fdc0d05d84c02"
-
-echo "Fetching patch for Visual Studio $version..."
-Download $url_official $url_cache $package
-Verify-Checksum $package $sha1
-echo "Installing patch for Visual Studio $version..."
-cmd /c "$package /norestart /Quiet"
-remove-item $package
diff --git a/coin/provisioning/qtci-windows-10-x86_64/mysql.ps1 b/coin/provisioning/qtci-windows-10-x86_64/mysql.ps1
index 5e75f662..56b78f47 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/mysql.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/mysql.ps1
@@ -37,76 +37,52 @@
# Both x86 and x64 versions needed when x86 integrations are done on x64 machine
$version = "5.6.11"
-$packagex64 = "C:\Windows\temp\mysql-$version-win64.zip"
+$packagex64 = "C:\Windows\temp\mysql-$version-winx64.zip"
$packagex86 = "C:\Windows\temp\mysql-$version-win32.zip"
-function CheckAndRemovePreviousInstallation
-{
- Param (
- [string]$InstallFolder
- )
- echo "Check for previous installation..."
- $FolderExists = Test-Path $ExistingInstallation
- If ($FolderExists -eq $True) {
- echo "Removing previous installation ($ExistingInstallation)"
- Remove-Item $ExistingInstallation -recurse
- }
-}
-
function DownloadAndInstall
{
Param (
- [string]$arch,
- [string]$externalUrl,
[string]$internalUrl,
[string]$package,
- [string]$sha1,
[string]$installPath
)
- echo "Fetching from URL ..."
- Download $externalUrl $internalUrl $package
- Verify-Checksum $package $sha1
- Extract-Zip $package $installPath
+ echo "Fetching from URL ..."
+ Copy-Item $internalUrl $package
+
+ $zipDir = [io.path]::GetFileNameWithoutExtension($package)
+ Extract-Dev-Folders-From-Zip $package $zipDir $installPath
+
+ Remove-Item $package
}
+# Remove any leftovers
+try {
+ Rename-Item -ErrorAction 'Stop' c:\utils\my_sql c:\utils\mysql_deleted
+} catch {}
+
# Install x64 bit version
$architecture = "x64"
-$installFolder = "C:\Utils\my_sql"
-$existingInstallation = "$installFolder\my_sql"
-$internalUrl = "http://ci-files01-hki.ci.local/input/windows/mysql-$version-winx64"
-$sha1 = "f4811512b5f3c8ad877ee4feba2062312a0acc38"
+$installFolder = "C:\Utils\my_sql\my_sql"
+$internalUrl = "\\ci-files01-hki.ci.local\provisioning\windows\mysql-$version-winx64.zip"
-echo "Check and remove previous installation ..."
-CheckAndRemovePreviousInstallation $existingInstallation
-DownloadAndInstall $architecture $internalUrl $internalUrl $packagex64 $sha1 $installFolder
-Rename-Item -path $installFolder\mysql-$version-winx64 -newName $installFolder\my_sql
-
-echo "Remove downloaded package ..."
-Remove-Item $packagex64
+DownloadAndInstall $internalUrl $packagex64 $installFolder
echo "Set environment variables ..."
-[Environment]::SetEnvironmentVariable("MYSQL_INCLUDE_x64", "$installFolder\my_sql\include", "Machine")
-[Environment]::SetEnvironmentVariable("MYSQL_LIB_x64", "$installFolder\my_sql\lib", "Machine")
+[Environment]::SetEnvironmentVariable("MYSQL_INCLUDE_x64", "$installFolder\include", "Machine")
+[Environment]::SetEnvironmentVariable("MYSQL_LIB_x64", "$installFolder\lib", "Machine")
# Install x86 bit version
$architecture = "x86"
-$installFolder = "C:\Utils\my_sql$architecture"
-$existingInstallation = "$installFolder\my_sql"
-$internalUrl = "http://ci-files01-hki.ci.local/input/windows/mysql-$version-win32"
-$sha1 = "e0aa62d5c5d6c6ec28906a831752d04336562679"
-
-echo "Check and remove previous installation ..."
-CheckAndRemovePreviousInstallation $existingInstallation
-DownloadAndInstall $architecture $internalUrl $internalUrl $packagex86 $sha1 $installFolder
-Rename-Item -path $installFolder\mysql-$version-win32 -newName $installFolder\my_sql
+$installFolder = "C:\Utils\my_sql\my_sql$architecture"
+$internalUrl = "\\ci-files01-hki.ci.local\provisioning\windows\mysql-$version-win32.zip"
-echo "Remove downloaded package ..."
-Remove-Item $packagex86
+DownloadAndInstall $internalUrl $packagex86 $installFolder
echo "Set environment variables ..."
-[Environment]::SetEnvironmentVariable("MYSQL_INCLUDE_x86", "$installFolder\my_sql\include", "Machine")
-[Environment]::SetEnvironmentVariable("MYSQL_LIB_x86", "$installFolder\my_sql\lib", "Machine")
+[Environment]::SetEnvironmentVariable("MYSQL_INCLUDE_x86", "$installFolder\include", "Machine")
+[Environment]::SetEnvironmentVariable("MYSQL_LIB_x86", "$installFolder\lib", "Machine")
# Store version information to ~/versions.txt, which is used to print version information to provision log.
echo "MySQL = $version" >> ~/versions.txt
diff --git a/coin/provisioning/qtci-windows-10-x86_64/opengl32_x86.ps1 b/coin/provisioning/qtci-windows-10-x86_64/opengl32_x86.ps1
index 079f26c3..fa2c753a 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/opengl32_x86.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/opengl32_x86.ps1
@@ -40,7 +40,7 @@ $openglPackage = "C:\Windows\SysWOW64\opengl32.dll"
$mesaOpenglUrl = "http://download.qt.io/development_releases/prebuilt/llvmpipe/windows/opengl32sw-32-mesa_$version.7z"
$mesaOpenglSha1 = "e742e9d4e16b9c69b6d844940861d3ef1748356b"
-$openglUrl = "http://ci-files01-hki.ci.local/input/mesa3d/windows/32bit/opengl32.dll"
+$openglUrl = "\\ci-files01-hki.ci.local\provisioning\mesa3d\windows\32bit\opengl32.dll"
$openglSha1 = "690730f973aa39bd80648e026248394fde07a753"
Invoke-WebRequest -UseBasicParsing $mesaOpenglUrl -OutFile $package
diff --git a/coin/provisioning/qtci-windows-10-x86_64/openssl.ps1 b/coin/provisioning/qtci-windows-10-x86_64/openssl.ps1
index 35340ca7..cd0115d2 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/openssl.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/openssl.ps1
@@ -44,7 +44,7 @@ $packagex86 = "C:\Windows\Temp\Win32OpenSSL-$version.exe"
$architecture = "x64"
$installFolder = "C:\openssl"
$externalUrl = "https://slproweb.com/download/Win64OpenSSL-$version.exe"
-$internalUrl = "http://ci-files01-hki.ci.local/input/openssl/Win64OpenSSL-$version.exe"
+$internalUrl = "\\ci-files01-hki.ci.local\provisioning\openssl\Win64OpenSSL-$version.exe"
$sha1 = "b1660dbdcc77e1b3d81d780c7167be1c75384d44"
echo "Fetching from URL ..."
@@ -65,7 +65,7 @@ echo "Set $architecture environment variables ..."
$architecture = "x86"
$installFolder = "C:\openssl$architecture"
$externalUrl = "https://slproweb.com/download/Win32OpenSSL-$version.exe"
-$internalUrl = "http://ci-files01-hki.ci.local/input/openssl/Win32OpenSSL-$version.exe"
+$internalUrl = "\\ci-files01-hki.ci.local\provisioning\openssl\Win32OpenSSL-$version.exe"
$sha1 = "29b31d20545214ab4e4c57afb20be2338c317cc3"
echo "Fetching from URL ..."
diff --git a/coin/provisioning/qtci-windows-10-x86_64/postgresql.ps1 b/coin/provisioning/qtci-windows-10-x86_64/postgresql.ps1
index 9b1d5d4e..b73c3778 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/postgresql.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/postgresql.ps1
@@ -42,43 +42,48 @@ $packagex86 = "C:\Windows\temp\postgresql-$version-windows-binaries.zip"
# Install x64 bit versions
$architecture = "x64"
-$installFolder = "C:\Utils\postgresql"
+$installFolder = "C:\Utils\postgresql\pgsql"
$externalUrl = "http://get.enterprisedb.com/postgresql/postgresql-$version-windows-x64-binaries.zip"
-$internalUrl = "http://ci-files01-hki.ci.local/input/windows/postgresql-$version-windows-x64-binaries.zip"
+$internalUrl = "\\ci-files01-hki.ci.local\provisioning\windows\postgresql-$version-windows-x64-binaries.zip"
$sha1 = "4da0453cdfda335e064d4437cf5bb9d356054cfd"
+# Delete any leftovers
+try {
+ Rename-Item -ErrorAction 'Stop' c:\utils\postgresql c:\utils\postgresql-deleted
+} catch {}
+
echo "Fetching from URL ..."
Download $externalUrl $internalUrl $packagex64
Verify-Checksum $packagex64 $sha1
echo "Installing $packagex64 ..."
-Extract-Zip $packagex64 $installFolder
+Extract-Dev-Folders-From-Zip $packagex64 "pgsql" $installFolder
echo "Remove downloaded $packagex64 ..."
Remove-Item $packagex64
echo "Set $architecture environment variables ..."
-[Environment]::SetEnvironmentVariable("POSTGRESQL_INCLUDE_x64", "$installFolder\pgsql\include", "Machine")
-[Environment]::SetEnvironmentVariable("POSTGRESQL_LIB_x64", "$installFolder\pgsql\lib", "Machine")
+[Environment]::SetEnvironmentVariable("POSTGRESQL_INCLUDE_x64", "$installFolder\include", "Machine")
+[Environment]::SetEnvironmentVariable("POSTGRESQL_LIB_x64", "$installFolder\lib", "Machine")
# Install x86 bit version
$architecture = "x86"
-$installFolder = "C:\Utils\postgresql$architecture"
+$installFolder = "C:\Utils\postgresql$architecture\pgsql"
$externalUrl = "http://get.enterprisedb.com/postgresql/postgresql-$version-windows-binaries.zip"
-$internalUrl = "http://ci-files01-hki.ci.local/input/windows/postgresql-$version-windows-binaries.zip"
+$internalUrl = "\\ci-files01-hki.ci.local\provisioning\windows\postgresql-$version-windows-binaries.zip"
$sha1 = "eb4f01845e1592800edbb74f60944b6c0aca51a9"
echo "Fetching from URL..."
Download $externalUrl $internalUrl $packagex86
Verify-Checksum $packagex86 $sha1
echo "Installing $packagex86 ..."
-Extract-Zip $packagex86 $installFolder
+Extract-Dev-Folders-From-Zip $packagex86 "pgsql" $installFolder
echo "Remove downloaded $packagex86 ..."
Remove-Item $packagex86
echo "Set $architecture environment variables ..."
-[Environment]::SetEnvironmentVariable("POSTGRESQL_INCLUDE_x86", "$installFolder\pgsql\include", "Machine")
-[Environment]::SetEnvironmentVariable("POSTGRESQL_LIB_x86", "$installFolder\pgsql\lib", "Machine")
+[Environment]::SetEnvironmentVariable("POSTGRESQL_INCLUDE_x86", "$installFolder\include", "Machine")
+[Environment]::SetEnvironmentVariable("POSTGRESQL_LIB_x86", "$installFolder\lib", "Machine")
# Store version information to ~/versions.txt, which is used to print version information to provision log.
echo "PostgreSQL = $version" >> ~/versions.txt
diff --git a/coin/provisioning/qtci-windows-7-x86/01-windows_removethemall.ps1 b/coin/provisioning/qtci-windows-7-x86/01-windows_removethemall.ps1
index 3bb0af0e..dfca166f 100644
--- a/coin/provisioning/qtci-windows-7-x86/01-windows_removethemall.ps1
+++ b/coin/provisioning/qtci-windows-7-x86/01-windows_removethemall.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\01-windows_removethemall.ps1"
+. "$PSScriptRoot\..\common\windows_removethemall.ps1"
diff --git a/coin/provisioning/qtci-windows-7-x86/04-msys.ps1 b/coin/provisioning/qtci-windows-7-x86/04-msys.ps1
index b75fd2a6..fdb70ef8 100644
--- a/coin/provisioning/qtci-windows-7-x86/04-msys.ps1
+++ b/coin/provisioning/qtci-windows-7-x86/04-msys.ps1
@@ -3,7 +3,7 @@
# This script will install msys which is needed for configuring openssl for Android
$version = "1.0.11"
-$url = "http://ci-files01-hki.ci.local/input/windows/msys-$version.7z"
+$url = "\\ci-files01-hki.ci.local\provisioning\windows\msys-$version.7z"
$zip = "c:\users\qt\downloads\msys-$version.7z"
$sha1 = "22cd76f1263db8c72727a9537228c481ff33c285"
diff --git a/coin/provisioning/qtci-windows-7-x86/06-android.ps1 b/coin/provisioning/qtci-windows-7-x86/06-android.ps1
index ca641d25..23d98847 100644
--- a/coin/provisioning/qtci-windows-7-x86/06-android.ps1
+++ b/coin/provisioning/qtci-windows-7-x86/06-android.ps1
@@ -8,7 +8,7 @@
# NDK
$ndkVersion = "r10e"
-$ndkCachedUrl = "http://ci-files01-hki.ci.local/input/android/android-ndk-$ndkVersion-windows-x86.zip"
+$ndkCachedUrl = "\\ci-files01-hki.ci.local\provisioning\android\android-ndk-$ndkVersion-windows-x86.zip"
$ndkOfficialUrl = "https://dl.google.com/android/repository/android-ndk-$ndkVersion-windows-x86.zip"
$ndkChecksum = "1d0b8f2835be741f3048fb03c0a3e9f71ab7f357"
$ndkFolder = "c:\utils\android-ndk-$ndkVersion"
@@ -19,7 +19,7 @@ $sdkVersion = "r24.4.1"
$sdkApi = "ANDROID_API_VERSION"
$sdkApiLevel = "android-21"
$sdkBuildToolsVersion = "23.0.3"
-$sdkCachedUrl= "http://ci-files01-hki.ci.local/input/android/android-sdk_$sdkVersion-windows.zip"
+$sdkCachedUrl= "\\ci-files01-hki.ci.local\provisioning\android\android-sdk_$sdkVersion-windows.zip"
$sdkOfficialUrl = "https://dl.google.com/android/android-sdk_$sdkVersion-windows.zip"
$sdkChecksum = "66b6a6433053c152b22bf8cab19c0f3fef4eba49"
$sdkFolder = "c:\utils\android-sdk-windows"
diff --git a/coin/provisioning/qtci-windows-7-x86/07-android_openssl.ps1 b/coin/provisioning/qtci-windows-7-x86/07-android_openssl.ps1
index a1b656c6..14a5a085 100644
--- a/coin/provisioning/qtci-windows-7-x86/07-android_openssl.ps1
+++ b/coin/provisioning/qtci-windows-7-x86/07-android_openssl.ps1
@@ -9,7 +9,7 @@ $zip = "c:\users\qt\downloads\openssl-$version.tar.gz"
$sha1 = "bdfbdb416942f666865fa48fe13c2d0e588df54f"
$destination = "C:\Utils\openssl-android-master"
-Download https://www.openssl.org/source/openssl-$version.tar.gz http://ci-files01-hki.ci.local/input/openssl/openssl-$version.tar.gz $zip
+Download https://www.openssl.org/source/openssl-$version.tar.gz \\ci-files01-hki.ci.local\provisioning\openssl\openssl-$version.tar.gz $zip
Verify-Checksum $zip $sha1
C:\Utils\sevenzip\7z.exe x $zip -oC:\Utils
diff --git a/coin/provisioning/qtci-windows-7-x86/08-ninja.ps1 b/coin/provisioning/qtci-windows-7-x86/08-ninja.ps1
new file mode 100644
index 00000000..e46361a0
--- /dev/null
+++ b/coin/provisioning/qtci-windows-7-x86/08-ninja.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\ninja.ps1"
diff --git a/coin/provisioning/qtci-windows-8-x86/01-windows_removethemall.ps1 b/coin/provisioning/qtci-windows-8-x86/01-windows_removethemall.ps1
index 3bb0af0e..dfca166f 100644
--- a/coin/provisioning/qtci-windows-8-x86/01-windows_removethemall.ps1
+++ b/coin/provisioning/qtci-windows-8-x86/01-windows_removethemall.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\01-windows_removethemall.ps1"
+. "$PSScriptRoot\..\common\windows_removethemall.ps1"
diff --git a/coin/provisioning/qtci-windows-8-x86/08-libclang.ps1 b/coin/provisioning/qtci-windows-8-x86/08-libclang.ps1
new file mode 100644
index 00000000..cc8be923
--- /dev/null
+++ b/coin/provisioning/qtci-windows-8-x86/08-libclang.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\libclang.ps1" 32
diff --git a/coin/provisioning/qtci-windows-8-x86_64/01-windows_removethemall.ps1 b/coin/provisioning/qtci-windows-8-x86_64/01-windows_removethemall.ps1
index 3bb0af0e..dfca166f 100644
--- a/coin/provisioning/qtci-windows-8-x86_64/01-windows_removethemall.ps1
+++ b/coin/provisioning/qtci-windows-8-x86_64/01-windows_removethemall.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\01-windows_removethemall.ps1"
+. "$PSScriptRoot\..\common\windows_removethemall.ps1"
diff --git a/coin/provisioning/qtci-windows-8-x86_64/08-libclang.ps1 b/coin/provisioning/qtci-windows-8-x86_64/08-libclang.ps1
new file mode 100644
index 00000000..7eeb0a37
--- /dev/null
+++ b/coin/provisioning/qtci-windows-8-x86_64/08-libclang.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\libclang.ps1" 64
diff --git a/init-repository b/init-repository
index 861511b9..11a75ffd 100755
--- a/init-repository
+++ b/init-repository
@@ -469,7 +469,7 @@ sub git_stat_one_submodule
my $orig_cwd = getcwd();
chdir($submodule) or confess "chdir $submodule: $OS_ERROR";
- my @sts = qx(git status --porcelain --untracked=no);
+ my @sts = qx(git status --porcelain --untracked=no --ignore-submodules=all);
# After a git clone --no-checkout, git status reports all files as
# staged for deletion, but we still want to update the submodule.
diff --git a/qt.pro b/qt.pro
index 373b60c9..af16c6df 100644
--- a/qt.pro
+++ b/qt.pro
@@ -28,6 +28,8 @@ QT_SKIP_MODULES =
# This is a bit hacky, but a proper implementation is not worth it.
args = $$QMAKE_EXTRA_ARGS
+contains(args, -redo): \
+ args += $$cat($$OUT_PWD/config.opt, lines)
for (ever) {
isEmpty(args): break()
a = $$take_first(args)
@@ -46,7 +48,8 @@ for (ever) {
modules = $$sort_depends(modules, module., .depends .recommends .serialize)
modules = $$reverse(modules)
for (mod, modules) {
- equals(module.$${mod}.qt, false): \
+ project = $$eval(module.$${mod}.project)
+ equals(project, -): \
next()
deps = $$eval(module.$${mod}.depends)
@@ -60,7 +63,6 @@ for (mod, modules) {
!isEmpty(QT_BUILD_MODULES):!contains(QT_BUILD_MODULES, $$mod): \
next()
- project = $$eval(module.$${mod}.project)
isEmpty(project) {
!exists($$mod/$${mod}.pro): \
next()