diff options
| author | Konstantin Tokarev <annulen@yandex.ru> | 2016-11-18 19:25:12 +0300 |
|---|---|---|
| committer | Konstantin Tokarev <annulen@yandex.ru> | 2016-11-18 22:19:23 +0000 |
| commit | aafc3f86449d4a38d41af852f143425828d71843 (patch) | |
| tree | d57f0a8a5f599a9195af1d5168b0f679796fffcb | |
| parent | a561a58bb6833598843f0ae8c2c8c78b3825c017 (diff) | |
Use full paths for invoking stuff from Python27\Scripts
Change-Id: I52094cc4b27b9e3a6fe3dd12c504777b8bb7bc75
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| -rw-r--r-- | coin/provisioning/common/03-conan.ps1 | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/coin/provisioning/common/03-conan.ps1 b/coin/provisioning/common/03-conan.ps1 index 56242d34..37b34626 100644 --- a/coin/provisioning/common/03-conan.ps1 +++ b/coin/provisioning/common/03-conan.ps1 @@ -1,6 +1,8 @@ . "$PSScriptRoot\helpers.ps1" -& pip install --upgrade conan==0.15.0 +$scriptsPath = "C:\Python27\Scripts" + +& "$scriptsPath\pip.exe" install --upgrade conan==0.15.0 [Environment]::SetEnvironmentVariable("CI_CONAN_BUILDINFO_DIR", "C:\Utils\conanbuildinfos", "Machine") @@ -37,7 +39,7 @@ function Run-Conan-Install New-Item $outpwd -Type directory -Force $process = Start-Process-Logged ` - conan ` + "$scriptsPath\conan.exe" ` -WorkingDirectory $outpwd ` -ArgumentList "install -f $($_.FullName) --verify $($manifestsDir)", ` '-s', ('compiler="' + $Compiler + '"'), ` |