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

fix typos in appveyor.yml. attempt to cut down build times

This commit is contained in:
arvidn 2015-09-11 23:13:27 -04:00
parent e2f4cc131d
commit bdb2801c10
4 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -63,9 +63,9 @@ script:
- cd test
- bjam --hash -j3 warnings-as-errors=on variant=$variant -l900 $toolset $target
- cd ../examples
- bjam --hash -j3 warnings-as-errors=on variant=$variant $toolset
- bjam --hash -j3 warnings-as-errors=on variant=$variant $toolset link=shared
- cd ../bindings/python
- bjam --hash -j3 warnings-as-errors=on variant=$variant $toolset stage_module
- bjam --hash -j3 warnings-as-errors=on variant=$variant $toolset stage_module libtorrent-link=shared
- LD_LIBRARY_PATH=. DYLD_LIBRARY_PATH=. python test.py
- if [ $sim = "1" ]; then
cd ../../simulation;

4
appveyor.yml
View File

@ -113,9 +113,9 @@ build_script:
) else (
b2.exe --hash -j2 address-model=32 win-tests %compiler% variant=%variant% link=shared linkflags=%linkflags% include=%include%
& cd %ROOT_DIRECTORY%\examples
& b2.exe --hash -j2 %compiler% variant=%variant% linkflags=%linkflags32% include=%include%
& b2.exe --hash -j2 %compiler% variant=%variant% linkflags=%linkflags% include=%include% link=shared
& cd %ROOT_DIRECTORY%\bindings\python
& b2.exe --hash -j2 %compiler% stage_module variant=%variant% linkflags=%linkflags32% include=%include%
& b2.exe --hash -j2 %compiler% stage_module variant=%variant% libtorrent-link=shared linkflags=%linkflags% include=%include%
& python test.py
)
- if defined sim (

18
bindings/python/Jamfile
View File

@ -9,7 +9,7 @@ use-project /torrent : ../.. ;
BOOST_ROOT = [ modules.peek : BOOST_ROOT ] ;
feature visibility : default hidden : composite propagated link-incompatible ;
feature visibility : default hidden : composite ;
feature.compose <visibility>hidden : <cflags>-fvisibility=hidden <cxxflags>-fvisibility-inlines-hidden ;
feature libtorrent-link : shared static : composite propagated ;
@ -93,11 +93,11 @@ rule libtorrent_linking ( properties * )
if <libtorrent-link>shared in $(properties)
{
result += <library>/torrent//torrent/<link>shared/<boost-link>shared ;
result += <library>/torrent//torrent/<link>shared ;
}
else
{
result += <library>/torrent//torrent/<link>static/<boost-link>static ;
result += <library>/torrent//torrent/<link>static ;
}
return $(result) ;
@ -149,7 +149,7 @@ my-python-extension py_libtorrent
<include>src
<toolset>gcc:<cxxflags>-Wno-deprecated-declarations
<toolset>darwin:<cxxflags>-Wno-deprecated-declarations
<toolset>darwin:<cxxflags>-Wno-unused-command-line-argument
<toolset>darwin:<cxxflags>-Wno-unused-command-line-argument
<conditional>@libtorrent_linking
: # usage-requirements
<conditional>@libtorrent_linking
@ -157,11 +157,11 @@ my-python-extension py_libtorrent
;
install stage_module
: py_libtorrent
: <location>.
<install-dependencies>on
<install-type>LIB
;
: py_libtorrent
: <location>.
<install-dependencies>on
<install-type>LIB
;
explicit stage_module ;

7
test/Jamfile
View File

@ -38,12 +38,12 @@ rule link_libtorrent ( properties * )
if <link>shared in $(properties)
{
result +=
<library>/torrent//torrent/<link>shared/<logging>on/<boost-link>shared/<export-extra>on ;
<library>/torrent//torrent/<link>shared/<logging>on/<boost-link>shared/<export-extra>on/<debug-iterators>on ;
}
else
{
result +=
<library>/torrent//torrent/<link>static/<logging>on/<boost-link>static/<export-extra>on ;
<library>/torrent//torrent/<link>static/<logging>on/<boost-link>static/<export-extra>on/<debug-iterators>on ;
}
return $(result) ;
}
@ -70,6 +70,7 @@ lib libtorrent_test
<target-os>windows:<library>advapi32
<conditional>@link_libtorrent
<toolset>darwin:<cflags>-Wno-unused-command-line-argument
<debug-iterators>on
: # default build
<link>shared
@ -77,6 +78,7 @@ lib libtorrent_test
: # user-requirements
<link>shared:<define>TORRENT_LINK_TEST_SHARED
<debug-iterators>on
<logging>on
<include>.
;
@ -93,7 +95,6 @@ project
: default-build
<threading>multi
<invariant-checks>full
<debug-iterators>on
<link>shared
<picker-debugging>on
;