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

use LD_LIBRARY_PATH to try to make the python test find libtorrent.so

This commit is contained in:
arvidn 2015-07-27 08:14:43 -07:00
parent 29c618c3e5
commit edf5e5eefc
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -30,8 +30,6 @@ addons:
- python2.7-dev
install:
#- if [ $TRAVIS_OS_NAME == "linux" ]; then sudo add-apt-repository -y ppa:boost-latest/ppa; sudo apt-get update -qq; fi
#- if [ $TRAVIS_OS_NAME == "linux" ]; then sudo apt-get install libboost1.54-all-dev python2.7-dev; fi
- if [ $TRAVIS_OS_NAME == "osx" ]; then sudo brew install boost boost-build python27-dev; fi
- 'echo "using gcc : : ccache g++ ;" > ~/user-config.jam'
- 'echo "using clang : : ccache clang++ ;" >> ~/user-config.jam'
@ -47,5 +45,5 @@ script:
- bjam -j 3 variant=$variant warnings=off $CC
- cd ../bindings/python
- bjam -j 3 variant=$variant warnings=off $CC stage_module
- python test.py
- LD_LIBRARY_PATH=. python test.py
- ccache --show-stats

4
bindings/python/setup.py
View File

@ -71,7 +71,7 @@ if '--bjam' in sys.argv or ldflags == None or extra_cmd == None:
parallel_builds = ' -j%d' % multiprocessing.cpu_count()
# build libtorrent using bjam and build the installer with distutils
cmdline = 'b2 boost=source link=static boost-link=static release optimization=space stage_module --abbreviate-paths' + toolset + parallel_builds
cmdline = 'b2 boost=source libtorrent-link=static boost-link=static release optimization=space stage_module --abbreviate-paths' + toolset + parallel_builds
print(cmdline)
if os.system(cmdline) != 0:
print('build failed')
@ -85,7 +85,7 @@ if '--bjam' in sys.argv or ldflags == None or extra_cmd == None:
except: pass
try: os.mkdir('libtorrent')
except: pass
shutil.copyfile('libtorrent' + file_ext, 'build/lib/libtorrent' + file_ext)
shutil.copyfile('py_libtorrent' + file_ext, 'build/lib/libtorrent' + file_ext)
packages = ['libtorrent']