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 ---------------------- coin/provisioning/common/windows/conan.ps1 | 60 ++++++++++++++++++++++ coin/provisioning/qtci-windows-10-x86/03-conan.ps1 | 2 +- .../qtci-windows-10-x86_64/03-conan.ps1 | 2 +- coin/provisioning/qtci-windows-7-x86/03-conan.ps1 | 2 +- 5 files changed, 63 insertions(+), 63 deletions(-) delete mode 100644 coin/provisioning/common/windows/03-conan.ps1 create mode 100644 coin/provisioning/common/windows/conan.ps1 (limited to 'coin') 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 diff --git a/coin/provisioning/common/windows/conan.ps1 b/coin/provisioning/common/windows/conan.ps1 new file mode 100644 index 00000000..15a1aaca --- /dev/null +++ b/coin/provisioning/common/windows/conan.ps1 @@ -0,0 +1,60 @@ +. "$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 diff --git a/coin/provisioning/qtci-windows-10-x86/03-conan.ps1 b/coin/provisioning/qtci-windows-10-x86/03-conan.ps1 index 75c6a232..d33ceea8 100644 --- a/coin/provisioning/qtci-windows-10-x86/03-conan.ps1 +++ b/coin/provisioning/qtci-windows-10-x86/03-conan.ps1 @@ -1,4 +1,4 @@ -. "$PSScriptRoot\..\common\windows\03-conan.ps1" +. "$PSScriptRoot\..\common\windows\conan.ps1" Run-Conan-Install ` -ConanfilesDir "$PSScriptRoot\conanfiles" ` diff --git a/coin/provisioning/qtci-windows-10-x86_64/03-conan.ps1 b/coin/provisioning/qtci-windows-10-x86_64/03-conan.ps1 index c2068666..40131a81 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/03-conan.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/03-conan.ps1 @@ -1,4 +1,4 @@ -. "$PSScriptRoot\..\common\windows\03-conan.ps1" +. "$PSScriptRoot\..\common\windows\conan.ps1" Run-Conan-Install ` -ConanfilesDir "$PSScriptRoot\conanfiles" ` diff --git a/coin/provisioning/qtci-windows-7-x86/03-conan.ps1 b/coin/provisioning/qtci-windows-7-x86/03-conan.ps1 index 807e5480..4aa9658d 100644 --- a/coin/provisioning/qtci-windows-7-x86/03-conan.ps1 +++ b/coin/provisioning/qtci-windows-7-x86/03-conan.ps1 @@ -1,4 +1,4 @@ -. "$PSScriptRoot\..\common\windows\03-conan.ps1" +. "$PSScriptRoot\..\common\windows\conan.ps1" Run-Conan-Install ` -ConanfilesDir "$PSScriptRoot\conanfiles" ` -- cgit v1.2.3