Commit b1093e62d521b2625f1651a3c2083a0c3e92ffad
2016-03-09T19:01:33
Remove CI support for mingw32 The tests have never run successfully and we do have successful builds of mingw-w64, so remove these CI builds which do not add value.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68
diff --git a/.travis.yml b/.travis.yml
index 2f3ffe3..bfc0fac 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -37,9 +37,6 @@ matrix:
- os: osx
compiler: gcc
include:
- - compiler: i586-mingw32msvc-gcc
- env: OPTIONS="-DCMAKE_TOOLCHAIN_FILE=../script/toolchain-mingw32.cmake" SKIP_TESTS=1
- os: linux
- compiler: gcc
env: COVERITY=1
os: linux
diff --git a/appveyor.yml b/appveyor.yml
index 3ed3c49..9f5f0ba 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -13,15 +13,9 @@ environment:
- GENERATOR: "Visual Studio 11 Win64"
ARCH: 64
- GENERATOR: "MSYS Makefiles"
- ARCH: 32
- - GENERATOR: "MSYS Makefiles"
ARCH: i686 # this is for 32-bit MinGW-w64
- GENERATOR: "MSYS Makefiles"
ARCH: 64
-matrix:
- allow_failures:
- - GENERATOR: "MSYS Makefiles"
- ARCH: 32
cache:
- i686-4.9.2-release-win32-sjlj-rt_v3-rev1.7z
- x86_64-4.9.2-release-win32-seh-rt_v3-rev1.7z
diff --git a/script/appveyor-mingw.sh b/script/appveyor-mingw.sh
index 48e0bad..1988018 100755
--- a/script/appveyor-mingw.sh
+++ b/script/appveyor-mingw.sh
@@ -1,9 +1,7 @@
#!/bin/sh
set -e
cd `dirname "$0"`/..
-if [ "$ARCH" = "32" ]; then
- echo 'C:\MinGW\ /MinGW' > /etc/fstab
-elif [ "$ARCH" = "i686" ]; then
+if [ "$ARCH" = "i686" ]; then
f=i686-4.9.2-release-win32-sjlj-rt_v3-rev1.7z
if ! [ -e $f ]; then
curl -LsSO http://sourceforge.net/projects/mingw-w64/files/Toolchains%20targetting%20Win32/Personal%20Builds/mingw-builds/4.9.2/threads-win32/sjlj/$f
diff --git a/script/toolchain-mingw32.cmake b/script/toolchain-mingw32.cmake
deleted file mode 100644
index 2536b01..0000000
--- a/script/toolchain-mingw32.cmake
+++ /dev/null
@@ -1,13 +0,0 @@
-# CMake toolchain file for Win32 cross-compile
-SET(CMAKE_SYSTEM_NAME Windows)
-
-SET(CMAKE_C_COMPILER i586-mingw32msvc-gcc)
-SET(CMAKE_RC_COMPILER i586-mingw32msvc-windres)
-
-SET(CMAKE_FIND_ROOT_PATH /usr/i586-mingw32msvc)
-
-SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-
-SET(ENV{PKG_CONFIG_LIBDIR} ${CMAKE_FIND_ROOT_PATH}/lib/pkgconfig)