wornvirtue
/
premiere-libtorrent
forked from premiere/premiere-libtorrent
1
0
Fork 0
Code Pull Requests Activity

fix build

This commit is contained in:
arvidn 2018-04-03 08:57:43 +02:00 committed by Arvid Norberg
parent 98d5313598
commit 7700cbb16d
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
.travis.yml
View File

@ -41,19 +41,15 @@ addons:
before_install: before_install:
- git submodule update --init --recursive - git submodule update --init --recursive
- if [ $TRAVIS_OS_NAME == "osx" ]; then brew update > /dev/null && brew install ccache boost-build; fi - if [ $TRAVIS_OS_NAME == "osx" ]; then brew update > /dev/null && brew install ccache boost-build; fi
- 'if [[ $TRAVIS_OS_NAME == "osx" ]]; then travis_retry brew install boost-python python2; fi'
# we have to use python from brew rather than the system provided python # we have to use python from brew rather than the system provided python
# because of OSX System Integrity Protection, which prevents injecting # because of OSX System Integrity Protection, which prevents injecting
# user-libraries (i.e. python modules) into system binaries (i.e. /usr/bin/python) # user-libraries (i.e. python modules) into system binaries (i.e. /usr/bin/python)
- 'if [[ $TRAVIS_OS_NAME == "osx" && $docs = "1" ]]; then - 'if [[ $TRAVIS_OS_NAME == "osx" && $docs = "1" ]]; then
easy_install --user docutils; pip install docutils;
mkdir -p /Users/travis/Library/Python/2.7/lib/python/site-packages; pip install Pygments;
echo ''import site; site.addsitedir("/usr/local/lib/python2.7/site-packages")'' >> /Users/travis/Library/Python/2.7/lib/python/site-packages/homebrew.pth;
easy_install --user Pygments;
easy_install --user aafigure;
brew install graphviz hunspell; brew install graphviz hunspell;
easy_install --user Pillow;
fi' fi'
- 'if [[ $TRAVIS_OS_NAME == "osx" ]]; then travis_retry brew install boost-python python2; fi'
# disable simulations on OSX for now. It hangs on travis # disable simulations on OSX for now. It hangs on travis
- if [ $TRAVIS_OS_NAME == "osx" ]; then export toolset="darwin-${lang}"; fi - if [ $TRAVIS_OS_NAME == "osx" ]; then export toolset="darwin-${lang}"; fi
@ -106,7 +102,7 @@ install:
;" >>~/user-config.jam' ;" >>~/user-config.jam'
- 'echo "using python : 2.7 ;" >> ~/user-config.jam' - 'echo "using python : 2.7 ;" >> ~/user-config.jam'
- ccache -V && ccache --show-stats && ccache --zero-stats - ccache -V && ccache --show-stats && ccache --zero-stats
- if [[ $docs == "1" && $TRAVIS_OS_NAME == "osx" ]]; then /Users/travis/Library/Python/2.7/bin/rst2html.py --version; fi - if [[ $docs == "1" && $TRAVIS_OS_NAME == "osx" ]]; then rst2html.py --version; fi
- cat ~/user-config.jam - cat ~/user-config.jam
- which python2 - which python2
@ -114,7 +110,7 @@ install:
script: script:
# disable invoking docutils for now, until we can have a modern version of it # disable invoking docutils for now, until we can have a modern version of it
- cd docs - cd docs
- if [[ $docs == "1" && $TRAVIS_OS_NAME == "osx" ]]; then make spell-check RST2HTML=/Users/travis/Library/Python/2.7/bin/rst2html.py AAFIGURE=echo; fi - if [[ $docs == "1" && $TRAVIS_OS_NAME == "osx" ]]; then make spell-check RST2HTML=rst2html.py AAFIGURE=echo; fi
- cd .. - cd ..
- cd test - cd test