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

merged RC_1_1 into master

This commit is contained in:
arvidn 2017-06-17 11:41:06 -04:00
parent b80c477733 0810793372
commit 523313e72d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.travis.yml
View File

@ -59,13 +59,13 @@ before_install:
fi'
- 'if [[ $TRAVIS_OS_NAME == "osx" && "$python" == "1" ]]; then travis_retry brew install boost-python; fi'
- 'if [ "$docs" = "1" ]; then
travis_retry brew install docutils;
easy_install --user 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;
easy_install --user Pygments;
easy_install --user aafigure;
travis_retry brew install graphviz;
travis_retry brew install Homebrew/python/pillow;
easy_install --user Pillow;
fi'
- if [ "$coverage" == "1" ]; then
@ -106,7 +106,7 @@ install:
<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 [ "$docs" == "1" ]; then /Users/travis/Library/Python/2.7/bin/rst2html.py --version; fi
- 'if [ "$lint" == "1" ]; then curl "https://raw.githubusercontent.com/google/styleguide/71ec7f1e524969c19ce33cfc72e8e023f2b98ee2/cpplint/cpplint.py" >~/cpplint.py; fi'
- ccache -V
@ -134,7 +134,7 @@ script:
- cd docs
- 'if [ "$docs" == "1" ]; then
make RST2HTML=rst2html.py AAFIGURE=echo;
make RST2HTML=/Users/travis/Library/Python/2.7/bin/rst2html.py AAFIGURE=echo;
fi'
- cd ..