From 904ee7dfeceb06b2b766739045c1c216bd551ecc Mon Sep 17 00:00:00 2001 From: Michael Davidsaver Date: Mon, 3 Jul 2017 17:56:19 +0200 Subject: [PATCH] travis-ci test mingw/win32 dll/static builds --- .travis.yml | 7 ++++--- ci/travis-build.sh | 10 ++++++++++ ci/travis-prepare.sh | 13 +++++++++++++ 3 files changed, 27 insertions(+), 3 deletions(-) create mode 100755 ci/travis-build.sh diff --git a/.travis.yml b/.travis.yml index cc14ebf..8c03b0d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,16 +10,17 @@ addons: - libncurses5-dev - perl - clang + - g++-mingw-w64-i686 install: - ./ci/travis-prepare.sh script: - - make -j2 - - make tapfiles - - find . -name '*.tap' -print0 | xargs -0 -n1 prove -e cat -f + - ./ci/travis-build.sh env: - BRBASE=3.16 - BRBASE=3.16 CMPLR=clang - BRBASE=3.16 USR_CXXFLAGS=-std=c++11 - BRBASE=3.16 USR_CXXFLAGS=-std=c++11 CMPLR=clang + - BRBASE=3.16 WINE=32 TEST=NO STATIC=YES + - BRBASE=3.16 WINE=32 TEST=NO STATIC=NO - BRBASE=3.15 - BRBASE=3.14 diff --git a/ci/travis-build.sh b/ci/travis-build.sh new file mode 100755 index 0000000..36c49cf --- /dev/null +++ b/ci/travis-build.sh @@ -0,0 +1,10 @@ +#!/bin/sh +set -e -x + +make -j2 + +if [ "$TEST" != "NO" ] +then + make tapfiles + find . -name '*.tap' -print0 | xargs -0 -n1 prove -e cat -f +fi diff --git a/ci/travis-prepare.sh b/ci/travis-prepare.sh index 1bce730..67d9157 100755 --- a/ci/travis-prepare.sh +++ b/ci/travis-prepare.sh @@ -13,6 +13,19 @@ git clone --quiet --depth 5 --branch "$BRBASE" https://github.com/${REPOBASE:-ep EPICS_HOST_ARCH=`sh epics-base/startup/EpicsHostArch` +# requires wine and g++-mingw-w64-i686 +if [ "$WINE" = "32" ] +then + echo "Cross mingw32" + sed -i -e '/CMPLR_PREFIX/d' epics-base/configure/os/CONFIG_SITE.linux-x86.win32-x86-mingw + cat << EOF >> configure/os/CONFIG_SITE.linux-x86.win32-x86-mingw +CMPLR_PREFIX=i686-w64-mingw32- +EOF + cat << EOF >> epics-base/configure/CONFIG_SITE +CROSS_COMPILER_TARGET_ARCHS+=win32-x86-mingw +EOF +fi + case "$CMPLR" in clang) echo "Host compiler is clang"