parent
12cb3cc60e
commit
7446a88425
|
@ -15,8 +15,7 @@ matrix:
|
||||||
- os: osx
|
- os: osx
|
||||||
osx_image: xcode6.4
|
osx_image: xcode6.4
|
||||||
env: variant=test_barebones toolset=darwin
|
env: variant=test_barebones toolset=darwin
|
||||||
- sudo: required
|
- dist: trusty
|
||||||
dist: trusty
|
|
||||||
env: arch=arm toolset=gcc-arm
|
env: arch=arm toolset=gcc-arm
|
||||||
|
|
||||||
git:
|
git:
|
||||||
|
@ -29,8 +28,6 @@ branches:
|
||||||
- RC_1_1
|
- RC_1_1
|
||||||
- RC_1_0
|
- RC_1_0
|
||||||
|
|
||||||
# container-based builds
|
|
||||||
sudo: false
|
|
||||||
cache:
|
cache:
|
||||||
directories:
|
directories:
|
||||||
- $HOME/.ccache
|
- $HOME/.ccache
|
||||||
|
|
|
@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR)
|
||||||
|
|
||||||
project(libtorrent)
|
project(libtorrent)
|
||||||
set (SOVERSION "8")
|
set (SOVERSION "8")
|
||||||
set (VERSION "1.1.0")
|
set (VERSION "1.2.0")
|
||||||
|
|
||||||
list(APPEND CMAKE_MODULE_PATH ${libtorrent_SOURCE_DIR}/cmake/Modules)
|
list(APPEND CMAKE_MODULE_PATH ${libtorrent_SOURCE_DIR}/cmake/Modules)
|
||||||
|
|
||||||
|
|
2
Jamfile
2
Jamfile
|
@ -48,7 +48,7 @@ else
|
||||||
: : $(boost-include-path) ;
|
: : $(boost-include-path) ;
|
||||||
}
|
}
|
||||||
|
|
||||||
VERSION = 1.1.0 ;
|
VERSION = 1.2.0 ;
|
||||||
|
|
||||||
# rule for linking the correct libraries depending
|
# rule for linking the correct libraries depending
|
||||||
# on features and target-os
|
# on features and target-os
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
version: 1.0.{build}
|
version: "{build}"
|
||||||
branches:
|
branches:
|
||||||
only:
|
only:
|
||||||
- master
|
- master
|
||||||
|
@ -112,4 +112,3 @@ test_script:
|
||||||
- if defined sim (
|
- if defined sim (
|
||||||
b2.exe --hash warnings-as-errors=on -j2 %compiler% address-model=%model% debug-iterators=on picker-debugging=on invariant-checks=full variant=%variant% %linkflags% %include% link=shared crypto=built-in
|
b2.exe --hash warnings-as-errors=on -j2 %compiler% address-model=%model% debug-iterators=on picker-debugging=on invariant-checks=full variant=%variant% %linkflags% %include% link=shared crypto=built-in
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -120,7 +120,7 @@ else:
|
||||||
libraries = ['torrent-rasterbar'] + flags.libraries)]
|
libraries = ['torrent-rasterbar'] + flags.libraries)]
|
||||||
|
|
||||||
setup(name = 'python-libtorrent',
|
setup(name = 'python-libtorrent',
|
||||||
version = '1.1.0',
|
version = '1.2.0',
|
||||||
author = 'Arvid Norberg',
|
author = 'Arvid Norberg',
|
||||||
author_email = 'arvid@libtorrent.org',
|
author_email = 'arvid@libtorrent.org',
|
||||||
description = 'Python bindings for libtorrent-rasterbar',
|
description = 'Python bindings for libtorrent-rasterbar',
|
||||||
|
|
17
configure.ac
17
configure.ac
|
@ -5,7 +5,7 @@
|
||||||
|
|
||||||
AC_PREREQ([2.63])
|
AC_PREREQ([2.63])
|
||||||
|
|
||||||
AC_INIT([libtorrent-rasterbar],[1.1.0],[arvid@libtorrent.org],
|
AC_INIT([libtorrent-rasterbar],[1.2.0],[arvid@libtorrent.org],
|
||||||
[libtorrent-rasterbar],[http://www.libtorrent.org])
|
[libtorrent-rasterbar],[http://www.libtorrent.org])
|
||||||
AC_CONFIG_SRCDIR([src/torrent.cpp])
|
AC_CONFIG_SRCDIR([src/torrent.cpp])
|
||||||
AC_CONFIG_AUX_DIR([build-aux])
|
AC_CONFIG_AUX_DIR([build-aux])
|
||||||
|
@ -520,11 +520,6 @@ AM_CONDITIONAL([WITH_OPENSSL], [test "x$ARG_ENABLE_ENCRYPTION" = "xyes" -o "x$AR
|
||||||
# Other useful stuff
|
# Other useful stuff
|
||||||
###############################################################################
|
###############################################################################
|
||||||
|
|
||||||
# this works around a bug in asio in boost-1.39
|
|
||||||
# see: https://svn.boost.org/trac/boost/ticket/3095
|
|
||||||
AC_DEFINE([BOOST_ASIO_HASH_MAP_BUCKETS],[1021],[Define to fix a wrong behavior in boost 1.39.])
|
|
||||||
COMPILETIME_OPTIONS="$COMPILETIME_OPTIONS -DBOOST_ASIO_HASH_MAP_BUCKETS=1021 "
|
|
||||||
|
|
||||||
AC_DEFINE([BOOST_ASIO_HAS_STD_CHRONO],[1],[Define to make sure asio uses std::chrono.])
|
AC_DEFINE([BOOST_ASIO_HAS_STD_CHRONO],[1],[Define to make sure asio uses std::chrono.])
|
||||||
COMPILETIME_OPTIONS="$COMPILETIME_OPTIONS -DBOOST_ASIO_HAS_STD_CHRONO=1 "
|
COMPILETIME_OPTIONS="$COMPILETIME_OPTIONS -DBOOST_ASIO_HAS_STD_CHRONO=1 "
|
||||||
|
|
||||||
|
@ -549,10 +544,10 @@ AC_SUBST(PYTHON_INSTALL_PARAMS)
|
||||||
AC_SUBST(COMPILETIME_OPTIONS)
|
AC_SUBST(COMPILETIME_OPTIONS)
|
||||||
|
|
||||||
|
|
||||||
# Try to guess real svn revision if any, fallback to hardcoded otherwise
|
# Try to guess real git revision if any, fallback to hardcoded otherwise
|
||||||
SVN_REVISION=`svn info 2>/dev/null | sed -n -e '/^URL\:.*libtorrent.svn.sourceforge.net/,$!d;s,^Revision\: \([[0-9]]*\)$,\1,p'`
|
GIT_REVISION=`git log -1 --format=format:%h 2>/dev/null`
|
||||||
AS_IF([test -z "$SVN_REVISION"],
|
AS_IF([test -z "GIT_REVISION"],
|
||||||
[SVN_REVISION=`sed -n -e 's/^#define LIBTORRENT_REVISION \"\$Rev\: \([0-9]*\) \$\" $/\1/p' include/libtorrent/version.hpp`])
|
[GIT_REVISION=`sed -n -e 's/^#define LIBTORRENT_REVISION \"\([0-9a-z]*\)\"$/\1/p' include/libtorrent/version.hpp`])
|
||||||
|
|
||||||
|
|
||||||
###############################################################################
|
###############################################################################
|
||||||
|
@ -595,7 +590,7 @@ cat > config.report << END
|
||||||
Package:
|
Package:
|
||||||
name: ${PACKAGE_NAME}
|
name: ${PACKAGE_NAME}
|
||||||
version: ${PACKAGE_VERSION}
|
version: ${PACKAGE_VERSION}
|
||||||
svn revision: ${SVN_REVISION}
|
git revision: ${GIT_REVISION}
|
||||||
|
|
||||||
Build environment:
|
Build environment:
|
||||||
build system: ${build}
|
build system: ${build}
|
||||||
|
|
|
@ -3,7 +3,7 @@ libtorrent manual
|
||||||
=================
|
=================
|
||||||
|
|
||||||
:Author: Arvid Norberg, arvid@libtorrent.org
|
:Author: Arvid Norberg, arvid@libtorrent.org
|
||||||
:Version: 1.1.0
|
:Version: 1.2.0
|
||||||
|
|
||||||
.. contents:: Table of contents
|
.. contents:: Table of contents
|
||||||
:depth: 2
|
:depth: 2
|
||||||
|
|
|
@ -3,7 +3,7 @@ libtorrent manual
|
||||||
=================
|
=================
|
||||||
|
|
||||||
:Author: Arvid Norberg, arvid@libtorrent.org
|
:Author: Arvid Norberg, arvid@libtorrent.org
|
||||||
:Version: 1.1.0
|
:Version: 1.2.0
|
||||||
|
|
||||||
.. contents:: Table of contents
|
.. contents:: Table of contents
|
||||||
:depth: 2
|
:depth: 2
|
||||||
|
|
|
@ -3,7 +3,7 @@ BitTorrent extension for DHT RSS feeds
|
||||||
======================================
|
======================================
|
||||||
|
|
||||||
:Author: Arvid Norberg, arvid@libtorrent.org
|
:Author: Arvid Norberg, arvid@libtorrent.org
|
||||||
:Version: 1.1.0
|
:Version: 1.2.0
|
||||||
|
|
||||||
.. contents:: Table of contents
|
.. contents:: Table of contents
|
||||||
:depth: 2
|
:depth: 2
|
||||||
|
|
|
@ -3,7 +3,7 @@ BitTorrent DHT security extension
|
||||||
=================================
|
=================================
|
||||||
|
|
||||||
:Author: Arvid Norberg, arvid@libtorrent.org
|
:Author: Arvid Norberg, arvid@libtorrent.org
|
||||||
:Version: 1.1.0
|
:Version: 1.2.0
|
||||||
|
|
||||||
.. contents:: Table of contents
|
.. contents:: Table of contents
|
||||||
:depth: 2
|
:depth: 2
|
||||||
|
|
|
@ -3,7 +3,7 @@ BitTorrent extension for arbitrary DHT store
|
||||||
============================================
|
============================================
|
||||||
|
|
||||||
:Author: Arvid Norberg, arvid@libtorrent.org
|
:Author: Arvid Norberg, arvid@libtorrent.org
|
||||||
:Version: 1.1.0
|
:Version: 1.2.0
|
||||||
|
|
||||||
.. contents:: Table of contents
|
.. contents:: Table of contents
|
||||||
:depth: 2
|
:depth: 2
|
||||||
|
|
|
@ -3,7 +3,7 @@ libtorrent Examples
|
||||||
===================
|
===================
|
||||||
|
|
||||||
:Author: Arvid Norberg, arvid@libtorrent.org
|
:Author: Arvid Norberg, arvid@libtorrent.org
|
||||||
:Version: 1.1.0
|
:Version: 1.2.0
|
||||||
|
|
||||||
.. contents:: Table of contents
|
.. contents:: Table of contents
|
||||||
:depth: 2
|
:depth: 2
|
||||||
|
|
|
@ -3,7 +3,7 @@ libtorrent manual
|
||||||
=================
|
=================
|
||||||
|
|
||||||
:Author: Arvid Norberg, arvid@libtorrent.org
|
:Author: Arvid Norberg, arvid@libtorrent.org
|
||||||
:Version: 1.1.0
|
:Version: 1.2.0
|
||||||
|
|
||||||
.. contents:: Table of contents
|
.. contents:: Table of contents
|
||||||
:depth: 2
|
:depth: 2
|
||||||
|
|
|
@ -993,7 +993,7 @@ for cat in categories:
|
||||||
|
|
||||||
out.write('''
|
out.write('''
|
||||||
:Author: Arvid Norberg, arvid@libtorrent.org
|
:Author: Arvid Norberg, arvid@libtorrent.org
|
||||||
:Version: 1.1.0
|
:Version: 1.2.0
|
||||||
|
|
||||||
%s
|
%s
|
||||||
|
|
||||||
|
|
|
@ -3,7 +3,7 @@ libtorrent hacking
|
||||||
==================
|
==================
|
||||||
|
|
||||||
:Author: Arvid Norberg, arvid@libtorrent.org
|
:Author: Arvid Norberg, arvid@libtorrent.org
|
||||||
:Version: 1.1.0
|
:Version: 1.2.0
|
||||||
|
|
||||||
.. contents:: Table of contents
|
.. contents:: Table of contents
|
||||||
:depth: 2
|
:depth: 2
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
:Author: Arvid Norberg, arvid@libtorrent.org
|
:Author: Arvid Norberg, arvid@libtorrent.org
|
||||||
:Version: 1.1.0
|
:Version: 1.2.0
|
||||||
|
|
||||||
.. raw:: html
|
.. raw:: html
|
||||||
|
|
||||||
|
|
|
@ -3,7 +3,7 @@ libtorrent API Documentation
|
||||||
============================
|
============================
|
||||||
|
|
||||||
:Author: Arvid Norberg, arvid@libtorrent.org
|
:Author: Arvid Norberg, arvid@libtorrent.org
|
||||||
:Version: 1.1.0
|
:Version: 1.2.0
|
||||||
|
|
||||||
.. contents:: Table of contents
|
.. contents:: Table of contents
|
||||||
:depth: 1
|
:depth: 1
|
||||||
|
|
|
@ -3,7 +3,7 @@ libtorrent manual
|
||||||
=================
|
=================
|
||||||
|
|
||||||
:Author: Arvid Norberg, arvid@libtorrent.org
|
:Author: Arvid Norberg, arvid@libtorrent.org
|
||||||
:Version: 1.1.0
|
:Version: 1.2.0
|
||||||
|
|
||||||
.. contents:: Table of contents
|
.. contents:: Table of contents
|
||||||
:depth: 2
|
:depth: 2
|
||||||
|
|
|
@ -3,7 +3,7 @@ libtorrent manual
|
||||||
=================
|
=================
|
||||||
|
|
||||||
:Author: Arvid Norberg, arvid@libtorrent.org
|
:Author: Arvid Norberg, arvid@libtorrent.org
|
||||||
:Version: 1.1.0
|
:Version: 1.2.0
|
||||||
|
|
||||||
.. contents:: Table of contents
|
.. contents:: Table of contents
|
||||||
:depth: 2
|
:depth: 2
|
||||||
|
|
|
@ -3,7 +3,7 @@ libtorrent manual
|
||||||
=================
|
=================
|
||||||
|
|
||||||
:Author: Arvid Norberg, arvid@libtorrent.org
|
:Author: Arvid Norberg, arvid@libtorrent.org
|
||||||
:Version: 1.1.0
|
:Version: 1.2.0
|
||||||
|
|
||||||
.. contents:: Table of contents
|
.. contents:: Table of contents
|
||||||
:depth: 2
|
:depth: 2
|
||||||
|
|
|
@ -3,7 +3,7 @@ libtorrent manual
|
||||||
=================
|
=================
|
||||||
|
|
||||||
:Author: Arvid Norberg, arvid@libtorrent.org
|
:Author: Arvid Norberg, arvid@libtorrent.org
|
||||||
:Version: 1.1.0
|
:Version: 1.2.0
|
||||||
|
|
||||||
.. contents:: Table of contents
|
.. contents:: Table of contents
|
||||||
:depth: 2
|
:depth: 2
|
||||||
|
|
|
@ -36,15 +36,15 @@ POSSIBILITY OF SUCH DAMAGE.
|
||||||
#include "libtorrent/export.hpp"
|
#include "libtorrent/export.hpp"
|
||||||
|
|
||||||
#define LIBTORRENT_VERSION_MAJOR 1
|
#define LIBTORRENT_VERSION_MAJOR 1
|
||||||
#define LIBTORRENT_VERSION_MINOR 1
|
#define LIBTORRENT_VERSION_MINOR 2
|
||||||
#define LIBTORRENT_VERSION_TINY 0
|
#define LIBTORRENT_VERSION_TINY 0
|
||||||
|
|
||||||
// the format of this version is: MMmmtt
|
// the format of this version is: MMmmtt
|
||||||
// M = Major version, m = minor version, t = tiny version
|
// M = Major version, m = minor version, t = tiny version
|
||||||
#define LIBTORRENT_VERSION_NUM ((LIBTORRENT_VERSION_MAJOR * 10000) + (LIBTORRENT_VERSION_MINOR * 100) + LIBTORRENT_VERSION_TINY)
|
#define LIBTORRENT_VERSION_NUM ((LIBTORRENT_VERSION_MAJOR * 10000) + (LIBTORRENT_VERSION_MINOR * 100) + LIBTORRENT_VERSION_TINY)
|
||||||
|
|
||||||
#define LIBTORRENT_VERSION "1.1.0.0"
|
#define LIBTORRENT_VERSION "1.2.0.0"
|
||||||
#define LIBTORRENT_REVISION "044ee0f"
|
#define LIBTORRENT_REVISION "62cdec8"
|
||||||
|
|
||||||
namespace libtorrent {
|
namespace libtorrent {
|
||||||
|
|
||||||
|
|
|
@ -141,7 +141,7 @@ namespace libtorrent
|
||||||
SET_NOPREV(proxy_username, "", &session_impl::update_proxy),
|
SET_NOPREV(proxy_username, "", &session_impl::update_proxy),
|
||||||
SET_NOPREV(proxy_password, "", &session_impl::update_proxy),
|
SET_NOPREV(proxy_password, "", &session_impl::update_proxy),
|
||||||
SET_NOPREV(i2p_hostname, "", &session_impl::update_i2p_bridge),
|
SET_NOPREV(i2p_hostname, "", &session_impl::update_i2p_bridge),
|
||||||
SET_NOPREV(peer_fingerprint, "-LT1100-", &session_impl::update_peer_fingerprint)
|
SET_NOPREV(peer_fingerprint, "-LT1200-", &session_impl::update_peer_fingerprint)
|
||||||
};
|
};
|
||||||
|
|
||||||
bool_setting_entry_t bool_settings[settings_pack::num_bool_settings] =
|
bool_setting_entry_t bool_settings[settings_pack::num_bool_settings] =
|
||||||
|
|
Loading…
Reference in New Issue