diff --git a/.travis.yml b/.travis.yml index ea6286e..24ca998 100644 --- a/.travis.yml +++ b/.travis.yml @@ -108,19 +108,57 @@ matrix: # env: # - MATRIX_EVAL="CC=clang-5.0" + # GCC on macOS + - os: osx + osx_image: xcode9.4 + env: + - MATRIX_EVAL="CC=gcc-4.9" + + - os: osx + osx_image: xcode9.4 + env: + - MATRIX_EVAL="brew install gcc@5 && CC=gcc-5" + + - os: osx + osx_image: xcode9.4 + env: + - MATRIX_EVAL="brew install gcc@6 && CC=gcc-6" + + - os: osx + osx_image: xcode9.4 + env: + - MATRIX_EVAL="brew install gcc@7 && CC=gcc-7" + + # Clang on macOS + - os: osx + osx_image: xcode9.4 + env: + - MATRIX_EVAL="brew install llvm && brew link --overwrite llvm --force && CC=/usr/local/bin/clang" + + before_install: - export MAKEFLAGS="-j$(nproc)" - | - sudo systemctl stop apt-daily.timer && - sudo systemctl stop apt-daily.service && - sudo systemctl kill --kill-who=all apt-daily.service && - while ! (systemctl list-units --all apt-daily.service | fgrep -q dead) ; do - sleep 1 - done && - sudo apt-get update -q + if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then + brew update + else + sudo systemctl stop apt-daily.timer && + sudo systemctl stop apt-daily.service && + sudo systemctl kill --kill-who=all apt-daily.service && + while ! (systemctl list-units --all apt-daily.service | fgrep -q dead) ; do + sleep 1 + done && + sudo apt-get update -q + fi install: - - sudo apt-get install -y libvips-dev uuid-dev + - | + if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then + brew unlink python + brew install vips --with-imagemagick --without-graphicsmagick --with-openexr --with-openslide + else + sudo apt-get install -y libvips-dev uuid-dev + fi before_script: - eval "${MATRIX_EVAL}" diff --git a/src/regions/Makefile b/src/regions/Makefile index 3d9e5dc..d4ab543 100644 --- a/src/regions/Makefile +++ b/src/regions/Makefile @@ -23,8 +23,6 @@ $(TARGET): main.o region.o llist.o name.o %.o: %.c $(CC) -MMD -c $(CFLAGS) -o $@ $< - sed -i'.bak' 's,\($*\.o\)[ :]*\(.*\),$@:$$\(wildcard \2\),g' $*.d - $(RM) $*.d.bak test: $(TESTS) for t in $^ ; do echo "$$t:" ; "./$$t" ; done