summaryrefslogtreecommitdiffstats
path: root/coin/provisioning/qtci-windows-10-x86_64
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2019-09-23 16:38:06 +0200
committerLiang Qi <liang.qi@qt.io>2019-09-23 16:38:06 +0200
commit44073f55632e7848d372a60c4417bbc8664afd2c (patch)
tree6fcebed721da0d0049ae1413538e8f6bf9dfbf92 /coin/provisioning/qtci-windows-10-x86_64
parent709e687c84c67ba8faf2411c081b29f25d76de4e (diff)
parentfd87ff83aafc0f103538376591e9f36dfeb1410d (diff)
Merge remote-tracking branch 'origin/dev' into wip/cmake
Conflicts: .gitmodules coin/platform_configs/default.txt Change-Id: I78eb6b6522c678fb40f1202c0040c1c87ff890a6
Diffstat (limited to 'coin/provisioning/qtci-windows-10-x86_64')
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps14
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/09-install-sed.ps11
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/10-install-msys2.ps11
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/11-conan.ps1 (renamed from coin/provisioning/qtci-windows-10-x86_64/03-conan.ps1)22
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/50-openssl_for_android.ps1 (renamed from coin/provisioning/qtci-windows-10-x86_64/10-openssl_for_android.ps1)0
-rwxr-xr-xcoin/provisioning/qtci-windows-10-x86_64/80-emsdk.ps12
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.txt23
7 files changed, 44 insertions, 9 deletions
diff --git a/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 b/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1
index 74c8dc6b..b7a5230c 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1
@@ -36,10 +36,10 @@
# This script installs QNX SDP 7.0
$zip = Get-DownloadLocation "qnx700.7z"
-$url = "http://ci-files01-hki.intra.qt.io/input/windows/qnx700-20180801-windows.7z"
+$url = "http://ci-files01-hki.intra.qt.io/input/qnx/qnx700-20190325-windows.7z"
Download $url $url $zip
-Verify-Checksum $zip "E281897C957B5FAB249BABB2DEB77EEBB9BA75E6"
+Verify-Checksum $zip "59c681466ff78f64b98b16a95b0b44650a729dfd"
Extract-7Zip $zip C:\
Set-EnvironmentVariable "QNX_700" "C:\QNX700"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/09-install-sed.ps1 b/coin/provisioning/qtci-windows-10-x86_64/09-install-sed.ps1
new file mode 100644
index 00000000..b3c8fded
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86_64/09-install-sed.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\install-sed.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/10-install-msys2.ps1 b/coin/provisioning/qtci-windows-10-x86_64/10-install-msys2.ps1
new file mode 100644
index 00000000..be9a3634
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86_64/10-install-msys2.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\install-msys2.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/03-conan.ps1 b/coin/provisioning/qtci-windows-10-x86_64/11-conan.ps1
index c2068666..a651bb0c 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/03-conan.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/11-conan.ps1
@@ -1,4 +1,4 @@
-. "$PSScriptRoot\..\common\windows\03-conan.ps1"
+. "$PSScriptRoot\..\common\windows\conan.ps1"
Run-Conan-Install `
-ConanfilesDir "$PSScriptRoot\conanfiles" `
@@ -31,3 +31,23 @@ Run-Conan-Install `
-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/10-openssl_for_android.ps1 b/coin/provisioning/qtci-windows-10-x86_64/50-openssl_for_android.ps1
index 25c6f28a..25c6f28a 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/10-openssl_for_android.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/50-openssl_for_android.ps1
diff --git a/coin/provisioning/qtci-windows-10-x86_64/80-emsdk.ps1 b/coin/provisioning/qtci-windows-10-x86_64/80-emsdk.ps1
new file mode 100755
index 00000000..b72470a2
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86_64/80-emsdk.ps1
@@ -0,0 +1,2 @@
+. "$PSScriptRoot\..\common\windows\emsdk.ps1"
+
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