forked from premiere/premiere-libtorrent
only build libtorrent once (#737)
This commit is contained in:
parent
178a41b187
commit
432067bad3
|
@ -100,7 +100,7 @@ script:
|
|||
|
||||
- cd ../examples
|
||||
- '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'
|
||||
- cd ..
|
||||
|
||||
|
@ -109,12 +109,12 @@ script:
|
|||
# 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
|
||||
- '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'
|
||||
|
||||
- cd bindings/python
|
||||
- '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;
|
||||
fi'
|
||||
- cd ../..;
|
||||
|
|
|
@ -73,16 +73,16 @@ cache:
|
|||
build_script:
|
||||
# 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
|
||||
- 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
|
||||
- cd %ROOT_DIRECTORY%\bindings\python
|
||||
# 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
|
||||
- if defined sim (
|
||||
|
@ -93,7 +93,7 @@ build_script:
|
|||
test_script:
|
||||
- cd %ROOT_DIRECTORY%\test
|
||||
# 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
|
||||
# we use 64 bit python build
|
||||
- if defined python ( c:\Python35-x64\python.exe test.py )
|
||||
|
|
Loading…
Reference in New Issue