From f8e075a67932714c35764b098045c276c26c0c2e Mon Sep 17 00:00:00 2001
From: Konstantin Tokarev <annulen@yandex.ru>
Date: Wed, 16 Nov 2016 16:32:17 +0300
Subject: Install conan from pip instead of exe

This allows us to get it working on 32-bit Windows.

Also renamed conan.ps1 and python.ps1 to get proper provisioning order.

Change-Id: I2f21db7dd0edbacb4e44024d1c70b315fba55801
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
---
 coin/provisioning/common/conan.ps1 | 50 --------------------------------------
 1 file changed, 50 deletions(-)
 delete mode 100644 coin/provisioning/common/conan.ps1

(limited to 'coin/provisioning/common/conan.ps1')

diff --git a/coin/provisioning/common/conan.ps1 b/coin/provisioning/common/conan.ps1
deleted file mode 100644
index 086af1ec..00000000
--- a/coin/provisioning/common/conan.ps1
+++ /dev/null
@@ -1,50 +0,0 @@
-. "$PSScriptRoot\helpers.ps1"
-
-$installer = "c:\users\qt\downloads\conan-win_0_15_0.exe"
-
-Download https://github.com/conan-io/conan/releases/download/0.15.0/conan-win_0_15_0.exe http://ci-files01-hki.ci.local/input/windows/conan/conan-win_0_15_0.exe $installer
-Verify-Checksum $installer "AE8DB31B34A9B88EA227F0FE283FC0F003D2BFDD"
-& $installer /DIR=C:\Utils\Conan /VERYSILENT | Out-Null
-
-[Environment]::SetEnvironmentVariable("CI_CONAN_BUILDINFO_DIR", "C:\Utils\conanbuildinfos", "Machine")
-
-function Start-Process-Logged
-{
-    Write-Host "Start-Process", $args
-    Start-Process @args
-}
-
-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)"
-    }
-
-    Get-ChildItem -Path "$ConanfilesDir\*.txt" |
-    ForEach-Object {
-        $outpwd = "C:\Utils\conanbuildinfos\$($BuildinfoDir)\$($_.BaseName)"
-        $manifestsDir = "$($_.DirectoryName)\$($_.BaseName).manifests"
-        New-Item $outpwd -Type directory -Force
-        Start-Process-Logged `
-            "C:\Utils\Conan\conan\conan.exe" `
-            -WorkingDirectory $outpwd `
-            -ArgumentList "install -f $($_.FullName) --verify $($manifestsDir)", `
-                '-s', ('compiler="' + $Compiler + '"'), `
-                "-s os=Windows -s arch=$($Arch) -s compiler.version=$($CompilerVersion) $($extraArgs)" `
-            -NoNewWindow -Wait -Verbose
-    }
-}
-- 
cgit v1.2.3