make ps1 script more verbose

This commit is contained in:
Patrick von Reth 2015-07-20 14:46:58 +02:00
parent 5f91939d83
commit 09ee646ee6
2 changed files with 11 additions and 12 deletions

View File

@ -5,6 +5,7 @@ branches:
build_script: build_script:
- ps: >- - ps: >-
& "$env:APPVEYOR_BUILD_FOLDER\ci\appveyor.ps1" & "$env:APPVEYOR_BUILD_FOLDER\ci\appveyor.ps1"
exit $lastexitcode
cache: cache:
- work\git -> appveyor.yml - work\git -> appveyor.yml
@ -14,4 +15,4 @@ environment:
#mingw #mingw
- COMPILER: MINGW - COMPILER: MINGW
#msvc #msvc
- COMPILER: MSVC #- COMPILER: MSVC

View File

@ -2,19 +2,17 @@
#http://stackoverflow.com/questions/2124753/how-i-can-use-powershell-with-the-visual-studio-command-prompt #http://stackoverflow.com/questions/2124753/how-i-can-use-powershell-with-the-visual-studio-command-prompt
function batCall([string] $path, [string] $arg) function batCall([string] $path, [string] $arg)
{ {
Write-Host "Calling $path $arg" Write-Host "Calling '$path' '$arg'"
cmd /c "'$path' '$arg' & set" | cmd /c "'$path' '$arg' & set" |
foreach { foreach {
if ($_ -match "=") { if ($_ -match "=") {
#Write-Host "ENV:\$($v[0])=$($v[1])" Write-Host "ENV:\$($v[0])=$($v[1])"
$v = $_.split("="); set-item -force -path "ENV:\$($v[0])" -value "$($v[1])" $v = $_.split("="); set-item -force -path "ENV:\$($v[0])" -value "$($v[1])"
} }
} }
} }
$CMAKE_INSTALL_ROOT=$env:APPVEYOR_BUILD_FOLDER -replace "\\", "/" $CMAKE_INSTALL_ROOT="$env:APPVEYOR_BUILD_FOLDER/work/install" -replace "\\", "/"
$CMAKE_INSTALL_ROOT="$CMAKE_INSTALL_ROOT/work/install"
if ( $env:COMPILER -eq "MINGW" ) if ( $env:COMPILER -eq "MINGW" )
{ {