lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-05-09 20:47:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed value of CI_CONAN_BUILDINFO_DIR variable when provisioning Windows

Browse Source 
Change-Id: I841783122edf82739826cc0a7672d8c809870e97
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
This commit is contained in:
Konstantin Tokarev
2016-09-17 21:04:03 +03:00
committed by Simon Hausmann
parent e1bfa77391
commit 23d1112839
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
coin/provisioning/common/conan.ps1
View File

@@ -6,6 +6,8 @@ Download https://s3-eu-west-1.amazonaws.com/conanio-production/downloads/conan-w
Verify-Checksum $installer "719F30E6EED03149D75CDB28F80A7B873B43FF51" Verify-Checksum $installer "719F30E6EED03149D75CDB28F80A7B873B43FF51"
& $installer /DIR=C:\Utils\Conan /VERYSILENT & $installer /DIR=C:\Utils\Conan /VERYSILENT
[Environment]::SetEnvironmentVariable("CI_CONAN_BUILDINFO_DIR", "C:\Utils\conanbuildinfos", "Machine")
function Run-Conan-Install function Run-Conan-Install
{ {
Param ( Param (
@@ -28,6 +30,4 @@ function Run-Conan-Install
"-s os=Windows -s arch=$($Arch) -s compiler.version=$($CompilerVersion)" ` "-s os=Windows -s arch=$($Arch) -s compiler.version=$($CompilerVersion)" `
-NoNewWindow -Wait -NoNewWindow -Wait
} }
[Environment]::SetEnvironmentVariable("CI_CONAN_BUILDINFO_DIR", $BuildinfoDir, "Machine")
} }

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

@@ -2,7 +2,7 @@
Run-Conan-Install ` Run-Conan-Install `
-ConanfilesDir "$PSScriptRoot\conanfiles" ` -ConanfilesDir "$PSScriptRoot\conanfiles" `
-BuildinfoDir MSVC2015-X86 ` -BuildinfoDir MSVC2015-x86 `
-Arch x86 ` -Arch x86 `
-Compiler "Visual Studio" ` -Compiler "Visual Studio" `
-CompilerVersion 14 -CompilerVersion 14

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

@@ -2,7 +2,7 @@
Run-Conan-Install ` Run-Conan-Install `
-ConanfilesDir "$PSScriptRoot\conanfiles" ` -ConanfilesDir "$PSScriptRoot\conanfiles" `
-BuildinfoDir MSVC2015-X86_64 ` -BuildinfoDir MSVC2015-x86_64 `
-Arch x86_64 ` -Arch x86_64 `
-Compiler "Visual Studio" ` -Compiler "Visual Studio" `
-CompilerVersion 14 -CompilerVersion 14