From 716640a4770c8e11ab5f6e6ebb8db64868c2679b Mon Sep 17 00:00:00 2001
From: Konstantin Tokarev <annulen@yandex.ru>
Date: Fri, 26 Jul 2019 18:57:59 +0300
Subject: Provisioning: update Conan and Conan packages
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[*] Update Conan to 1.17.0, adjust to change in command line arguments
[*] Update Conan packages to up-to-date versions, add libjpeg-turbo and
    packages for 64-bit MinGW
[*] Rename 03-conan.ps1 to 11-conan.ps1 so that it is installed after
    Python 3 and MinGW
[*] Add license header to conan.ps1

Change-Id: Ibc451ddc54a7227eb6d3a007a20351e77a46875f
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
---
 .../qtci-windows-10-x86_64/03-conan.ps1            | 33 --------------
 .../qtci-windows-10-x86_64/11-conan.ps1            | 53 ++++++++++++++++++++++
 .../qtci-windows-10-x86_64/conanfiles/qtwebkit.txt | 23 +++++++---
 3 files changed, 70 insertions(+), 39 deletions(-)
 delete mode 100644 coin/provisioning/qtci-windows-10-x86_64/03-conan.ps1
 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/11-conan.ps1

(limited to 'coin/provisioning/qtci-windows-10-x86_64')

diff --git a/coin/provisioning/qtci-windows-10-x86_64/03-conan.ps1 b/coin/provisioning/qtci-windows-10-x86_64/03-conan.ps1
deleted file mode 100644
index 40131a81..00000000
--- a/coin/provisioning/qtci-windows-10-x86_64/03-conan.ps1
+++ /dev/null
@@ -1,33 +0,0 @@
-. "$PSScriptRoot\..\common\windows\conan.ps1"
-
-Run-Conan-Install `
-    -ConanfilesDir "$PSScriptRoot\conanfiles" `
-    -BuildinfoDir MSVC2015-x86_64 `
-    -Arch x86_64 `
-    -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/11-conan.ps1 b/coin/provisioning/qtci-windows-10-x86_64/11-conan.ps1
new file mode 100644
index 00000000..a651bb0c
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86_64/11-conan.ps1
@@ -0,0 +1,53 @@
+. "$PSScriptRoot\..\common\windows\conan.ps1"
+
+Run-Conan-Install `
+    -ConanfilesDir "$PSScriptRoot\conanfiles" `
+    -BuildinfoDir MSVC2015-x86_64 `
+    -Arch x86_64 `
+    -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
+
+Run-Conan-Install `
+    -ConanfilesDir "$PSScriptRoot\conanfiles" `
+    -BuildinfoDir Mingw73-x86 `
+    -Arch x86 `
+    -Compiler "gcc" `
+    -CompilerVersion 7 `
+    -CompilerLibcxx "libstdc++" `
+    -CompilerException "dwarf2" `
+    -CompilerThreads "posix"
+
+Run-Conan-Install `
+    -ConanfilesDir "$PSScriptRoot\conanfiles" `
+    -BuildinfoDir Mingw73-x86_64 `
+    -Arch x86_64 `
+    -Compiler "gcc" `
+    -CompilerVersion 7 `
+    -CompilerLibcxx "libstdc++" `
+    -CompilerException "seh" `
+    -CompilerThreads "posix"
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 a7ced8ae..4d9ca4b9 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.txt
+++ b/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.txt
@@ -1,7 +1,8 @@
 [requires]
-icu/59.1@vitallium/stable
-libxml2/2.9.4@vitallium/stable
-libxslt/1.1.29@vitallium/stable
+icu/64.2@qtproject/stable
+libxml2/2.9.9@qtproject/stable
+libxslt/1.1.33@qtproject/stable
+libjpeg-turbo/2.0.2@qtproject/stable
 
 [generators]
 cmake
@@ -9,12 +10,22 @@ txt
 
 [options]
 icu:shared=True
+icu:data_packaging=library
+
 libxml2:shared=True
+libxml2:iconv=False
+libxml2:icu=True
+libxml2:zlib=False
+
 libxslt:shared=True
 
+libjpeg-turbo:shared=False
+
 [imports]
-bin, icudt59.dll -> ./bin
-bin, icuin59.dll -> ./bin
-bin, icuuc59.dll -> ./bin
+lib, icudt64.dll -> ./bin
+lib, icuin64.dll -> ./bin
+lib, icuuc64.dll -> ./bin
 bin, libxml2.dll -> ./bin
 bin, libxslt.dll -> ./bin
+bin, libxml2-2.dll -> ./bin
+bin, libxslt-1.dll -> ./bin
-- 
cgit v1.2.3