forked from premiere/premiere-libtorrent
use gcc on linux and clang on osx
This commit is contained in:
parent
379fd8ce81
commit
b45c585a78
35
.travis.yml
35
.travis.yml
|
@ -1,15 +1,15 @@
|
|||
language: cpp
|
||||
|
||||
os:
|
||||
- linux
|
||||
# - osx
|
||||
# - linux
|
||||
- osx
|
||||
|
||||
env:
|
||||
- variant=test_debug cc=gcc-cpp11 sim=1
|
||||
- variant=test_debug cc=clang-cpp11 sim=0
|
||||
- variant=test_debug cc=gcc-cpp98 sim=0
|
||||
- variant=test_release cc=gcc-cpp11 sim=0
|
||||
- variant=test_barebones cc=gcc-cpp11 sim=0
|
||||
- variant=test_debug lang=cpp11 sim=1
|
||||
# - variant=test_debug lang=cpp11 sim=0
|
||||
# - variant=test_debug lang=cpp98 sim=0
|
||||
# - variant=test_release lang=cpp11 sim=0
|
||||
# - variant=test_barebones lang=cpp11 sim=0
|
||||
|
||||
git:
|
||||
submodules: false
|
||||
|
@ -40,26 +40,33 @@ addons:
|
|||
|
||||
before_install:
|
||||
- git submodule update --init --recursive
|
||||
- if [ $TRAVIS_OS_NAME == "osx" ]; then brew install --quiet ccache boost-build boost-python; fi
|
||||
- if [ $TRAVIS_OS_NAME == "osx" ]; then export toolset="darwin-${lang}"; fi
|
||||
- if [ $TRAVIS_OS_NAME == "linux" ]; then export toolset="gcc-${lang}"; fi
|
||||
|
||||
install:
|
||||
- 'echo "using toolset: " ${toolset}'
|
||||
- 'echo "using gcc : cpp11 : ccache g++-4.8 : <cflags>-std=c11 <cxxflags>-std=c++11 ;" > ~/user-config.jam'
|
||||
- 'echo "using gcc : cpp98 : ccache g++-4.8 : <cflags>-std=c99 <cxxflags>-std=c++98 ;" >> ~/user-config.jam'
|
||||
- 'echo "using clang : cpp11 : ccache clang++ : <cflags>-std=c11 <cxxflags>-std=c++11 ;" >> ~/user-config.jam'
|
||||
- 'echo "using clang : cpp98 : ccache clang++ : <cflags>-std=c99 <cxxflags>-std=c++98 ;" >> ~/user-config.jam'
|
||||
# osx builds need to disable the deprecated warning because of the openssl
|
||||
# shipping with the system having marked all functions as deprecated. Since
|
||||
# we're building with -Werror, we can't have those warnings
|
||||
- 'echo "using darwin : cpp11 : ccache clang++ : <cflags>-std=c11 <cxxflags>-std=c++11 <compileflags>-Wno-deprecated-declarations ;" >> ~/user-config.jam'
|
||||
- 'echo "using darwin : cpp98 : ccache clang++ : <cflags>-std=c99 <cxxflags>-std=c++98 <compileflags>-Wno-deprecated-declarations ;" >> ~/user-config.jam'
|
||||
- 'echo "using python : 2.7 ;" >> ~/user-config.jam'
|
||||
- ccache -V && ccache --show-stats && ccache --zero-stats
|
||||
|
||||
script:
|
||||
- cd test
|
||||
- bjam --hash -j3 warnings-as-errors=on variant=$variant -l900 $CC
|
||||
- bjam --hash -j3 warnings-as-errors=on variant=$variant -l900 $toolset
|
||||
- cd ../examples
|
||||
- bjam --hash -j3 warnings-as-errors=on variant=$variant $CC
|
||||
- bjam --hash -j3 warnings-as-errors=on variant=$variant $toolset
|
||||
- cd ../bindings/python
|
||||
- bjam --hash -j3 warnings-as-errors=on variant=$variant $CC stage_module
|
||||
- LD_LIBRARY_PATH=. python test.py
|
||||
- bjam --hash -j3 warnings-as-errors=on variant=$variant $toolset stage_module
|
||||
- LD_LIBRARY_PATH=. DYLD_LIBRARY_PATH=. python test.py
|
||||
- if [ $sim ]; then
|
||||
cd ../../simulation;
|
||||
bjam --hash -j3 crypto=built-in $CC;
|
||||
bjam --hash -j3 crypto=built-in $toolset;
|
||||
fi
|
||||
- ccache --show-stats
|
||||
|
||||
|
|
|
@ -213,7 +213,7 @@ namespace libtorrent {
|
|||
// hidden
|
||||
virtual ~alert();
|
||||
#if __cplusplus >= 201103L
|
||||
alert(alert const& st) = default;
|
||||
alert(alert const&) = default;
|
||||
#endif
|
||||
|
||||
// a timestamp is automatically created in the constructor
|
||||
|
|
|
@ -173,8 +173,8 @@ namespace libtorrent
|
|||
cached_piece_entry();
|
||||
~cached_piece_entry();
|
||||
#if __cplusplus >= 201103L
|
||||
cached_piece_entry(cached_piece_entry const& st) = default;
|
||||
cached_piece_entry& operator=(cached_piece_entry const& st) = default;
|
||||
cached_piece_entry(cached_piece_entry const&) = default;
|
||||
cached_piece_entry& operator=(cached_piece_entry const&) = default;
|
||||
#endif
|
||||
|
||||
bool ok_to_evict(bool ignore_hash = false) const
|
||||
|
|
|
@ -512,8 +512,8 @@ namespace libtorrent
|
|||
virtual const char* what() const TORRENT_EXCEPTION_THROW_SPECIFIER;
|
||||
virtual ~libtorrent_exception() TORRENT_EXCEPTION_THROW_SPECIFIER;
|
||||
#if __cplusplus >= 201103L
|
||||
libtorrent_exception(libtorrent_exception const& st) = default;
|
||||
libtorrent_exception& operator=(libtorrent_exception const& st) = default;
|
||||
libtorrent_exception(libtorrent_exception const&) = default;
|
||||
libtorrent_exception& operator=(libtorrent_exception const&) = default;
|
||||
#endif
|
||||
error_code error() const { return m_error; }
|
||||
private:
|
||||
|
|
|
@ -61,8 +61,8 @@ namespace libtorrent
|
|||
// hidden
|
||||
~file_entry();
|
||||
#if __cplusplus >= 201103L
|
||||
file_entry(file_entry const& st) = default;
|
||||
file_entry& operator=(file_entry const& st) = default;
|
||||
file_entry(file_entry const&) = default;
|
||||
file_entry& operator=(file_entry const&) = default;
|
||||
#endif
|
||||
|
||||
// the full path of this file. The paths are unicode strings
|
||||
|
|
|
@ -47,8 +47,8 @@ namespace libtorrent
|
|||
{
|
||||
socket_job() : type(none), vec(NULL), recv_buf(NULL), buf_size(0) {}
|
||||
#if __cplusplus >= 201103L
|
||||
socket_job(socket_job const& st) = default;
|
||||
socket_job& operator=(socket_job const& st) = default;
|
||||
socket_job(socket_job const&) = default;
|
||||
socket_job& operator=(socket_job const&) = default;
|
||||
#endif
|
||||
|
||||
enum job_type_t
|
||||
|
|
|
@ -52,8 +52,8 @@ namespace libtorrent
|
|||
{
|
||||
feed_item();
|
||||
#if __cplusplus >= 201103L
|
||||
feed_item(feed_item const& st) = default;
|
||||
feed_item & operator=(feed_item const& st) = default;
|
||||
feed_item(feed_item const&) = default;
|
||||
feed_item & operator=(feed_item const&) = default;
|
||||
#endif
|
||||
~feed_item();
|
||||
|
||||
|
|
|
@ -126,8 +126,8 @@ namespace libtorrent
|
|||
session_proxy() {}
|
||||
~session_proxy();
|
||||
#if __cplusplus >= 201103L
|
||||
session_proxy(session_proxy const& st) = default;
|
||||
session_proxy& operator=(session_proxy const& st) = default;
|
||||
session_proxy(session_proxy const&) = default;
|
||||
session_proxy& operator=(session_proxy const&) = default;
|
||||
#endif
|
||||
private:
|
||||
session_proxy(
|
||||
|
|
|
@ -60,8 +60,8 @@ namespace libtorrent
|
|||
LIBTORRENT_VERSION);
|
||||
~session_settings();
|
||||
#if __cplusplus >= 201103L
|
||||
session_settings(session_settings const& st) = default;
|
||||
session_settings& operator=(session_settings const& st) = default;
|
||||
session_settings(session_settings const&) = default;
|
||||
session_settings& operator=(session_settings const&) = default;
|
||||
#endif
|
||||
|
||||
// automatically set to the libtorrent version you're using in order to
|
||||
|
|
|
@ -253,7 +253,7 @@ namespace libtorrent
|
|||
{ if (!t.m_torrent.expired()) m_torrent = t.m_torrent; }
|
||||
|
||||
#if __cplusplus >= 201103L
|
||||
torrent_handle& operator=(torrent_handle const& st) = default;
|
||||
torrent_handle& operator=(torrent_handle const&) = default;
|
||||
#endif
|
||||
|
||||
// flags for add_piece().
|
||||
|
@ -1261,8 +1261,8 @@ namespace libtorrent
|
|||
torrent_status();
|
||||
~torrent_status();
|
||||
#if __cplusplus >= 201103L
|
||||
torrent_status(torrent_status const& st) = default;
|
||||
torrent_status& operator=(torrent_status const& st) = default;
|
||||
torrent_status(torrent_status const&) = default;
|
||||
torrent_status& operator=(torrent_status const&) = default;
|
||||
#endif
|
||||
|
||||
// compres if the torrent status objects come from the same torrent. i.e.
|
||||
|
|
|
@ -84,8 +84,8 @@ namespace libtorrent
|
|||
announce_entry();
|
||||
~announce_entry();
|
||||
#if __cplusplus >= 201103L
|
||||
announce_entry(announce_entry const& st) = default;
|
||||
announce_entry& operator=(announce_entry const& st) = default;
|
||||
announce_entry(announce_entry const&) = default;
|
||||
announce_entry& operator=(announce_entry const&) = default;
|
||||
#endif
|
||||
|
||||
// tracker URL as it appeared in the torrent file
|
||||
|
|
|
@ -295,8 +295,8 @@ private:
|
|||
magic = 0;
|
||||
}
|
||||
#if __cplusplus >= 201103L
|
||||
rootdevice(rootdevice const& st) = default;
|
||||
rootdevice& operator=(rootdevice const& st) = default;
|
||||
rootdevice(rootdevice const&) = default;
|
||||
rootdevice& operator=(rootdevice const&) = default;
|
||||
#endif
|
||||
#endif
|
||||
|
||||
|
|
|
@ -1277,7 +1277,9 @@ void block_cache::insert_blocks(cached_piece_entry* pe, int block, file::iovec_t
|
|||
#endif
|
||||
if (ret != KERN_SUCCESS || (state & VM_PURGABLE_EMPTY))
|
||||
{
|
||||
fprintf(stderr, "insert_blocks(piece=%d block=%d): vm_purgable_control failed: %d state & VM_PURGABLE_EMPTY: %d\n"
|
||||
fprintf(stderr, "insert_blocks(piece=%d block=%d):
|
||||
vm_purgable_control failed: %d state & VM_PURGABLE_EMPTY: %"
|
||||
PRIx64 "\n"
|
||||
, pe->piece, block, ret, state & VM_PURGABLE_EMPTY);
|
||||
free_buffer(pe->blocks[block].buf);
|
||||
pe->blocks[block].buf = NULL;
|
||||
|
@ -1326,7 +1328,9 @@ bool block_cache::inc_block_refcount(cached_piece_entry* pe, int block, int reas
|
|||
#endif
|
||||
if (ret != KERN_SUCCESS || (state & VM_PURGABLE_EMPTY))
|
||||
{
|
||||
fprintf(stderr, "inc_block_refcount(piece=%d block=%d): vm_purgable_control failed: %d state & VM_PURGABLE_EMPTY: %d\n"
|
||||
fprintf(stderr, "inc_block_refcount(piece=%d block=%d): "
|
||||
"vm_purgable_control failed: %d state & VM_PURGABLE_EMPTY: %"
|
||||
PRIx64 "\n"
|
||||
, pe->piece, block, ret, state & VM_PURGABLE_EMPTY);
|
||||
|
||||
free_buffer(pe->blocks[block].buf);
|
||||
|
@ -1392,7 +1396,9 @@ void block_cache::dec_block_refcount(cached_piece_entry* pe, int block, int reas
|
|||
#endif
|
||||
if (ret != KERN_SUCCESS || (state & VM_PURGABLE_EMPTY))
|
||||
{
|
||||
fprintf(stderr, "dec_block_refcount(piece=%d block=%d): vm_purgable_control failed: %d state & VM_PURGABLE_EMPTY: %d\n"
|
||||
fprintf(stderr, "dec_block_refcount(piece=%d block=%d): "
|
||||
"vm_purgable_control failed: %d state & VM_PURGABLE_EMPTY: %"
|
||||
PRIx64 "\n"
|
||||
, pe->piece, block, ret, state & VM_PURGABLE_EMPTY);
|
||||
free_buffer(pe->blocks[block].buf);
|
||||
pe->blocks[block].buf = NULL;
|
||||
|
|
Loading…
Reference in New Issue