From c3abb1d261ca182f0ead70d64778fa1e13c0794d Mon Sep 17 00:00:00 2001 From: Edward Thomson Date: Fri, 24 Feb 2017 17:38:42 +0000 Subject: [PATCH 1/2] appveyor: always build the 'appveyor' branch The 'appveyor' branch is useful for testing AppVeyor builds. --- appveyor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/appveyor.yml b/appveyor.yml index 9e94c0726..fb3fff7dd 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -2,6 +2,7 @@ version: '{build}' branches: only: - master + - appveyor - /^maint.*/ environment: GITTEST_INVASIVE_FS_STRUCTURE: 1 From 408a7b7737fd560f5a49bf977287b195ead5c885 Mon Sep 17 00:00:00 2001 From: Edward Thomson Date: Fri, 24 Feb 2017 17:37:00 +0000 Subject: [PATCH 2/2] appveyor: don't rewrite system mingw Download mingw-w64 into our build directory and execute it there, don't try to overwrite the system's mingw. --- script/appveyor-mingw.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/script/appveyor-mingw.sh b/script/appveyor-mingw.sh index 198801875..d171a72d5 100755 --- a/script/appveyor-mingw.sh +++ b/script/appveyor-mingw.sh @@ -7,15 +7,17 @@ if [ "$ARCH" = "i686" ]; then curl -LsSO http://sourceforge.net/projects/mingw-w64/files/Toolchains%20targetting%20Win32/Personal%20Builds/mingw-builds/4.9.2/threads-win32/sjlj/$f fi 7z x $f > /dev/null - mv mingw32 /MinGW + export PATH=`pwd`/mingw32/bin:$PATH else f=x86_64-4.9.2-release-win32-seh-rt_v3-rev1.7z if ! [ -e $f ]; then curl -LsSO http://sourceforge.net/projects/mingw-w64/files/Toolchains%20targetting%20Win64/Personal%20Builds/mingw-builds/4.9.2/threads-win32/seh/$f fi 7z x $f > /dev/null - mv mingw64 /MinGW + export PATH=`pwd`/mingw64/bin:$PATH fi cd build +gcc --version +cmake --version cmake -D ENABLE_TRACE=ON -D BUILD_CLAR=ON .. -G"$GENERATOR" cmake --build . --config RelWithDebInfo