From ac5fad2780a381a2d60fb00e4104c713faa301ec Mon Sep 17 00:00:00 2001 From: Tony Kelman Date: Tue, 3 Mar 2015 10:53:26 -0800 Subject: [PATCH] add mingw to appveyor matrix use MSYS makefiles generator add bash script for running mingw on appveyor add --login and fix run paths use msys style path to appveyor-mingw.sh add mingw path to /etc/fstab --- appveyor.yml | 10 ++++++++-- script/appveyor-mingw.sh | 6 ++++++ 2 files changed, 14 insertions(+), 2 deletions(-) create mode 100755 script/appveyor-mingw.sh diff --git a/appveyor.yml b/appveyor.yml index d155485fd..00a2fd2f5 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -11,11 +11,17 @@ environment: ARCH: 32 - GENERATOR: "Visual Studio 11 Win64" ARCH: 64 + - GENERATOR: "MSYS Makefiles" + ARCH: 32 build_script: - ps: | mkdir build cd build - cmake -D ENABLE_TRACE=ON -D BUILD_CLAR=ON .. -G"$env:GENERATOR" - cmake --build . --config RelWithDebInfo + if ($env:GENERATOR -ne "MSYS Makefiles") { + cmake -D ENABLE_TRACE=ON -D BUILD_CLAR=ON .. -G"$env:GENERATOR" + cmake --build . --config RelWithDebInfo + } else { + C:\MinGW\msys\1.0\bin\sh --login /c/projects/libgit2/script/appveyor-mingw.sh + } test_script: - ps: ctest -V . diff --git a/script/appveyor-mingw.sh b/script/appveyor-mingw.sh new file mode 100755 index 000000000..aaafa4903 --- /dev/null +++ b/script/appveyor-mingw.sh @@ -0,0 +1,6 @@ +#!/bin/sh +set -e +cd `dirname "$0"`/../build +echo 'C:\MinGW\ /MinGW' > /etc/fstab +cmake -D ENABLE_TRACE=ON -D BUILD_CLAR=ON .. -G"$GENERATOR" +cmake --build . --config RelWithDebInfo