forked from premiere/premiere-libtorrent
Merge pull request #156 from arvidn/simplify-appveyor
remove one appveyor build configuration and simplify the script a bit
This commit is contained in:
Arvid Norberg
commit
d00e47954e
|
|
@ -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;
|
||||
|
|
|
|||
32
appveyor.yml
32
appveyor.yml
|
|
@ -9,40 +9,28 @@ environment:
|
|||
- variant: test_debug
|
||||
compiler: msvc-14.0
|
||||
sim: 1
|
||||
linkflags32: '"/LIBPATH:C:\\openssl-1.0.1p-vs2015\\lib"'
|
||||
linkflags64: '"/LIBPATH:C:\\openssl-1.0.1p-vs2015\\lib64"'
|
||||
linkflags: '"/LIBPATH:C:\\openssl-1.0.1p-vs2015\\lib"'
|
||||
include: '"c:\\openssl-1.0.1p-vs2015\\include"'
|
||||
- variant: test_debug
|
||||
compiler: msvc-12.0
|
||||
x64: 1
|
||||
linkflags32: '"/LIBPATH:C:\\openssl-1.0.1p-vs2013\\lib"'
|
||||
linkflags64: '"/LIBPATH:C:\\openssl-1.0.1p-vs2013\\lib64"'
|
||||
linkflags: '"/LIBPATH:C:\\openssl-1.0.1p-vs2013\\lib64"'
|
||||
include: '"c:\\openssl-1.0.1p-vs2013\\include"'
|
||||
- variant: test_debug
|
||||
compiler: msvc-12.0
|
||||
linkflags32: '"/LIBPATH:C:\\openssl-1.0.1p-vs2013\\lib"'
|
||||
linkflags64: '"/LIBPATH:C:\\openssl-1.0.1p-vs2013\\lib64"'
|
||||
linkflags: '"/LIBPATH:C:\\openssl-1.0.1p-vs2013\\lib"'
|
||||
include: '"c:\\openssl-1.0.1p-vs2013\\include"'
|
||||
- variant: test_debug
|
||||
compiler: msvc-10.0
|
||||
linkflags32: '"/LIBPATH:C:\\openssl-1.0.1p-vs2010\\lib"'
|
||||
linkflags64: '"/LIBPATH:C:\\openssl-1.0.1p-vs2010\\lib64"'
|
||||
linkflags: '"/LIBPATH:C:\\openssl-1.0.1p-vs2010\\lib"'
|
||||
include: '"c:\\openssl-1.0.1p-vs2010\\include"'
|
||||
- variant: test_barebones
|
||||
compiler: msvc-12.0
|
||||
linkflags32: '"/LIBPATH:C:\\openssl-1.0.1p-vs2013\\lib"'
|
||||
linkflags64: '"/LIBPATH:C:\\openssl-1.0.1p-vs2013\\lib64"'
|
||||
include: '"c:\\openssl-1.0.1p-vs2013\\include"'
|
||||
- variant: test_barebones
|
||||
compiler: msvc-12.0
|
||||
x64: 1
|
||||
linkflags32: '"/LIBPATH:C:\\openssl-1.0.1p-vs2013\\lib"'
|
||||
linkflags64: '"/LIBPATH:C:\\openssl-1.0.1p-vs2013\\lib64"'
|
||||
linkflags: '"/LIBPATH:C:\\openssl-1.0.1p-vs2013\\lib"'
|
||||
include: '"c:\\openssl-1.0.1p-vs2013\\include"'
|
||||
- variant: test_release
|
||||
compiler: msvc-12.0
|
||||
linkflags32: '"/LIBPATH:C:\\openssl-1.0.1p-vs2013\\lib"'
|
||||
linkflags64: '"/LIBPATH:C:\\openssl-1.0.1p-vs2013\\lib64"'
|
||||
linkflags: '"/LIBPATH:C:\\openssl-1.0.1p-vs2013\\lib"'
|
||||
include: '"c:\\openssl-1.0.1p-vs2013\\include"'
|
||||
|
||||
# mingw and boost.random don't like each other. Comment this back in once there
|
||||
|
|
@ -121,13 +109,13 @@ cache:
|
|||
build_script:
|
||||
- cd %ROOT_DIRECTORY%\test
|
||||
- if defined x64 (
|
||||
b2.exe --hash -j2 address-model=64 win-tests %compiler% variant=%variant% link=shared linkflags=%linkflags64% include=%include%
|
||||
b2.exe --hash -j2 address-model=64 win-tests %compiler% variant=%variant% link=shared linkflags=%linkflags% include=%include%
|
||||
) else (
|
||||
b2.exe --hash -j2 address-model=32 win-tests %compiler% variant=%variant% link=shared linkflags=%linkflags32% include=%include%
|
||||
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 (
|
||||
|
|
|
|||
|
|
@ -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 ;
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
;
|
||||
|
|
|
|||
Loading…
Reference in New Issue