ryan/mozjpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
This ensures that the build script will not fail if the Homebrew
dependencies are already installed.
This commit is contained in:
Stephen
2018-01-03 07:56:12 -08:00
committed by DRC
parent 0e2bca0744
commit 3847f91122
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@@ -44,7 +44,7 @@ matrix:
before_install: before_install:
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then - if [ "$TRAVIS_OS_NAME" = "osx" ]; then
brew update && brew update &&
brew install nasm homebrew/versions/gcc5 md5sha1sum Caskroom/versions/java6 && brew bundle &&
ln -fs /usr/local/bin/gpg1 /usr/local/bin/gpg && 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 && git clone --depth=1 https://github.com/libjpeg-turbo/gas-preprocessor.git ~/src/gas-preprocessor &&
ln -fs /Applications/Xcode.app /Applications/Xcode72.app; ln -fs /Applications/Xcode.app /Applications/Xcode72.app;

4
Brewfile Normal file
View File

@@ -0,0 +1,4 @@
brew 'nasm'
brew 'gcc@5'
brew 'md5sha1sum'
cask 'Caskroom/versions/java6'

2
Makefile.am
View File

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