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

only build libtorrent once (#737)

This commit is contained in:
Arvid Norberg 2016-05-19 00:49:12 -04:00
parent 178a41b187
commit 432067bad3
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.travis.yml
View File

@ -100,7 +100,7 @@ script:
- cd ../examples - cd ../examples
- 'if [ "$variant" != "" ]; then - 'if [ "$variant" != "" ]; then
bjam --hash -j3 warnings-as-errors=on variant=$variant $toolset link=shared; bjam --hash -j3 warnings-as-errors=on variant=$variant picker-debugging=on $toolset link=shared;
fi' fi'
- cd .. - cd ..
@ -109,12 +109,12 @@ script:
# as the main library, so we cannot stage them to the same directory # as the main library, so we cannot stage them to the same directory
# here we specify the temporary lib dir as a path to look for the main library # here we specify the temporary lib dir as a path to look for the main library
- 'if [ "$variant" != "" ]; then - 'if [ "$variant" != "" ]; then
bjam --hash -j3 warnings-as-errors=on link=shared variant=$variant $toolset install location=./lib; bjam --hash -j3 warnings-as-errors=on picker-debugging=on link=shared variant=$variant $toolset install location=./lib;
fi' fi'
- cd bindings/python - cd bindings/python
- 'if [ "$variant" != "" ]; then - 'if [ "$variant" != "" ]; then
bjam --hash -j3 warnings-as-errors=on variant=$variant $toolset stage_module libtorrent-link=shared install-type=LIB dll-path=../../lib && bjam --hash -j3 warnings-as-errors=on variant=$variant picker-debugging=on $toolset stage_module libtorrent-link=shared install-type=LIB dll-path=../../lib &&
LD_LIBRARY_PATH=../../lib DYLD_LIBRARY_PATH=../../lib python test.py; LD_LIBRARY_PATH=../../lib DYLD_LIBRARY_PATH=../../lib python test.py;
fi' fi'
- cd ../..; - cd ../..;

8
appveyor.yml
View File

@ -73,16 +73,16 @@ cache:
build_script: build_script:
# examples # examples
- cd %ROOT_DIRECTORY%\examples - cd %ROOT_DIRECTORY%\examples
- b2.exe --hash warnings-as-errors=on -j2 %compiler% address-model=%model% variant=%variant% linkflags=%linkflags% include=%include% link=shared - b2.exe --hash warnings-as-errors=on -j2 %compiler% address-model=%model% variant=%variant% picker-debugging=on linkflags=%linkflags% include=%include% link=shared
# test # test
- cd %ROOT_DIRECTORY%\test - cd %ROOT_DIRECTORY%\test
- b2.exe --hash -j2 warnings-as-errors=on address-model=%model% win-tests %compiler% variant=%variant% link=shared linkflags=%linkflags% include=%include% testing.execute=off - b2.exe --hash -j2 warnings-as-errors=on address-model=%model% win-tests %compiler% variant=%variant% picker-debugging=on link=shared linkflags=%linkflags% include=%include% testing.execute=off
# python binding # python binding
- cd %ROOT_DIRECTORY%\bindings\python - cd %ROOT_DIRECTORY%\bindings\python
# we use 64 bit python builds # we use 64 bit python builds
- if defined python ( b2.exe --hash -j2 %compiler% address-model=%model% stage_module install-dependencies=on variant=%variant% libtorrent-link=shared linkflags=%linkflags% include=%include% ) - if defined python ( b2.exe --hash -j2 %compiler% address-model=%model% stage_module install-dependencies=on variant=%variant% picker-debugging=on libtorrent-link=shared linkflags=%linkflags% include=%include% )
# simulations # simulations
- if defined sim ( - if defined sim (
@ -93,7 +93,7 @@ build_script:
test_script: test_script:
- cd %ROOT_DIRECTORY%\test - cd %ROOT_DIRECTORY%\test
# mingw tests crash currently. needs resolving # mingw tests crash currently. needs resolving
- if not %compiler% == gcc ( b2.exe --hash -j2 address-model=%model% win-tests %compiler% variant=%variant% link=shared linkflags=%linkflags% include=%include% ) - if not %compiler% == gcc ( b2.exe --hash -j2 address-model=%model% win-tests %compiler% variant=%variant% picker-debugging=on link=shared linkflags=%linkflags% include=%include% )
- cd %ROOT_DIRECTORY%\bindings\python - cd %ROOT_DIRECTORY%\bindings\python
# we use 64 bit python build # we use 64 bit python build
- if defined python ( c:\Python35-x64\python.exe test.py ) - if defined python ( c:\Python35-x64\python.exe test.py )