From e304072dda3208d2c7b0d11f1a4ba10624fdb0e2 Mon Sep 17 00:00:00 2001 From: Patrick von Reth Date: Mon, 20 Jul 2015 15:30:52 +0200 Subject: [PATCH] finally fixed escaping --- appveyor.yml | 1 + ci/appveyor.ps1 | 10 ++++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 60dd09b..29632be 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -9,6 +9,7 @@ build_script: cache: - work\git -> appveyor.yml +- work\install -> appveyor.yml environment: matrix: diff --git a/ci/appveyor.ps1 b/ci/appveyor.ps1 index d85acb1..f4fa5e5 100644 --- a/ci/appveyor.ps1 +++ b/ci/appveyor.ps1 @@ -2,16 +2,16 @@ #http://stackoverflow.com/questions/2124753/how-i-can-use-powershell-with-the-visual-studio-command-prompt function batCall([string] $path, [string] $arg) { - Write-Host 'Calling "$path" "$arg"' - cmd /c '"$path" "$arg" & set' | + Write-Host "Calling `"$path`" `"$arg`"" + cmd /c "`"$path`" `"$arg`" & set" | foreach { if ($_ -match "=") { + $v = $_.split("=") #Write-Host "ENV:\$($v[0])=$($v[1])" - $v = $_.split("="); set-item -force -path "ENV:\$($v[0])" -value "$($v[1])" + set-item -force -path "ENV:\$($v[0])" -value "$($v[1])" } } } - $CMAKE_INSTALL_ROOT="$env:APPVEYOR_BUILD_FOLDER/work/install" -replace "\\", "/" if ( $env:COMPILER -eq "MINGW" ) @@ -21,6 +21,8 @@ if ( $env:COMPILER -eq "MINGW" ) $env:PATH=$env:PATH -replace "C:\\Program Files \(x86\)\\Git\\bin", "" $CMAKE_GENERATOR="MinGW Makefiles" $MAKE = "mingw32-make" + +exit 0 } elseif ( $env:COMPILER -eq "MSVC" ) {