Travis/OS X: Use 'brew bundle' + Brewfile

This ensures that the build script will not fail if the Homebrew
dependencies are already installed.

diff --git a/.travis.yml b/.travis.yml
index f273012f4c4a889914222ed365be4e295eddb8d5..55df6daaa0c638b094bd84aafe8c1b1757e9a74c 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -44,7 +44,7 @@ matrix:
 before_install:
   - if [ "$TRAVIS_OS_NAME" = "osx" ]; then
       brew update &&
-      brew install nasm homebrew/versions/gcc5 md5sha1sum Caskroom/versions/java6 &&
+      brew bundle &&
       ln -fs /usr/local/bin/gpg1 /usr/local/bin/gpg &&
       git clone --depth=1 https://github.com/libjpeg-turbo/gas-preprocessor.git ~/src/gas-preprocessor &&
       ln -fs /Applications/Xcode.app /Applications/Xcode72.app;

diff --git a/Brewfile b/Brewfile
new file mode 100644 (file)
index 0000000..02d8457
--- /dev/null
+++ b/Brewfile
@@ -0,0 +1,4 @@
+brew 'nasm'
+brew 'gcc@5'
+brew 'md5sha1sum'
+cask 'Caskroom/versions/java6'

diff --git a/Makefile.am b/Makefile.am
index 8043f096860826726530590780bd530a69b6ab0b..0c2d25346a6ef259bf95e045aed4df3facb571ad 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -174,7 +174,7 @@ EXTRA_DIST = win release $(DOCS) testimages CMakeLists.txt \
        sharedlib/CMakeLists.txt cmakescripts libjpeg.map.in doc doxygen.config \
        doxygen-extra.css jccolext.c jdcolext.c jdcol565.c jdmrgext.c jdmrg565.c \
        jstdhuff.c jdcoefct.h jdmainct.h jdmaster.h jdsample.h \
-       md5/CMakeLists.txt
+       md5/CMakeLists.txt Brewfile
 
 dist-hook:
        rm -rf `find $(distdir) -name .svn`