From d0552ebf2d401944d3e263000e23ca41a060d00c Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Tue, 6 Dec 2016 18:59:10 +0100 Subject: [PATCH 01/11] Fix macOS provisioning not shutting down cleanly MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit After provisioning we want the machine to be sensibly shut down since we will use the disk image later. VSphere doesn't manage to shut down 10.8 VMs. Help out by calling shutdown. For the other OS X/macOS versions, this is also desirable since controlling the power state of these machines is hard with different virtualization solutions (we're looking at OpenNebula/KVM). Change-Id: Ieabc14f9c8c1af9421a0ef91dd670f4790a84461 Reviewed-by: Simon Hausmann Reviewed-by: Jędrzej Nowacki --- .../provisioning/qtci-osx-10.10-x86_64/999-shutdown.sh | 8 ++++++++ .../provisioning/qtci-osx-10.11-x86_64/999-shutdown.sh | 8 ++++++++ coin/provisioning/qtci-osx-10.8-x86_64/999-shutdown.sh | 10 ++++++++++ coin/provisioning/qtci-osx-10.9-x86_64/999-shutdown.sh | 8 ++++++++ 4 files changed, 34 insertions(+) create mode 100644 coin/provisioning/qtci-osx-10.10-x86_64/999-shutdown.sh create mode 100644 coin/provisioning/qtci-osx-10.11-x86_64/999-shutdown.sh create mode 100644 coin/provisioning/qtci-osx-10.8-x86_64/999-shutdown.sh create mode 100644 coin/provisioning/qtci-osx-10.9-x86_64/999-shutdown.sh diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/999-shutdown.sh b/coin/provisioning/qtci-osx-10.10-x86_64/999-shutdown.sh new file mode 100644 index 00000000..1f17b545 --- /dev/null +++ b/coin/provisioning/qtci-osx-10.10-x86_64/999-shutdown.sh @@ -0,0 +1,8 @@ +#!/bin/sh + +# Make sure to shut down the machine cleanly when provisioning is done. + +# +1 minute delay to make sure that the setup finishes +# and can clean up before being interrupted by the shutdown + +sudo shutdown -h +1 diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/999-shutdown.sh b/coin/provisioning/qtci-osx-10.11-x86_64/999-shutdown.sh new file mode 100644 index 00000000..1f17b545 --- /dev/null +++ b/coin/provisioning/qtci-osx-10.11-x86_64/999-shutdown.sh @@ -0,0 +1,8 @@ +#!/bin/sh + +# Make sure to shut down the machine cleanly when provisioning is done. + +# +1 minute delay to make sure that the setup finishes +# and can clean up before being interrupted by the shutdown + +sudo shutdown -h +1 diff --git a/coin/provisioning/qtci-osx-10.8-x86_64/999-shutdown.sh b/coin/provisioning/qtci-osx-10.8-x86_64/999-shutdown.sh new file mode 100644 index 00000000..73e5efa7 --- /dev/null +++ b/coin/provisioning/qtci-osx-10.8-x86_64/999-shutdown.sh @@ -0,0 +1,10 @@ +#!/bin/sh + +# OS X 10.8 and VMWare tools don't play well together. +# The shutdown command fails, so just shut down the machine +# manually when provisioning is done. + +# +1 minute delay to make sure that the setup finishes +# and can clean up before being interrupted by the shutdown + +sudo shutdown -h +1 diff --git a/coin/provisioning/qtci-osx-10.9-x86_64/999-shutdown.sh b/coin/provisioning/qtci-osx-10.9-x86_64/999-shutdown.sh new file mode 100644 index 00000000..1f17b545 --- /dev/null +++ b/coin/provisioning/qtci-osx-10.9-x86_64/999-shutdown.sh @@ -0,0 +1,8 @@ +#!/bin/sh + +# Make sure to shut down the machine cleanly when provisioning is done. + +# +1 minute delay to make sure that the setup finishes +# and can clean up before being interrupted by the shutdown + +sudo shutdown -h +1 From 3718450891310a2186c0328415d14f0deaf34649 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Mon, 5 Dec 2016 16:21:46 +0100 Subject: [PATCH 02/11] Fix paths for provisioning on macOS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The directory names were missing the architecture, otherwise the content was unused. Change-Id: I0316da5c4b1352012f27ce330c3319a8aedf01ea Reviewed-by: Frederik Gladhorn Reviewed-by: Jędrzej Nowacki --- .../001-crashreporter.sh} | 0 .../001-crashreporter.sh} | 0 .../001-crashreporter.sh} | 0 .../001-crashreporter.sh} | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename coin/provisioning/{qtci-osx-10.10/crashreporter.sh => qtci-osx-10.10-x86_64/001-crashreporter.sh} (100%) rename coin/provisioning/{qtci-osx-10.11/crashreporter.sh => qtci-osx-10.11-x86_64/001-crashreporter.sh} (100%) rename coin/provisioning/{qtci-osx-10.8/crashreporter.sh => qtci-osx-10.8-x86_64/001-crashreporter.sh} (100%) rename coin/provisioning/{qtci-osx-10.9/crashreporter.sh => qtci-osx-10.9-x86_64/001-crashreporter.sh} (100%) diff --git a/coin/provisioning/qtci-osx-10.10/crashreporter.sh b/coin/provisioning/qtci-osx-10.10-x86_64/001-crashreporter.sh similarity index 100% rename from coin/provisioning/qtci-osx-10.10/crashreporter.sh rename to coin/provisioning/qtci-osx-10.10-x86_64/001-crashreporter.sh diff --git a/coin/provisioning/qtci-osx-10.11/crashreporter.sh b/coin/provisioning/qtci-osx-10.11-x86_64/001-crashreporter.sh similarity index 100% rename from coin/provisioning/qtci-osx-10.11/crashreporter.sh rename to coin/provisioning/qtci-osx-10.11-x86_64/001-crashreporter.sh diff --git a/coin/provisioning/qtci-osx-10.8/crashreporter.sh b/coin/provisioning/qtci-osx-10.8-x86_64/001-crashreporter.sh similarity index 100% rename from coin/provisioning/qtci-osx-10.8/crashreporter.sh rename to coin/provisioning/qtci-osx-10.8-x86_64/001-crashreporter.sh diff --git a/coin/provisioning/qtci-osx-10.9/crashreporter.sh b/coin/provisioning/qtci-osx-10.9-x86_64/001-crashreporter.sh similarity index 100% rename from coin/provisioning/qtci-osx-10.9/crashreporter.sh rename to coin/provisioning/qtci-osx-10.9-x86_64/001-crashreporter.sh From be37958406f92ac78b5d3d5d00b0844c80cbd9bf Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Wed, 7 Dec 2016 14:09:25 +0100 Subject: [PATCH 03/11] Disable the screensaver on macOS definitely and permanently MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I8856eebfe91b9e1cc2cc318a1e7ea80348f1486e Reviewed-by: Frederik Gladhorn Reviewed-by: Jędrzej Nowacki --- .../qtci-osx-10.10-x86_64/002-disable-screensaver.sh | 3 +++ .../qtci-osx-10.11-x86_64/002-disable-screensaver.sh | 3 +++ .../qtci-osx-10.8-x86_64/002-disable-screensaver.sh | 3 +++ .../qtci-osx-10.9-x86_64/002-disable-screensaver.sh | 3 +++ 4 files changed, 12 insertions(+) create mode 100644 coin/provisioning/qtci-osx-10.10-x86_64/002-disable-screensaver.sh create mode 100644 coin/provisioning/qtci-osx-10.11-x86_64/002-disable-screensaver.sh create mode 100644 coin/provisioning/qtci-osx-10.8-x86_64/002-disable-screensaver.sh create mode 100644 coin/provisioning/qtci-osx-10.9-x86_64/002-disable-screensaver.sh diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/002-disable-screensaver.sh b/coin/provisioning/qtci-osx-10.10-x86_64/002-disable-screensaver.sh new file mode 100644 index 00000000..6f4de5f2 --- /dev/null +++ b/coin/provisioning/qtci-osx-10.10-x86_64/002-disable-screensaver.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +defaults -currentHost write com.apple.screensaver idleTime 0 diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/002-disable-screensaver.sh b/coin/provisioning/qtci-osx-10.11-x86_64/002-disable-screensaver.sh new file mode 100644 index 00000000..6f4de5f2 --- /dev/null +++ b/coin/provisioning/qtci-osx-10.11-x86_64/002-disable-screensaver.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +defaults -currentHost write com.apple.screensaver idleTime 0 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 new file mode 100644 index 00000000..6f4de5f2 --- /dev/null +++ b/coin/provisioning/qtci-osx-10.8-x86_64/002-disable-screensaver.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +defaults -currentHost write com.apple.screensaver idleTime 0 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 new file mode 100644 index 00000000..6f4de5f2 --- /dev/null +++ b/coin/provisioning/qtci-osx-10.9-x86_64/002-disable-screensaver.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +defaults -currentHost write com.apple.screensaver idleTime 0 From 0ce4f02c5f40eb8a3323db69683d04f9bb3df88b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C4=99drzej=20Nowacki?= Date: Mon, 5 Dec 2016 14:03:56 +0100 Subject: [PATCH 04/11] Suppress shutdown indicator in Ubuntu We want to quit machines without being asked, if we are really sure. Change-Id: Ic7156f5b0fe236c0270d8c2e4fcc322a82776caf Reviewed-by: Simon Hausmann Reviewed-by: Frederik Gladhorn --- .../001-suppress-shutdown-indicator.sh | 4 ++++ .../001-suppress-shutdown-indicator.sh | 4 ++++ .../001-suppress-shutdown-indicator.sh | 4 ++++ .../{001-apt-update.sh => 003-apt-update.sh} | 0 4 files changed, 12 insertions(+) create mode 100644 coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/001-suppress-shutdown-indicator.sh create mode 100644 coin/provisioning/qtci-linux-Ubuntu-15.04-x86_64/001-suppress-shutdown-indicator.sh create mode 100644 coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/001-suppress-shutdown-indicator.sh rename coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/{001-apt-update.sh => 003-apt-update.sh} (100%) diff --git a/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/001-suppress-shutdown-indicator.sh b/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/001-suppress-shutdown-indicator.sh new file mode 100644 index 00000000..f11263b7 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/001-suppress-shutdown-indicator.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env sh + +# Disable questions on shutdown. +gsettings set com.canonical.indicator.session suppress-logout-restart-shutdown true diff --git a/coin/provisioning/qtci-linux-Ubuntu-15.04-x86_64/001-suppress-shutdown-indicator.sh b/coin/provisioning/qtci-linux-Ubuntu-15.04-x86_64/001-suppress-shutdown-indicator.sh new file mode 100644 index 00000000..f11263b7 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-15.04-x86_64/001-suppress-shutdown-indicator.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env sh + +# Disable questions on shutdown. +gsettings set com.canonical.indicator.session suppress-logout-restart-shutdown true diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/001-suppress-shutdown-indicator.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/001-suppress-shutdown-indicator.sh new file mode 100644 index 00000000..f11263b7 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/001-suppress-shutdown-indicator.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env sh + +# Disable questions on shutdown. +gsettings set com.canonical.indicator.session suppress-logout-restart-shutdown true diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/001-apt-update.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/003-apt-update.sh similarity index 100% rename from coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/001-apt-update.sh rename to coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/003-apt-update.sh From 16d05b088e054ed4442d8acd3884dde741ead56d Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Thu, 8 Dec 2016 08:18:50 +0100 Subject: [PATCH 05/11] Improve disabling of screensaver on macOS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Setting the idleTime on currentHost works well, until the hardware UUID changes and thus the host ID for the setting. With kvm that happens quite frequently, with vmware less but also occasionally (deep clone for example). By disabling the screensaver on start-up we can cover all cases quite easily. Change-Id: Ibdcf404430656f9caa47386ca3c732366ddfc8c7 Reviewed-by: Jędrzej Nowacki --- .../002-disable-screensaver.sh | 25 ++++++++++++++++++- .../002-disable-screensaver.sh | 25 ++++++++++++++++++- .../002-disable-screensaver.sh | 25 ++++++++++++++++++- .../002-disable-screensaver.sh | 25 ++++++++++++++++++- 4 files changed, 96 insertions(+), 4 deletions(-) diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/002-disable-screensaver.sh b/coin/provisioning/qtci-osx-10.10-x86_64/002-disable-screensaver.sh index 6f4de5f2..44df94e7 100644 --- a/coin/provisioning/qtci-osx-10.10-x86_64/002-disable-screensaver.sh +++ b/coin/provisioning/qtci-osx-10.10-x86_64/002-disable-screensaver.sh @@ -1,3 +1,26 @@ #!/bin/sh -defaults -currentHost write com.apple.screensaver idleTime 0 +mkdir -p $HOME/Library/LaunchAgents +cat >$HOME/Library/LaunchAgents/no-screensaver.plist < + + + + Label + org.qt.io.screensaver_disable + ProgramArguments + + defaults + -currentHost + write + com.apple.screensaver + idleTime + 0 + + RunAtLoad + + KeepAlive + + + +EOT diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/002-disable-screensaver.sh b/coin/provisioning/qtci-osx-10.11-x86_64/002-disable-screensaver.sh index 6f4de5f2..44df94e7 100644 --- a/coin/provisioning/qtci-osx-10.11-x86_64/002-disable-screensaver.sh +++ b/coin/provisioning/qtci-osx-10.11-x86_64/002-disable-screensaver.sh @@ -1,3 +1,26 @@ #!/bin/sh -defaults -currentHost write com.apple.screensaver idleTime 0 +mkdir -p $HOME/Library/LaunchAgents +cat >$HOME/Library/LaunchAgents/no-screensaver.plist < + + + + Label + org.qt.io.screensaver_disable + ProgramArguments + + defaults + -currentHost + write + com.apple.screensaver + idleTime + 0 + + RunAtLoad + + KeepAlive + + + +EOT 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 index 6f4de5f2..44df94e7 100644 --- 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 @@ -1,3 +1,26 @@ #!/bin/sh -defaults -currentHost write com.apple.screensaver idleTime 0 +mkdir -p $HOME/Library/LaunchAgents +cat >$HOME/Library/LaunchAgents/no-screensaver.plist < + + + + Label + org.qt.io.screensaver_disable + ProgramArguments + + defaults + -currentHost + write + com.apple.screensaver + idleTime + 0 + + RunAtLoad + + KeepAlive + + + +EOT 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 index 6f4de5f2..44df94e7 100644 --- 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 @@ -1,3 +1,26 @@ #!/bin/sh -defaults -currentHost write com.apple.screensaver idleTime 0 +mkdir -p $HOME/Library/LaunchAgents +cat >$HOME/Library/LaunchAgents/no-screensaver.plist < + + + + Label + org.qt.io.screensaver_disable + ProgramArguments + + defaults + -currentHost + write + com.apple.screensaver + idleTime + 0 + + RunAtLoad + + KeepAlive + + + +EOT From 2f9d551948323c86e727d246c34c5f46a3661b8c Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Thu, 8 Dec 2016 20:01:26 +0100 Subject: [PATCH 06/11] Update submodules on '5.7' in qt5 Change-Id: I87579c99e2ee1c2b7ab4d1cf3d403443f215cddb Reviewed-by: Liang Qi --- qtbase | 2 +- qtconnectivity | 2 +- qtdoc | 2 +- qtqa | 2 +- qtquickcontrols2 | 2 +- qtvirtualkeyboard | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qtbase b/qtbase index 50aeedd8..04f68053 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 50aeedd86ce0244fbb77ebefdce8da72db881e45 +Subproject commit 04f68053df5c90dca6947c6d2a5bb4e6851e62bb diff --git a/qtconnectivity b/qtconnectivity index 042e26bc..61afd66f 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 042e26bccd2e53447229035c2b31cc1ab853335e +Subproject commit 61afd66f148af4a8d3e0cad12b7c9419f1122cbe diff --git a/qtdoc b/qtdoc index becd0cfc..73dc5f8d 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit becd0cfc4bcbaa5fe0eca0cca6e97961bc5ad911 +Subproject commit 73dc5f8de51ad1fcaff8e30188de23a4d6ff39b4 diff --git a/qtqa b/qtqa index cd6bd183..ecdfbf2e 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit cd6bd183192764546bd7f0909a5bad3848b9d18a +Subproject commit ecdfbf2e7b3c01b06b0c1547516b85aa7c30e5c5 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 6aa97038..838fd791 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 6aa97038e26bab96455b2fc3febc5d358a5e7599 +Subproject commit 838fd79152957f457a47cd30970961a27f086848 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index e67e97e9..c2a58836 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit e67e97e9543eae2de42666eec3ff4d3cdca81db3 +Subproject commit c2a58836ba4a9671520da132ee2891245a56405f From e86ba9e1f70be1e28c681a3cf7f685a4d93612cf Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Fri, 16 Dec 2016 14:17:04 +0200 Subject: [PATCH 07/11] Provision: Android openssl 1.0.2j for Windows 7 We are currently using too old openssl for Android builds in Windows 7. Openssl version need to be at least 1.0.1. This script will configure openssl 1.0.2j for Android using tools from msys. Change-Id: I9ab9a3b4f9f3953cf99bf15fee631f5a7961b42d Reviewed-by: Simon Hausmann --- .../qtci-windows-7-x86/04-msys.ps1 | 14 ++++++++ .../qtci-windows-7-x86/android_openssl.ps1 | 32 +++++++++++++++++++ 2 files changed, 46 insertions(+) create mode 100644 coin/provisioning/qtci-windows-7-x86/04-msys.ps1 create mode 100644 coin/provisioning/qtci-windows-7-x86/android_openssl.ps1 diff --git a/coin/provisioning/qtci-windows-7-x86/04-msys.ps1 b/coin/provisioning/qtci-windows-7-x86/04-msys.ps1 new file mode 100644 index 00000000..b75fd2a6 --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86/04-msys.ps1 @@ -0,0 +1,14 @@ +. "$PSScriptRoot\..\common\helpers.ps1" + +# 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" + +$zip = "c:\users\qt\downloads\msys-$version.7z" +$sha1 = "22cd76f1263db8c72727a9537228c481ff33c285" +$destination = "C:\msys" + +Download $url $url $zip +Verify-Checksum $zip $sha1 +C:\Utils\sevenzip\7z.exe x $zip -oC:\ diff --git a/coin/provisioning/qtci-windows-7-x86/android_openssl.ps1 b/coin/provisioning/qtci-windows-7-x86/android_openssl.ps1 new file mode 100644 index 00000000..a1b656c6 --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86/android_openssl.ps1 @@ -0,0 +1,32 @@ +. "$PSScriptRoot\..\common\helpers.ps1" + +# OpenSSL need to be configured from sources for Android build in windows 7 +# Msys need to be installed to target machine +# More info and building instructions can be found from http://doc.qt.io/qt-5/opensslsupport.html + +$version = "1.0.2j" +$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 +Verify-Checksum $zip $sha1 + +C:\Utils\sevenzip\7z.exe x $zip -oC:\Utils +C:\Utils\sevenzip\7z.exe x C:\Utils\openssl-$version.tar -oC:\Utils +Remove-Item $destination -Force -Recurse +Rename-Item C:\Utils\openssl-$version $destination +Remove-Item $zip +Remove-Item C:\Utils\openssl-$version.tar + +set CC=C:\utils\android-ndk-r10e\toolchains\arm-linux-androideabi-4.9\prebuilt\windows\bin\arm-linux-androideabi-gcc +set AR=C:\utils\android-ndk-r10e\toolchains\arm-linux-androideabi-4.9\prebuilt\windows\bin\arm-linux-androideabi-ar +set ANDROID_DEV=C:\utils\android-ndk-r10e\platforms\android-18\arch-arm\usr +$env:Path = $env:Path + ";C:\msys\1.0\bin" + +echo "Configuring OpenSSL $version for Android..." +cd $destination +C:\msys\1.0\bin\bash.exe -c "perl Configure shared android" + +# Following command is needed when using version 1.1.0. With version 1.1.0 msys is not needed. +# C:\mingw530\bin\mingw32-make.exe include\openssl\opensslconf.h From fc6717cf23f0d0cff04000ac5a69a736d68b9c16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Tue, 13 Dec 2016 08:51:24 +0200 Subject: [PATCH 08/11] Provision: Install pyside python dependencies to Linux To test successfully pyside dependencies with Coin, we need python-dev packages and virtual env. Change-Id: I29a5eed769798da4e4799eb5ccdff1cd032070d5 Reviewed-by: Simon Hausmann --- .../provisioning/qtci-linux-RHEL-6.6-x86_64/08-pythondev.sh | 4 ++++ .../provisioning/qtci-linux-RHEL-7.2-x86_64/08-pythondev.sh | 5 +++++ .../qtci-linux-Ubuntu-14.04-x86_64/08-pythondev.sh | 6 ++++++ 3 files changed, 15 insertions(+) create mode 100644 coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-pythondev.sh create mode 100644 coin/provisioning/qtci-linux-RHEL-7.2-x86_64/08-pythondev.sh create mode 100644 coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/08-pythondev.sh diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-pythondev.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-pythondev.sh new file mode 100644 index 00000000..b419f217 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-pythondev.sh @@ -0,0 +1,4 @@ +# provides: python development libraries +# version: provided by default Linux distribution repository +# needed to build pyside +sudo yum install -y python-devel python-virtualenv diff --git a/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/08-pythondev.sh b/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/08-pythondev.sh new file mode 100644 index 00000000..ad1bf18f --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/08-pythondev.sh @@ -0,0 +1,5 @@ +# provides: python development libraries +# version: provided by default Linux distribution repository +# needed to build pyside +sudo subscription-manager refresh +sudo yum install -y python-devel python-virtualenv diff --git a/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/08-pythondev.sh b/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/08-pythondev.sh new file mode 100644 index 00000000..205f598b --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/08-pythondev.sh @@ -0,0 +1,6 @@ +# provides: python development libraries +# version: provided by default Linux distribution repository +# needed to build pyside + +sudo apt-get update +sudo apt-get install -y python-dev From ff1ad70a197069ea455cc8c2daaa870e8ec528e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Tue, 13 Dec 2016 09:00:12 +0200 Subject: [PATCH 09/11] Provision: Install pyside python dependencies to Windows To test successfully pyside dependencies with Coin, we need python virtual env. Change-Id: I59c620b7da9c78d2b5c55e233d75597b747a8e84 Reviewed-by: Simon Hausmann --- coin/provisioning/common/python.ps1 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/coin/provisioning/common/python.ps1 b/coin/provisioning/common/python.ps1 index 39d8146d..32972830 100644 --- a/coin/provisioning/common/python.ps1 +++ b/coin/provisioning/common/python.ps1 @@ -62,3 +62,7 @@ echo "Chancing allowZip64 value to 'True'..." echo "Remove $package..." del $package Add-Path $path + +& python -m ensurepip +# Install python virtual env +pip.exe install virtualenv From 8a60455e61d6a7cd11eb7da02bdf1cae8ff97b8b Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Thu, 15 Dec 2016 10:31:03 +0100 Subject: [PATCH 10/11] Remove shutdown "helpers" for macOS It turns out that they don't quite work the way we expected them to, and instead we Coin is going to shut down the VMs directly at the right time. Change-Id: I9f7a6f2f898002a25544fc513a0c2414fcd5c263 Reviewed-by: Simon Hausmann --- .../provisioning/qtci-osx-10.10-x86_64/999-shutdown.sh | 8 -------- .../provisioning/qtci-osx-10.11-x86_64/999-shutdown.sh | 8 -------- coin/provisioning/qtci-osx-10.8-x86_64/999-shutdown.sh | 10 ---------- coin/provisioning/qtci-osx-10.9-x86_64/999-shutdown.sh | 8 -------- 4 files changed, 34 deletions(-) delete mode 100644 coin/provisioning/qtci-osx-10.10-x86_64/999-shutdown.sh delete mode 100644 coin/provisioning/qtci-osx-10.11-x86_64/999-shutdown.sh delete mode 100644 coin/provisioning/qtci-osx-10.8-x86_64/999-shutdown.sh delete mode 100644 coin/provisioning/qtci-osx-10.9-x86_64/999-shutdown.sh diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/999-shutdown.sh b/coin/provisioning/qtci-osx-10.10-x86_64/999-shutdown.sh deleted file mode 100644 index 1f17b545..00000000 --- a/coin/provisioning/qtci-osx-10.10-x86_64/999-shutdown.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -# Make sure to shut down the machine cleanly when provisioning is done. - -# +1 minute delay to make sure that the setup finishes -# and can clean up before being interrupted by the shutdown - -sudo shutdown -h +1 diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/999-shutdown.sh b/coin/provisioning/qtci-osx-10.11-x86_64/999-shutdown.sh deleted file mode 100644 index 1f17b545..00000000 --- a/coin/provisioning/qtci-osx-10.11-x86_64/999-shutdown.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -# Make sure to shut down the machine cleanly when provisioning is done. - -# +1 minute delay to make sure that the setup finishes -# and can clean up before being interrupted by the shutdown - -sudo shutdown -h +1 diff --git a/coin/provisioning/qtci-osx-10.8-x86_64/999-shutdown.sh b/coin/provisioning/qtci-osx-10.8-x86_64/999-shutdown.sh deleted file mode 100644 index 73e5efa7..00000000 --- a/coin/provisioning/qtci-osx-10.8-x86_64/999-shutdown.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -# OS X 10.8 and VMWare tools don't play well together. -# The shutdown command fails, so just shut down the machine -# manually when provisioning is done. - -# +1 minute delay to make sure that the setup finishes -# and can clean up before being interrupted by the shutdown - -sudo shutdown -h +1 diff --git a/coin/provisioning/qtci-osx-10.9-x86_64/999-shutdown.sh b/coin/provisioning/qtci-osx-10.9-x86_64/999-shutdown.sh deleted file mode 100644 index 1f17b545..00000000 --- a/coin/provisioning/qtci-osx-10.9-x86_64/999-shutdown.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -# Make sure to shut down the machine cleanly when provisioning is done. - -# +1 minute delay to make sure that the setup finishes -# and can clean up before being interrupted by the shutdown - -sudo shutdown -h +1 From 678fcb4e66763a4352e1fe0a1a423d09e38d7a8c Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Fri, 23 Dec 2016 21:57:49 +0300 Subject: [PATCH 11/11] Updated conan manifests after modification of packages Change-Id: I60eee501254d41b438085b7b687af6aa2c085dba Reviewed-by: Vitaliy Slobodin Reviewed-by: Simon Hausmann --- .../vitallium/stable/export/conanmanifest.txt | 4 ++-- .../conanmanifest.txt | 20 +++++++++++-------- .../vitallium/stable/export/conanmanifest.txt | 4 ++-- .../conanmanifest.txt | 13 ++++++------ .../vitallium/stable/export/conanmanifest.txt | 2 +- .../conanmanifest.txt | 16 +++++++-------- .../vitallium/stable/export/conanmanifest.txt | 4 ++-- .../conanmanifest.txt | 20 +++++++++++-------- .../vitallium/stable/export/conanmanifest.txt | 4 ++-- .../conanmanifest.txt | 13 ++++++------ .../vitallium/stable/export/conanmanifest.txt | 2 +- .../conanmanifest.txt | 16 +++++++-------- 12 files changed, 62 insertions(+), 56 deletions(-) rename coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.manifests/icu/57.1/vitallium/stable/package/{ca0c09cfa678fd91b04c82824988c42e9ac40ddf => 08d619707be406a9063a13de35af19767e64a982}/conanmanifest.txt (94%) rename coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/icu/57.1/vitallium/stable/package/{c85f9b402dd4d46acdf074e1c63b768a41181d7a => c4195ae4643996fbb226d1e0265076354ac622bb}/conanmanifest.txt (94%) 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 index 685e4549..392eb24f 100644 --- 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 @@ -1,2 +1,2 @@ -1478098249 -conanfile.py: f66225cf233d8eee6c6c6b4832d81b79 \ No newline at end of file +1482492127 +conanfile.py: 7edc28cf26a4c3acd9b1c9f08ea8cba3 diff --git a/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.manifests/icu/57.1/vitallium/stable/package/ca0c09cfa678fd91b04c82824988c42e9ac40ddf/conanmanifest.txt b/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.manifests/icu/57.1/vitallium/stable/package/08d619707be406a9063a13de35af19767e64a982/conanmanifest.txt similarity index 94% rename from coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.manifests/icu/57.1/vitallium/stable/package/ca0c09cfa678fd91b04c82824988c42e9ac40ddf/conanmanifest.txt rename to coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.manifests/icu/57.1/vitallium/stable/package/08d619707be406a9063a13de35af19767e64a982/conanmanifest.txt index 97af4669..ab1bd501 100644 --- a/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.manifests/icu/57.1/vitallium/stable/package/ca0c09cfa678fd91b04c82824988c42e9ac40ddf/conanmanifest.txt +++ b/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.manifests/icu/57.1/vitallium/stable/package/08d619707be406a9063a13de35af19767e64a982/conanmanifest.txt @@ -1,8 +1,10 @@ -1478097969 -bin/icudt57.dll: 87bbc24187330408f9d7cb056060e0ad -bin/icuin57.dll: 10bcbdf7ce17871d7ac0fe560a58493e -bin/icuuc57.dll: 2f252173e83d958205d83e168af27bd1 -conaninfo.txt: 93a147af5e69ef5fc1628b5f401d2e72 +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 @@ -171,6 +173,8 @@ include/unicode/utypes.h: 21e5e8cc7dc66bdb83f70971bed1a5e4 include/unicode/uvernum.h: d878c9e384487c8668c122712134c0f1 include/unicode/uversion.h: 140b36fa9bffd2cb2b1c7f02691923e6 include/unicode/vtzone.h: 90e065183436be0a94918465f66be863 -lib/icudt.lib: 375f9aff64352ed211a704156f40b206 -lib/icuin.lib: 752c472eb6f90acde3372894a68e2291 -lib/icuuc.lib: 1f493156171786bf782d85ca6ae017bf \ No newline at end of file +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 index c80be750..c958bb87 100644 --- 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 @@ -1,2 +1,2 @@ -1478189855 -conanfile.py: 2d514c8a822e7432b8d2e030c3d17693 \ No newline at end of file +1482493404 +conanfile.py: 4c879159bebcecec85173f085cd4c3c7 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/qtci-windows-10-x86/conanfiles/qtwebkit.manifests/libxml2/2.9.4/vitallium/stable/package/0de2434f61f19881f1d4cfe60c583be521a65d08/conanmanifest.txt index 8d769861..e16c2976 100644 --- a/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.manifests/libxml2/2.9.4/vitallium/stable/package/0de2434f61f19881f1d4cfe60c583be521a65d08/conanmanifest.txt +++ b/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.manifests/libxml2/2.9.4/vitallium/stable/package/0de2434f61f19881f1d4cfe60c583be521a65d08/conanmanifest.txt @@ -1,6 +1,6 @@ -1478189644 -bin/libxml2.dll: 622bde2aec1d514bbf4ffcdcd734dbb7 -conaninfo.txt: a27084d89e21b40687c65926b75cf057 +1482493099 +bin/libxml2.dll: f43264365ba9d2681455ff106303a4e9 +conaninfo.txt: b51d149c110dea2bef2ab37017308696 include/libxml/DOCBparser.h: 21e6523a86338325c527e1e8847adc1d include/libxml/HTMLparser.h: 083a413aedc738e1903735b7f1678087 include/libxml/HTMLtree.h: 46cf4cefb419e18c40b8d5b6ac982f3f @@ -44,13 +44,12 @@ include/libxml/xmlschemastypes.h: 160197e01dfa56cd9ad09d201d5bdeb4 include/libxml/xmlstring.h: 82efb8a055d5fc8eb7d815ed471eca53 include/libxml/xmlunicode.h: b9f0b8acddfee9b620ea822978a51d29 include/libxml/xmlversion.h: 0c268947477509833b9edc4ae096da41 -include/libxml/xmlwin32version.h: 0c672b45ad0bbc3285870375ac5e62c9 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: 61e2849cbb7376a17665994d68f7c9b4 -lib/libxml2_a.lib: c4bae1030473a5473ecc77cdf5af397d -lib/libxml2_a_dll.lib: 98c11a0804ff364feb161bfa1214bc63 \ No newline at end of file +lib/libxml2.lib: ec17f6714da6647f63d2cdc54d005e43 +lib/libxml2_a.lib: abae79bdfded67d5017604b7b7c8dd03 +lib/libxml2_a_dll.lib: f68e18d65520175beb3a8de99cbb7e9b diff --git a/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.manifests/libxslt/1.1.29/vitallium/stable/export/conanmanifest.txt b/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.manifests/libxslt/1.1.29/vitallium/stable/export/conanmanifest.txt index 439e0dbf..be77d721 100644 --- a/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.manifests/libxslt/1.1.29/vitallium/stable/export/conanmanifest.txt +++ b/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.manifests/libxslt/1.1.29/vitallium/stable/export/conanmanifest.txt @@ -1,2 +1,2 @@ 1478438034 -conanfile.py: 2472a82109b2d59062d3e50a54d08a4a \ No newline at end of file +conanfile.py: 2472a82109b2d59062d3e50a54d08a4a 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/qtci-windows-10-x86/conanfiles/qtwebkit.manifests/libxslt/1.1.29/vitallium/stable/package/466fc39fa8b7a19ee2095aa945fff98630acdd12/conanmanifest.txt index d0ded34a..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/qtci-windows-10-x86/conanfiles/qtwebkit.manifests/libxslt/1.1.29/vitallium/stable/package/466fc39fa8b7a19ee2095aa945fff98630acdd12/conanmanifest.txt @@ -1,7 +1,7 @@ -1478437844 -bin/libexslt.dll: f57633ce0800d9041ba0040d8fbc9734 -bin/libxslt.dll: 20016a1ea3bc1625cb28e807787d8c93 -conaninfo.txt: 49fd643454ba3c15665b78805623c650 +1482494566 +bin/libexslt.dll: 656ebfef4dcd7d299bff8f5123bfd4b9 +bin/libxslt.dll: cdca16a3183ddcbdf3d0087c3f1e62e9 +conaninfo.txt: 73548fb3ff61aade734c0ce2071a2d05 include/libexslt/exslt.h: f01af3bf058520059ba6d50f42133717 include/libexslt/exsltconfig.h: a36134fd73a90b0c39ba3eb4fa8833b9 include/libexslt/exsltexports.h: 079c35b6fa14302aad0764c1dee57809 @@ -32,7 +32,7 @@ include/libxslt/xsltexports.h: 207ffe4e458a8c24635b3eb24bdd8000 include/libxslt/xsltlocale.h: b934279cc2a6556075638425e5634b07 include/libxslt/xsltutils.h: c190bd536ce0cffe1ccba74c68f7b0c9 include/libxslt/xsltwin32config.h: 8a3a4b0359659042a66603eb59cc4001 -lib/libexslt.lib: 424b0512b9a5c474e0f67bc6620b778a -lib/libexslt_a.lib: ae779d86d57ce47bd3f088525126c98a -lib/libxslt.lib: ca7513e26e38cb34f826eee424bafe8f -lib/libxslt_a.lib: 5fcc830c7af32b7b328335b81ef81999 \ No newline at end of file +lib/libexslt.lib: a84716fa57d325856a55cf5ba8a816c6 +lib/libexslt_a.lib: c428937c93542c6386534b61239e8119 +lib/libxslt.lib: 43b2e966367546ff110762f24f4c919d +lib/libxslt_a.lib: a802233763886894a7a89e4f8e634e6a 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 index 685e4549..392eb24f 100644 --- 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 @@ -1,2 +1,2 @@ -1478098249 -conanfile.py: f66225cf233d8eee6c6c6b4832d81b79 \ No newline at end of file +1482492127 +conanfile.py: 7edc28cf26a4c3acd9b1c9f08ea8cba3 diff --git a/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/icu/57.1/vitallium/stable/package/c85f9b402dd4d46acdf074e1c63b768a41181d7a/conanmanifest.txt b/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/icu/57.1/vitallium/stable/package/c4195ae4643996fbb226d1e0265076354ac622bb/conanmanifest.txt similarity index 94% rename from coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/icu/57.1/vitallium/stable/package/c85f9b402dd4d46acdf074e1c63b768a41181d7a/conanmanifest.txt rename to coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/icu/57.1/vitallium/stable/package/c4195ae4643996fbb226d1e0265076354ac622bb/conanmanifest.txt index e4212811..d2d84a21 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/icu/57.1/vitallium/stable/package/c85f9b402dd4d46acdf074e1c63b768a41181d7a/conanmanifest.txt +++ b/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/icu/57.1/vitallium/stable/package/c4195ae4643996fbb226d1e0265076354ac622bb/conanmanifest.txt @@ -1,8 +1,10 @@ -1478098455 -bin/icudt57.dll: 672be38b9176350208e62915e3d22bd7 -bin/icuin57.dll: e14d1d399efb686d4680073ae0452d59 -bin/icuuc57.dll: 9d47b44bd2a382509ffe67c52085467f -conaninfo.txt: 58d139c57d36025b13c7691cc6fe02d6 +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 @@ -171,6 +173,8 @@ include/unicode/utypes.h: 21e5e8cc7dc66bdb83f70971bed1a5e4 include/unicode/uvernum.h: d878c9e384487c8668c122712134c0f1 include/unicode/uversion.h: 140b36fa9bffd2cb2b1c7f02691923e6 include/unicode/vtzone.h: 90e065183436be0a94918465f66be863 -lib/icudt.lib: 8feb46831d7f9ff4f851ddb4a3b86287 -lib/icuin.lib: 27e6dd91a18fb61c4e92c5155efec652 -lib/icuuc.lib: cf6f30f41e57d2d7094b450d766a390a \ No newline at end of file +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 index c80be750..c958bb87 100644 --- 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 @@ -1,2 +1,2 @@ -1478189855 -conanfile.py: 2d514c8a822e7432b8d2e030c3d17693 \ No newline at end of file +1482493404 +conanfile.py: 4c879159bebcecec85173f085cd4c3c7 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/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/libxml2/2.9.4/vitallium/stable/package/95a4a855074d4607ef02a5a86bf5ef1666dd773e/conanmanifest.txt index 8df25ad7..4b9ecc61 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/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/libxml2/2.9.4/vitallium/stable/package/95a4a855074d4607ef02a5a86bf5ef1666dd773e/conanmanifest.txt @@ -1,6 +1,6 @@ -1478189807 -bin/libxml2.dll: b86b5aa939f258befbaca3cda811b371 -conaninfo.txt: 1542aee37a2d33374417a5a745c77d0f +1482493354 +bin/libxml2.dll: 0b02196ac933431b150fb73a5bed7518 +conaninfo.txt: 29ccd6acef148fd29fc8ebee20216618 include/libxml/DOCBparser.h: 21e6523a86338325c527e1e8847adc1d include/libxml/HTMLparser.h: 083a413aedc738e1903735b7f1678087 include/libxml/HTMLtree.h: 46cf4cefb419e18c40b8d5b6ac982f3f @@ -44,13 +44,12 @@ include/libxml/xmlschemastypes.h: 160197e01dfa56cd9ad09d201d5bdeb4 include/libxml/xmlstring.h: 82efb8a055d5fc8eb7d815ed471eca53 include/libxml/xmlunicode.h: b9f0b8acddfee9b620ea822978a51d29 include/libxml/xmlversion.h: 0c268947477509833b9edc4ae096da41 -include/libxml/xmlwin32version.h: 0c672b45ad0bbc3285870375ac5e62c9 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: 814daf6ff042d2110b047da877b075d7 -lib/libxml2_a.lib: c85b4ef8c9e404369a140134a450f98c -lib/libxml2_a_dll.lib: 2cac7d585f12fef63dfbe20f470f2d5e \ No newline at end of file +lib/libxml2.lib: 7ab0a2cf0511ea7eb2593a24e5a31750 +lib/libxml2_a.lib: a4d10046b1cf6910811687a04ef38d6f +lib/libxml2_a_dll.lib: f785611927ed7f3a9514a1ccac31fd10 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 index 439e0dbf..be77d721 100644 --- 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 @@ -1,2 +1,2 @@ 1478438034 -conanfile.py: 2472a82109b2d59062d3e50a54d08a4a \ No newline at end of file +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/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/libxslt/1.1.29/vitallium/stable/package/19663639a14063d996b277c7fac0e00264689c20/conanmanifest.txt index f0bffa50..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/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/libxslt/1.1.29/vitallium/stable/package/19663639a14063d996b277c7fac0e00264689c20/conanmanifest.txt @@ -1,7 +1,7 @@ -1478437988 -bin/libexslt.dll: bace70c121c29fd8b9e29ce7ea924367 -bin/libxslt.dll: 00022b72c0cacd3c3ca7bc48a0ec4632 -conaninfo.txt: cba36a71cb20255ea805a39e62e79070 +1482494796 +bin/libexslt.dll: acf1f58607eb1a10534cc30ca2bf2c9f +bin/libxslt.dll: 9edc15648704934221ec3afcedb25451 +conaninfo.txt: 224814c47f7d14968c401d2180974e77 include/libexslt/exslt.h: f01af3bf058520059ba6d50f42133717 include/libexslt/exsltconfig.h: a36134fd73a90b0c39ba3eb4fa8833b9 include/libexslt/exsltexports.h: 079c35b6fa14302aad0764c1dee57809 @@ -32,7 +32,7 @@ include/libxslt/xsltexports.h: 207ffe4e458a8c24635b3eb24bdd8000 include/libxslt/xsltlocale.h: b934279cc2a6556075638425e5634b07 include/libxslt/xsltutils.h: c190bd536ce0cffe1ccba74c68f7b0c9 include/libxslt/xsltwin32config.h: 8a3a4b0359659042a66603eb59cc4001 -lib/libexslt.lib: c78e77d2bc7ce733a9d45f23176f2803 -lib/libexslt_a.lib: 29b31bece1e69641372cadce020326ad -lib/libxslt.lib: b7d9260d0f7ada29f5d3649820a8e1cb -lib/libxslt_a.lib: e24f546f9b757fd152de506c2d3af1bf \ No newline at end of file +lib/libexslt.lib: 0c9f94aeea183a48ec62d6e1a3ac42af +lib/libexslt_a.lib: 026a42ff0b36660c1bd4890b656c80ee +lib/libxslt.lib: 084d078777bf34d52af7fc93a425d6b0 +lib/libxslt_a.lib: a07434cb5a40a32a17be58f71fe24976