diff options
| author | Konstantin Tokarev <annulen@yandex.ru> | 2016-11-30 13:48:31 +0300 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2016-11-30 15:31:55 +0000 |
| commit | 860b38110bdd2aaf9cacaeb778098a4d12b912d3 (patch) | |
| tree | 628bb581fd4fb5b26ae5f0cff2958cac00393789 | |
| parent | 7dc66c95289a2b34e88b4e93daa8fff38d918175 (diff) | |
Copy conanfile to conanbuildinfos directory
Conanfile is required for running "conan imports" as a part of "make install"
procedure, however its original location is unknown to build system of
module.
Conanfile is copied with its conventional name "conanfile.txt" to avoid
tying module build system to more qt5.git layout peculiarities. In
future we may want to have several conanfiles in one provisioning dir,
like qtwebkit-mingw.txt and qtwebkit-msvc.txt.
Also simplified syntax of PowerShell variables interpolation, $() is needed
only for interpolating expressions.
Task-number: QTQAINFRA-998
Change-Id: I6904e80f4f85bb5269b0830272c6eaa2c8100789
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| -rw-r--r-- | coin/provisioning/common/03-conan.ps1 | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/coin/provisioning/common/03-conan.ps1 b/coin/provisioning/common/03-conan.ps1 index 0e0e26bb..04be729d 100644 --- a/coin/provisioning/common/03-conan.ps1 +++ b/coin/provisioning/common/03-conan.ps1 @@ -34,6 +34,7 @@ function Run-Conan-Install Get-ChildItem -Path "$ConanfilesDir\*.txt" | ForEach-Object { + $conanfile = $_.FullName $outpwd = "C:\Utils\conanbuildinfos\$($BuildinfoDir)\$($_.BaseName)" $manifestsDir = "$($_.DirectoryName)\$($_.BaseName).manifests" New-Item $outpwd -Type directory -Force @@ -41,9 +42,9 @@ function Run-Conan-Install $process = Start-Process-Logged ` "$scriptsPath\conan.exe" ` -WorkingDirectory $outpwd ` - -ArgumentList "install -f $($_.FullName) --no-imports --verify $($manifestsDir)", ` + -ArgumentList "install -f $conanfile --no-imports --verify $manifestsDir", ` '-s', ('compiler="' + $Compiler + '"'), ` - "-s os=Windows -s arch=$($Arch) -s compiler.version=$($CompilerVersion) $($extraArgs)" ` + "-s os=Windows -s arch=$Arch -s compiler.version=$CompilerVersion $extraArgs" ` -NoNewWindow -Wait -Verbose ` -PassThru # Return process object @@ -51,5 +52,7 @@ function Run-Conan-Install Write-Host "conan exited with code $($process.ExitCode)" Exit(1) } + + Copy-Item -Path $conanfile -Destination "$outpwd\conanfile.txt" } } |