mirror of
git://code.qt.io/qt/qt5.git
synced 2026-01-10 17:06:35 +08:00
Install conan from pip instead of exe
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:
@@ -1,10 +1,6 @@
|
||||
. "$PSScriptRoot\helpers.ps1"
|
||||
|
||||
$installer = "c:\users\qt\downloads\conan-win_0_15_0.exe"
|
||||
|
||||
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
|
||||
& pip install --upgrade conan==0.15.0
|
||||
|
||||
[Environment]::SetEnvironmentVariable("CI_CONAN_BUILDINFO_DIR", "C:\Utils\conanbuildinfos", "Machine")
|
||||
|
||||
@@ -40,7 +36,7 @@ function Run-Conan-Install
|
||||
$manifestsDir = "$($_.DirectoryName)\$($_.BaseName).manifests"
|
||||
New-Item $outpwd -Type directory -Force
|
||||
Start-Process-Logged `
|
||||
"C:\Utils\Conan\conan\conan.exe" `
|
||||
conan `
|
||||
-WorkingDirectory $outpwd `
|
||||
-ArgumentList "install -f $($_.FullName) --verify $($manifestsDir)", `
|
||||
'-s', ('compiler="' + $Compiler + '"'), `
|
||||
@@ -1,4 +1,4 @@
|
||||
. "$PSScriptRoot\..\common\conan.ps1"
|
||||
. "$PSScriptRoot\..\common\03-conan.ps1"
|
||||
|
||||
Run-Conan-Install `
|
||||
-ConanfilesDir "$PSScriptRoot\conanfiles" `
|
||||
|
||||
@@ -1 +1 @@
|
||||
. "$PSScriptRoot\..\common\python.ps1"
|
||||
. "$PSScriptRoot\..\common\02-python.ps1"
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
. "$PSScriptRoot\..\common\conan.ps1"
|
||||
. "$PSScriptRoot\..\common\03-conan.ps1"
|
||||
|
||||
Run-Conan-Install `
|
||||
-ConanfilesDir "$PSScriptRoot\conanfiles" `
|
||||
|
||||
@@ -1 +1 @@
|
||||
. "$PSScriptRoot\..\common\python.ps1"
|
||||
. "$PSScriptRoot\..\common\02-python.ps1"
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
. "$PSScriptRoot\..\common\conan.ps1"
|
||||
. "$PSScriptRoot\..\common\03-conan.ps1"
|
||||
|
||||
Run-Conan-Install `
|
||||
-ConanfilesDir "$PSScriptRoot\conanfiles" `
|
||||
|
||||
@@ -1 +1 @@
|
||||
. "$PSScriptRoot\..\common\python.ps1"
|
||||
. "$PSScriptRoot\..\common\02-python.ps1"
|
||||
|
||||
@@ -1 +1 @@
|
||||
. "$PSScriptRoot\..\common\python.ps1"
|
||||
. "$PSScriptRoot\..\common\02-python.ps1"
|
||||
|
||||
@@ -1 +1 @@
|
||||
. "$PSScriptRoot\..\common\python.ps1"
|
||||
. "$PSScriptRoot\..\common\02-python.ps1"
|
||||
|
||||
Reference in New Issue
Block a user