mirror of
git://code.qt.io/qt/qt5.git
synced 2026-03-17 17:56:11 +08:00
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>
This commit is contained in:
committed by
Simon Hausmann
parent
7dc66c9528
commit
860b38110b
@@ -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"
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user