lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-05-10 13:07:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Install conan from pip instead of exe

Browse Source 
This allows us to get it working on 32-bit Windows.

Also renamed conan.ps1 and python.ps1 to get proper provisioning order.

Change-Id: I2f21db7dd0edbacb4e44024d1c70b315fba55801
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
This commit is contained in:
Konstantin Tokarev
2016-11-16 16:32:17 +03:00
parent f910b2bbf9
commit f8e075a679
10 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
coin/provisioning/common/python.ps1 → coin/provisioning/common/02-python.ps1
View File

8
coin/provisioning/common/conan.ps1 → coin/provisioning/common/03-conan.ps1
View File

@@ -1,10 +1,6 @@
. "$PSScriptRoot\helpers.ps1" . "$PSScriptRoot\helpers.ps1"
$installer = "c:\users\qt\downloads\conan-win_0_15_0.exe" & pip install --upgrade conan==0.15.0
Download https://github.com/conan-io/conan/releases/download/0.15.0/conan-win_0_15_0.exe http://ci-files01-hki.ci.local/input/windows/conan/conan-win_0_15_0.exe $installer
Verify-Checksum $installer "AE8DB31B34A9B88EA227F0FE283FC0F003D2BFDD"
& $installer /DIR=C:\Utils\Conan /VERYSILENT | Out-Null
[Environment]::SetEnvironmentVariable("CI_CONAN_BUILDINFO_DIR", "C:\Utils\conanbuildinfos", "Machine") [Environment]::SetEnvironmentVariable("CI_CONAN_BUILDINFO_DIR", "C:\Utils\conanbuildinfos", "Machine")
@@ -40,7 +36,7 @@ function Run-Conan-Install
$manifestsDir = "$($_.DirectoryName)\$($_.BaseName).manifests" $manifestsDir = "$($_.DirectoryName)\$($_.BaseName).manifests"
New-Item $outpwd -Type directory -Force New-Item $outpwd -Type directory -Force
Start-Process-Logged ` Start-Process-Logged `
"C:\Utils\Conan\conan\conan.exe" ` conan `
-WorkingDirectory $outpwd ` -WorkingDirectory $outpwd `
-ArgumentList "install -f $($_.FullName) --verify $($manifestsDir)", ` -ArgumentList "install -f $($_.FullName) --verify $($manifestsDir)", `
'-s', ('compiler="' + $Compiler + '"'), ` '-s', ('compiler="' + $Compiler + '"'), `

2
coin/provisioning/qtci-windows-10-x86/conan.ps1
View File

@@ -1,4 +1,4 @@
. "$PSScriptRoot\..\common\conan.ps1" . "$PSScriptRoot\..\common\03-conan.ps1"
Run-Conan-Install ` Run-Conan-Install `
-ConanfilesDir "$PSScriptRoot\conanfiles" ` -ConanfilesDir "$PSScriptRoot\conanfiles" `

2
coin/provisioning/qtci-windows-10-x86/python.ps1
View File

@@ -1 +1 @@
. "$PSScriptRoot\..\common\python.ps1" . "$PSScriptRoot\..\common\02-python.ps1"

2
coin/provisioning/qtci-windows-10-x86_64/conan.ps1
View File

@@ -1,4 +1,4 @@
. "$PSScriptRoot\..\common\conan.ps1" . "$PSScriptRoot\..\common\03-conan.ps1"
Run-Conan-Install ` Run-Conan-Install `
-ConanfilesDir "$PSScriptRoot\conanfiles" ` -ConanfilesDir "$PSScriptRoot\conanfiles" `

2
coin/provisioning/qtci-windows-10-x86_64/python.ps1
View File

@@ -1 +1 @@
. "$PSScriptRoot\..\common\python.ps1" . "$PSScriptRoot\..\common\02-python.ps1"

2
coin/provisioning/qtci-windows-7-x86/conan.ps1
View File

@@ -1,4 +1,4 @@
. "$PSScriptRoot\..\common\conan.ps1" . "$PSScriptRoot\..\common\03-conan.ps1"
Run-Conan-Install ` Run-Conan-Install `
-ConanfilesDir "$PSScriptRoot\conanfiles" ` -ConanfilesDir "$PSScriptRoot\conanfiles" `

2
coin/provisioning/qtci-windows-7-x86/python.ps1
View File

@@ -1 +1 @@
. "$PSScriptRoot\..\common\python.ps1" . "$PSScriptRoot\..\common\02-python.ps1"

2
coin/provisioning/qtci-windows-8-x86/python.ps1
View File

@@ -1 +1 @@
. "$PSScriptRoot\..\common\python.ps1" . "$PSScriptRoot\..\common\02-python.ps1"

2
coin/provisioning/qtci-windows-8-x86_64/python.ps1
View File

@@ -1 +1 @@
. "$PSScriptRoot\..\common\python.ps1" . "$PSScriptRoot\..\common\02-python.ps1"