From cb8d38fd9cbfc3c83efffba3fc2587378e9f7476 Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Tue, 16 Jul 2019 03:24:42 +0300 Subject: Provisioning: don't re-run Conan 5 times if there is no error MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ia348ebbc4fc3a2503cc426c011e68b7a410c4a08 Reviewed-by: Mårten Nordheim Reviewed-by: Simon Hausmann --- coin/provisioning/common/windows/03-conan.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'coin/provisioning/common/windows/03-conan.ps1') diff --git a/coin/provisioning/common/windows/03-conan.ps1 b/coin/provisioning/common/windows/03-conan.ps1 index 74c21e20..0e9b9bc2 100644 --- a/coin/provisioning/common/windows/03-conan.ps1 +++ b/coin/provisioning/common/windows/03-conan.ps1 @@ -42,7 +42,7 @@ function Run-Conan-Install Push-Location $outpwd Run-Executable "$scriptsPath\conan.exe" "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" break; } catch { if ($i -eq 5) { -- cgit v1.2.3 From 535dbcfe962199fb39aa02cd0f7a62a1e82bd8ea Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Tue, 16 Jul 2019 16:29:10 +0300 Subject: Conan: Suppress output of New-Item MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I3d62fffa08d38a383187726e08743512236bb859 Reviewed-by: Mårten Nordheim --- coin/provisioning/common/windows/03-conan.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'coin/provisioning/common/windows/03-conan.ps1') diff --git a/coin/provisioning/common/windows/03-conan.ps1 b/coin/provisioning/common/windows/03-conan.ps1 index 0e9b9bc2..15a1aaca 100644 --- a/coin/provisioning/common/windows/03-conan.ps1 +++ b/coin/provisioning/common/windows/03-conan.ps1 @@ -35,7 +35,7 @@ function Run-Conan-Install ForEach-Object { $conanfile = $_.FullName $outpwd = "C:\Utils\conanbuildinfos\$($BuildinfoDir)\$($_.BaseName)" - New-Item $outpwd -Type directory -Force + New-Item $outpwd -Type directory -Force | Out-Null for ($i = 1; $i -le 5; $i++) { try { -- cgit v1.2.3 From 2666f3b21609e0e22ffd1bbeead3ff91b8b0ca93 Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Tue, 16 Jul 2019 18:38:32 +0300 Subject: Provisioning: rename 03-conan.ps1 to conan.ps1 to follow naming convention MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: If24541709d4675498bc4af296e05ce3c62d5045a Reviewed-by: Mårten Nordheim --- coin/provisioning/common/windows/03-conan.ps1 | 60 --------------------------- 1 file changed, 60 deletions(-) delete mode 100644 coin/provisioning/common/windows/03-conan.ps1 (limited to 'coin/provisioning/common/windows/03-conan.ps1') diff --git a/coin/provisioning/common/windows/03-conan.ps1 b/coin/provisioning/common/windows/03-conan.ps1 deleted file mode 100644 index 15a1aaca..00000000 --- a/coin/provisioning/common/windows/03-conan.ps1 +++ /dev/null @@ -1,60 +0,0 @@ -. "$PSScriptRoot\helpers.ps1" - -$scriptsPath = "C:\Python27\Scripts" - -Run-Executable "$scriptsPath\pip.exe" "install --upgrade conan==0.24.0" - -# Use Qt Project repository by default -Run-Executable "$scriptsPath\conan.exe" "remote add qtproject https://api.bintray.com/conan/qtproject/conan --insert" - -Set-EnvironmentVariable "CI_CONAN_BUILDINFO_DIR" "C:\Utils\conanbuildinfos" - -function Run-Conan-Install -{ - Param ( - [string]$ConanfilesDir, - [string]$BuildinfoDir, - [string]$Arch, - [string]$Compiler, - [string]$CompilerVersion, - [string]$CompilerRuntime, - [string]$CompilerLibcxx - ) - - if ($CompilerRuntime) { - $extraArgs = "-s compiler.runtime=$($CompilerRuntime)" - } - - if ($CompilerLibcxx) { - $extraArgs = "-s compiler.libcxx=$($CompilerLibcxx)" - } - - $manifestsDir = "$PSScriptRoot\conan_manifests" - - Get-ChildItem -Path "$ConanfilesDir\*.txt" | - ForEach-Object { - $conanfile = $_.FullName - $outpwd = "C:\Utils\conanbuildinfos\$($BuildinfoDir)\$($_.BaseName)" - New-Item $outpwd -Type directory -Force | Out-Null - - for ($i = 1; $i -le 5; $i++) { - try { - Push-Location $outpwd - Run-Executable "$scriptsPath\conan.exe" "install -f $conanfile --no-imports --verify $manifestsDir", ` - '-s', ('compiler="' + $Compiler + '"'), ` - "-s os=Windows -s arch=$Arch -s compiler.version=$CompilerVersion $extraArgs" - break; - } catch { - if ($i -eq 5) { - throw "Could not install conan content" - } - } finally { - Pop-Location - } - } - - Copy-Item -Path $conanfile -Destination "$outpwd\conanfile.txt" - } -} - -Write-Output "Conan = 0.24.0" >> ~\versions.txt -- cgit v1.2.3