premiere
/
premiere-libtorrent
2
2
Fork 1
Code Issues Pull Requests Releases Wiki Activity

using travis xcode7.3 image to avoid brew update issue

This commit is contained in:
Alden Torres 2017-03-17 09:50:14 -04:00 committed by Arvid Norberg
parent 014a07a5c8
commit 71b488e326
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
.travis.yml
View File

@ -8,13 +8,13 @@ matrix:
- env: variant=test_release coverage=1 tests=1 toolset=gcc-coverage python=1
- env: autotools=1 toolset=gcc
- os: osx
osx_image: xcode6.4
osx_image: xcode7.3
env: variant=test_release docs=1 tests=1 toolset=darwin
- os: osx
osx_image: xcode6.4
osx_image: xcode7.3
env: variant=test_debug ssl=openssl tests=1 crypto=libcrypto toolset=darwin
- os: osx
osx_image: xcode6.4
osx_image: xcode7.3
env: variant=test_barebones tools=1 examples=1 toolset=darwin python=1
- dist: trusty
env: arch=arm toolset=gcc-arm
@ -55,17 +55,17 @@ before_install:
- 'if [[ $ssl == "" ]]; then export ssl=off; fi'
- 'if [[ $crypto == "" ]]; then export crypto=built-in; fi'
- 'if [[ $TRAVIS_OS_NAME == "osx" && ( "$tests" == "1" || "$sim" == 1 || "$examples" == "1" || "$tools" == "1" || "$python" == "1" ) ]]; then
travis_retry brew update > /dev/null && brew install --quiet ccache boost-build;
travis_retry brew update > /dev/null && brew install ccache boost-build;
fi'
- 'if [[ $TRAVIS_OS_NAME == "osx" && "$python" == "1" ]]; then travis_retry brew update > /dev/null && brew install --quiet boost-python; fi'
- 'if [[ $TRAVIS_OS_NAME == "osx" && "$python" == "1" ]]; then travis_retry brew install boost-python; fi'
- 'if [ "$docs" = "1" ]; then
travis_retry brew install --quiet docutils;
travis_retry brew install docutils;
mkdir -p /Users/travis/Library/Python/2.7/lib/python/site-packages;
echo ''import site; site.addsitedir("/usr/local/lib/python2.7/site-packages")'' >> /Users/travis/Library/Python/2.7/lib/python/site-packages/homebrew.pth;
sudo easy_install Pygments;
sudo easy_install -U aafigure;
travis_retry brew install --quiet graphviz;
travis_retry brew install --quiet Homebrew/python/pillow;
travis_retry brew install graphviz;
travis_retry brew install Homebrew/python/pillow;
fi'
- if [ "$coverage" == "1" ]; then
@ -101,7 +101,10 @@ install:
- 'if [[ $toolset == "gcc-arm" ]]; then
echo "using gcc : arm : ccache armv8l-linux-gnueabihf-g++ : <cxxflags>\"-std=c++11 -fsigned-char -march=armv8-a+crc -mfpu=crypto-neon-fp-armv8 -DTORRENT_FORCE_ARM_CRC32\" <linkflags>-lm ;" >> ~/user-config.jam;
fi;'
- 'echo "using darwin : : ccache clang++ : <cxxflags>-std=c++11 ;" >> ~/user-config.jam'
- 'echo "using darwin : : ccache clang++ :
<cxxflags>-I/usr/local/opt/openssl/include
<linkflags>-L/usr/local/opt/openssl/lib
<cxxflags>-std=c++11 ;" >> ~/user-config.jam'
- 'echo "using python : 2.7 ;" >> ~/user-config.jam'
- if [ "$docs" == "1" ]; then rst2html.py --version; fi
- 'if [ "$lint" == "1" ]; then curl "https://raw.githubusercontent.com/google/styleguide/71ec7f1e524969c19ce33cfc72e8e023f2b98ee2/cpplint/cpplint.py" >~/cpplint.py; fi'

1
Jamfile
View File

@ -27,7 +27,6 @@ if $(BOOST_ROOT)
else
{
local boost-lib-search-path =
<search>/usr/lib
<search>/usr/local/lib
;