From dd7ed132ee4e8f25ea02f4df88ec9545b8d6ebae Mon Sep 17 00:00:00 2001 From: Brent Cook Date: Sat, 31 Jan 2015 22:13:19 -0600 Subject: update travis-ci build to check mingw32/64 targets --- .travis.yml | 28 +++++++++++++++++++++++++++- scripts/travis | 28 ++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 1 deletion(-) create mode 100755 scripts/travis diff --git a/.travis.yml b/.travis.yml index 36912d0..56b82da 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,4 +5,30 @@ compiler: os: - linux - osx -script: "./dist.sh" +env: + - ARCH=native + - ARCH=mingw32 + - ARCH=mingw64 +matrix: + include: + - compiler: clang + os: osx + env: ARCH=native + - compiler: gcc + os: osx + env: ARCH=native + - compiler: clang + os: linux + env: ARCH=native + - compiler: gcc + os: linux + env: ARCH=native + - compiler: gcc + os: linux + env: ARCH=mingw32 + - compiler: gcc + os: linux + env: ARCH=mingw64 + +script: + "./scripts/travis" diff --git a/scripts/travis b/scripts/travis new file mode 100755 index 0000000..4d28782 --- /dev/null +++ b/scripts/travis @@ -0,0 +1,28 @@ +#!/bin/sh +set -e + +./autogen.sh + +if [ "x$ARCH" = "xnative" ]; then + ./configure --enable-libtls + make clean + make -j distcheck +else + CPU=i686 + if [ "x$ARCH" = "xmingw64" ]; then + CPU=x86_64 + fi + export CC=$CPU-w64-mingw32-gcc + + if [ -z $(which $CC) ]; then + # Update Ubuntu 12.04 with current mingw toolchain + apt-get update && apt-get install -y python-software-properties + apt-add-repository -y ppa:tobydox/mingw-x-precise + apt-get update && apt-get install -y $ARCH-x-gcc make + export PATH=$PATH:/opt/$ARCH/bin + fi + + ./configure --host=$CPU-w64-mingw32 --enable-libtls + make clean + make -j +fi -- cgit v1.2.3-55-g6feb