summaryrefslogtreecommitdiffstats
path: root/coin/provisioning/common
diff options
context:
space:
mode:
authorKonstantin Tokarev <annulen@yandex.ru>2016-11-16 16:32:17 +0300
committerKonstantin Tokarev <annulen@yandex.ru>2016-11-16 21:25:32 +0000
commitf8e075a67932714c35764b098045c276c26c0c2e (patch)
tree7ba2408a8afcfc409ba8e064f663851ebe279a45 /coin/provisioning/common
parentf910b2bbf964571014ac4ce193eb8c995c48614d (diff)
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>
Diffstat (limited to 'coin/provisioning/common')
-rw-r--r--coin/provisioning/common/02-python.ps1 (renamed from coin/provisioning/common/python.ps1)0
-rw-r--r--coin/provisioning/common/03-conan.ps1 (renamed from coin/provisioning/common/conan.ps1)8
2 files changed, 2 insertions, 6 deletions
diff --git a/coin/provisioning/common/python.ps1 b/coin/provisioning/common/02-python.ps1
index 39d8146d..39d8146d 100644
--- a/coin/provisioning/common/python.ps1
+++ b/coin/provisioning/common/02-python.ps1
diff --git a/coin/provisioning/common/conan.ps1 b/coin/provisioning/common/03-conan.ps1
index 086af1ec..3c1dbbcf 100644
--- a/coin/provisioning/common/conan.ps1
+++ b/coin/provisioning/common/03-conan.ps1
@@ -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 + '"'), `