From e0df8c5a19ed90d1205f4072941df2fcf1526142 Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Thu, 29 May 2014 10:17:21 -0700 Subject: [PATCH] build and test on linux and osx in tandem --- .travis.yml | 22 +++++++++++----------- scripts/install_build_deps_linux.sh | 7 +++++++ scripts/install_build_deps_osx.sh | 3 +++ 3 files changed, 21 insertions(+), 11 deletions(-) create mode 100644 scripts/install_build_deps_linux.sh create mode 100644 scripts/install_build_deps_osx.sh diff --git a/.travis.yml b/.travis.yml index 5d46212f1..ed5c26f03 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,10 @@ language: cpp +# http://docs.travis-ci.com/user/multi-os/ +os: + - linux + - osx + compiler: - gcc - clang @@ -15,28 +20,23 @@ cache: - mapnik-packaging before_install: -- sudo add-apt-repository --yes ppa:ubuntu-toolchain-r/test -- sudo apt-get update -qq -- sudo apt-get -y install gcc-4.8 g++-4.8 -- sudo apt-get -y install pkg-config nodejs cmake automake libtool xutils-dev -- sudo apt-get -y install libxi-dev libglu1-mesa-dev x11proto-randr-dev x11proto-xext-dev libxrandr-dev x11proto-xf86vidmode-dev libxxf86vm-dev libxcursor-dev +- source ./scripts/install_build_deps_${TRAVIS_OS_NAME}.sh +- source ./setup-libraries.sh install: -- ./setup-libraries.sh - rm -rf mapnik-packaging/out/packages - before_script: -- if [[ ${CXX} == "g++" ]]; then export CXX="g++-4.8" ; fi +- if [[ "${TRAVIS_OS_NAME}" == "linux" ]] && [[ ${CXX} == "g++" ]]; then export CXX="g++-4.8" ; fi script: - make llmr BUILDTYPE=${BUILDTYPE} - make clean -- make linux BUILDTYPE=${BUILDTYPE} +- make ${TRAVIS_OS_NAME} BUILDTYPE=${BUILDTYPE} - make clean - make run-tests BUILDTYPE=${BUILDTYPE} -# TODO - port to linux -#- make run-headless-test BUILDTYPE=${BUILDTYPE} +# TODO - port this test to linux +- if [[ "${TRAVIS_OS_NAME}" == "osx" ]]; then make run-headless-test BUILDTYPE=${BUILDTYPE} ; fi notifications: - hipchat: WB52YkcbCGMbNcStsGeaoRO7cyBSK4wX2ZHo2Y4b@GL diff --git a/scripts/install_build_deps_linux.sh b/scripts/install_build_deps_linux.sh new file mode 100644 index 000000000..185d85d5a --- /dev/null +++ b/scripts/install_build_deps_linux.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +sudo add-apt-repository --yes ppa:ubuntu-toolchain-r/test +sudo apt-get update -qq +sudo apt-get -y install gcc-4.8 g++-4.8 +sudo apt-get -y install pkg-config nodejs cmake automake libtool xutils-dev +sudo apt-get -y install libxi-dev libglu1-mesa-dev x11proto-randr-dev x11proto-xext-dev libxrandr-dev x11proto-xf86vidmode-dev libxxf86vm-dev libxcursor-dev diff --git a/scripts/install_build_deps_osx.sh b/scripts/install_build_deps_osx.sh new file mode 100644 index 000000000..31aae9e21 --- /dev/null +++ b/scripts/install_build_deps_osx.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +brew install autoconf automake libtool makedepend cmake pkg-config node \ No newline at end of file