diff options
author | Liang Qi <liang.qi@qt.io> | 2019-08-02 12:14:55 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2019-08-03 00:02:43 +0200 |
commit | a94696ccd5be936099809eda58db02999cb7c77a (patch) | |
tree | d8405a9848a24535aa86951305bdef035e4a7cc8 /coin/provisioning/common/windows/03-conan.ps1 | |
parent | 4c5d3f2e43008da3e7e96e7cbed31bc3bbf6cfab (diff) | |
parent | 125c5e6528abee7796f6e5b68526bc050bd9250e (diff) |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
.gitmodules
ignore QtWebEngine on QEMU temporarily.
coin/platform_configs/default.yaml
no-gui build was removed temporarily.
coin/platform_configs/qt5.yaml
coin/platform_configs/qtbase.yaml
coin/platform_configs/qtconnectivity.yaml
coin/platform_configs/qtsaferenderer.yaml
Task-number: QTQAINFRA-2576
Task-number: QTBUG-77304
Task-number: QTBUG-77305
Done-With: Tony Sarajärvi <tony.sarajarvi@qt.io>
Change-Id: If7cf75791677eace762374b92382a2ce15f17f55
Diffstat (limited to 'coin/provisioning/common/windows/03-conan.ps1')
-rw-r--r-- | coin/provisioning/common/windows/03-conan.ps1 | 60 |
1 files changed, 0 insertions, 60 deletions
diff --git a/coin/provisioning/common/windows/03-conan.ps1 b/coin/provisioning/common/windows/03-conan.ps1 deleted file mode 100644 index 74c21e20..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 - - 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 |