Clean appveyor config.

This commit is contained in:
Victor Zverovich
2014-07-10 08:41:33 -07:00
parent 6eaee58679
commit 47f2e7aa02

View File

@ -1,18 +1,17 @@
environment: environment:
matrix: matrix:
- build: msvc - Build: msvc
- build: mingw - Build: mingw
generator: -GMinGW Makefiles Generator: -GMinGW Makefiles
configuration: configuration:
- Debug - Debug
- Release - Release
install: install:
- set
# Install MinGW.
- ps: | - ps: |
if ($env:build -eq "mingw") { if ($env:Build -eq "mingw") {
# Install MinGW.
$url = "http://sourceforge.net/projects/mingw-w64/files/" $url = "http://sourceforge.net/projects/mingw-w64/files/"
$url += "Toolchains%20targetting%20Win64/Personal%20Builds/" $url += "Toolchains%20targetting%20Win64/Personal%20Builds/"
$url += "mingw-builds/4.9.0/threads-win32/seh/" $url += "mingw-builds/4.9.0/threads-win32/seh/"
@ -24,23 +23,23 @@ install:
before_build: before_build:
- ps: | - ps: |
if ($env:build -eq "mingw") { if ($env:Build -eq "mingw") {
# Remove path to Git bin directory from PATH because it breaks MinGW config. # Remove path to Git bin directory from PATH because it breaks MinGW config.
$env:PATH = $env:PATH -replace "C:\\Program Files \(x86\)\\Git\\bin","" $env:PATH = $env:PATH -replace "C:\\Program Files \(x86\)\\Git\\bin",""
} }
cmake -DFMT_EXTRA_TESTS=ON -DCMAKE_BUILD_TYPE=$env:Configuration "$env:generator" . cmake -DFMT_EXTRA_TESTS=ON -DCMAKE_BUILD_TYPE=$env:Configuration "$env:Generator" .
build_script: build_script:
- ps: | - ps: |
if ($env:build -eq "mingw") { if ($env:Build -eq "mingw") {
mingw32-make -j4 mingw32-make -j4 VERBOSE=1
} else { } else {
msbuild /m:4 /p:Configuration=$env:Configuration FORMAT.sln msbuild /m:4 /p:Configuration=$env:Configuration FORMAT.sln
} }
test_script: test_script:
- ps: | - ps: |
if ($env:build -eq "mingw") { if ($env:Build -eq "mingw") {
mingw32-make test mingw32-make test
} else { } else {
msbuild RUN_TESTS.vcxproj msbuild RUN_TESTS.vcxproj