summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2016-09-30 09:27:59 +0200
committerLiang Qi <liang.qi@qt.io>2016-09-30 09:27:59 +0200
commita5b6125466344f0f9b73691b97fbc809c5ad9f7f (patch)
tree67b3c035a279951862d53339cd55724d7d59ab73
parent1148171a5d1e481a19c1bb4f11d6316fbeb5286c (diff)
parent6fabd3496096b7a3b268f4b62f30395a5dcd3305 (diff)
Merge remote-tracking branch 'origin/5.7' into 5.8
-rw-r--r--.gitmodules2
-rw-r--r--coin/provisioning/common/conan.ps133
-rw-r--r--coin/provisioning/common/helpers.ps120
-rw-r--r--coin/provisioning/common/ruby.ps17
-rw-r--r--coin/provisioning/qtci-windows-10-x86/conan.ps18
-rw-r--r--coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt20
-rw-r--r--coin/provisioning/qtci-windows-10-x86/ruby.ps11
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/conan.ps18
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.txt20
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/ruby.ps11
10 files changed, 119 insertions, 1 deletions
diff --git a/.gitmodules b/.gitmodules
index 1e4cc51b..f044480c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -263,7 +263,7 @@
branch = 5.8
status = addon
[submodule "qtpurchasing"]
- depends = qtbase
+ depends = qtbase qtandroidextras
recommends = qtdeclarative
path = qtpurchasing
url = ../qtpurchasing.git
diff --git a/coin/provisioning/common/conan.ps1 b/coin/provisioning/common/conan.ps1
new file mode 100644
index 00000000..70962a41
--- /dev/null
+++ b/coin/provisioning/common/conan.ps1
@@ -0,0 +1,33 @@
+. "$PSScriptRoot\helpers.ps1"
+
+$installer = "c:\users\qt\downloads\conan-win_0_12_0.exe"
+
+Download https://s3-eu-west-1.amazonaws.com/conanio-production/downloads/conan-win_0_12_0.exe http://ci-files01-hki.ci.local/input/conan/conan-win_0_12_0.exe $installer
+Verify-Checksum $installer "719F30E6EED03149D75CDB28F80A7B873B43FF51"
+& $installer /DIR=C:\Utils\Conan /VERYSILENT
+
+[Environment]::SetEnvironmentVariable("CI_CONAN_BUILDINFO_DIR", "C:/Utils/conanbuildinfos", "Machine")
+
+function Run-Conan-Install
+{
+ Param (
+ [string]$ConanfilesDir,
+ [string]$BuildinfoDir,
+ [string]$Arch,
+ [string]$Compiler,
+ [string]$CompilerVersion
+ )
+
+ Get-ChildItem -Path "$ConanfilesDir\*.txt" |
+ ForEach-Object {
+ $outpwd = "C:\Utils\conanbuildinfos\$($BuildinfoDir)\$($_.BaseName)"
+ New-Item $outpwd -Type directory -Force
+ Start-Process `
+ "C:\Utils\Conan\conan\conan.exe" `
+ -WorkingDirectory $outpwd `
+ -ArgumentList "install -i -f $($_.FullName)", `
+ '-s', ('compiler="' + $Compiler + '"'), `
+ "-s os=Windows -s arch=$($Arch) -s compiler.version=$($CompilerVersion)" `
+ -NoNewWindow -Wait
+ }
+}
diff --git a/coin/provisioning/common/helpers.ps1 b/coin/provisioning/common/helpers.ps1
index d7b957f3..055ce0a7 100644
--- a/coin/provisioning/common/helpers.ps1
+++ b/coin/provisioning/common/helpers.ps1
@@ -29,3 +29,23 @@ function Extract-Zip
$destinationFolder = $shell.Namespace($Destination)
$destinationFolder.CopyHere($zipfile.Items(), 16)
}
+
+function BadParam
+{
+ Param ([string]$Description)
+ throw("You must specify $Description")
+}
+
+function Download
+{
+ Param (
+ [string] $OfficialUrl = $(BadParam("the official download URL")),
+ [string] $CachedUrl = $(BadParam("the locally cached URL")),
+ [string] $Destination = $(BadParam("a download target location"))
+ )
+ try {
+ Invoke-WebRequest -UseBasicParsing $CachedUrl -OutFile $Destination
+ } catch {
+ Invoke-WebRequest -UseBasicParsing $OfficialUrl -OutFile $Destination
+ }
+}
diff --git a/coin/provisioning/common/ruby.ps1 b/coin/provisioning/common/ruby.ps1
new file mode 100644
index 00000000..343bacfc
--- /dev/null
+++ b/coin/provisioning/common/ruby.ps1
@@ -0,0 +1,7 @@
+. "$PSScriptRoot\helpers.ps1"
+
+$installer = "c:\users\qt\downloads\rubyinstaller-2.3.1.exe"
+
+Download https://dl.bintray.com/oneclick/rubyinstaller/rubyinstaller-2.3.1.exe http://ci-files01-hki.ci.local/input/ruby/rubyinstaller-2.3.1.exe $installer
+Verify-Checksum $installer "FF377F6F313849C3B0CD72EEC1EFFA436F0E4A36"
+& $installer /DIR=C:\ruby /VERYSILENT
diff --git a/coin/provisioning/qtci-windows-10-x86/conan.ps1 b/coin/provisioning/qtci-windows-10-x86/conan.ps1
new file mode 100644
index 00000000..718d25de
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86/conan.ps1
@@ -0,0 +1,8 @@
+. "$PSScriptRoot\..\common\conan.ps1"
+
+Run-Conan-Install `
+ -ConanfilesDir "$PSScriptRoot\conanfiles" `
+ -BuildinfoDir MSVC2015-x86 `
+ -Arch x86 `
+ -Compiler "Visual Studio" `
+ -CompilerVersion 14
diff --git a/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt b/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt
new file mode 100644
index 00000000..d1fcbfba
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt
@@ -0,0 +1,20 @@
+[requires]
+cmake_installer/0.1@lasote/testing
+icu/57.1@Vitallium/stable
+libxml2-qt/2.9.4@Vitallium/stable
+libxslt-qt/1.1.29@Vitallium/stable
+
+[generators]
+cmake
+virtualenv
+
+[options]
+cmake_installer:version=3.5.2
+icu:shared=True
+libxml2-qt:shared=False
+libxslt-qt:shared=False
+
+[imports]
+bin, icudt57.dll -> ./bin
+bin, icuin57.dll -> ./bin
+bin, icuuc57.dll -> ./bin
diff --git a/coin/provisioning/qtci-windows-10-x86/ruby.ps1 b/coin/provisioning/qtci-windows-10-x86/ruby.ps1
new file mode 100644
index 00000000..587a4c10
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86/ruby.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\ruby.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/conan.ps1 b/coin/provisioning/qtci-windows-10-x86_64/conan.ps1
new file mode 100644
index 00000000..04887712
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86_64/conan.ps1
@@ -0,0 +1,8 @@
+. "$PSScriptRoot\..\common\conan.ps1"
+
+Run-Conan-Install `
+ -ConanfilesDir "$PSScriptRoot\conanfiles" `
+ -BuildinfoDir MSVC2015-x86_64 `
+ -Arch x86_64 `
+ -Compiler "Visual Studio" `
+ -CompilerVersion 14
diff --git a/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.txt b/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.txt
new file mode 100644
index 00000000..d1fcbfba
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.txt
@@ -0,0 +1,20 @@
+[requires]
+cmake_installer/0.1@lasote/testing
+icu/57.1@Vitallium/stable
+libxml2-qt/2.9.4@Vitallium/stable
+libxslt-qt/1.1.29@Vitallium/stable
+
+[generators]
+cmake
+virtualenv
+
+[options]
+cmake_installer:version=3.5.2
+icu:shared=True
+libxml2-qt:shared=False
+libxslt-qt:shared=False
+
+[imports]
+bin, icudt57.dll -> ./bin
+bin, icuin57.dll -> ./bin
+bin, icuuc57.dll -> ./bin
diff --git a/coin/provisioning/qtci-windows-10-x86_64/ruby.ps1 b/coin/provisioning/qtci-windows-10-x86_64/ruby.ps1
new file mode 100644
index 00000000..587a4c10
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86_64/ruby.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\ruby.ps1"