[HarfBuzz] harfbuzz: Branch 'master' - 2 commits

[Behdad Esfahbod]

 .travis.yml |   22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

New commits:
commit 233944ac91bb81250c0e63150eecfedfaf09f590
Merge: 5a24b1d d538201
Author: Khaled Hosny <khaledhosny at eglug.org>
Date:   Tue Nov 24 18:37:35 2015 +0400

    Merge pull request #185 from khaledhosny/travis-osx
    
    [travis] Enable Mac OS X support

commit d538201918e6932ef7645f8d5b2c3491954936f8
Author: Khaled Hosny <khaledhosny at eglug.org>
Date:   Tue Nov 24 12:46:35 2015 +0400

    [travis] Enable Mac OS X support
    
    Fixes https://github.com/behdad/harfbuzz/issues/182

diff --git a/.travis.yml b/.travis.yml
index a05254b..817811c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,8 @@
-# Linux Build Configuration for Travis
+# Build Configuration for Travis
 sudo: false # Use Travis docker infrastructure
+os:
+  - linux
+  - osx
 language: cpp
 compiler:
   - clang
@@ -11,13 +14,20 @@ env:
     - CXXFLAGS="-Werror --coverage"
     - LDFLAGS="--coverage"
 install:
-  - pip install --user nose
-  - pip install --user cpp-coveralls # for coveralls.io code coverage tracking
-  - export PATH=$HOME/.local/bin:$PATH # Make sure we can find the above Python packages
+  - if [ "$TRAVIS_OS_NAME" == "linux" ]; then pip install --user nose; fi
+  - if [ "$TRAVIS_OS_NAME" == "linux" ]; then pip install --user cpp-coveralls; fi # for coveralls.io code coverage tracking
+  - if [ "$TRAVIS_OS_NAME" == "linux" ]; then export PATH=$HOME/.local/bin:$PATH; fi # Make sure we can find the above Python packages
+  - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update; fi;
+  - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew install ragel freetype glib gobject-introspection cairo icu4c graphite2; fi
+  - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew link --force icu4c; fi # icu4c is keg-only
 script:
   - NOCONFIGURE=1 ./autogen.sh
-  - ./configure --with-freetype --with-glib --with-gobject --with-cairo --with-icu --with-graphite2
-  - make && make check && { rm -f src/.libs/NONE.gcov; touch src/NONE; test $CC != gcc || coveralls; }
+  - export CONFIGURE_OPTS="--with-freetype --with-glib --with-gobject --with-cairo --with-icu --with-graphite2"
+  - if [ "$TRAVIS_OS_NAME" == "osx" ]; then export CONFIGURE_OPTS="$CONFIGURE_OPTS --with-coretext"; fi
+  - ./configure $CONFIGURE_OPTS
+  - make
+  - make check
+  - if [ "$TRAVIS_OS_NAME" == "linux" -a "$CC" == "gcc" ]; then rm -f src/.libs/NONE.gcov; touch src/NONE; coveralls; fi
 notifications:
   irc: "irc.freenode.org#harfbuzz"
   email: harfbuzz at lists.freedesktop.org