From 7446a884250a36fac835b983c2c36c83adeef3bc Mon Sep 17 00:00:00 2001 From: Alden Torres Date: Wed, 20 Jul 2016 14:29:24 -0400 Subject: [PATCH] version to 1.2 (#924) update version to 1.2 --- .travis.yml | 5 +---- CMakeLists.txt | 2 +- Jamfile | 2 +- appveyor.yml | 3 +-- bindings/python/setup.py | 2 +- configure.ac | 17 ++++++----------- docs/building.rst | 2 +- docs/contributing.rst | 2 +- docs/dht_rss.rst | 2 +- docs/dht_sec.rst | 2 +- docs/dht_store.rst | 2 +- docs/examples.rst | 2 +- docs/features.rst | 2 +- docs/gen_reference_doc.py | 2 +- docs/hacking.rst | 2 +- docs/index.rst | 2 +- docs/manual.rst | 2 +- docs/troubleshooting.rst | 2 +- docs/tuning.rst | 2 +- docs/tutorial.rst | 2 +- docs/utp.rst | 2 +- include/libtorrent/version.hpp | 6 +++--- src/settings_pack.cpp | 2 +- 23 files changed, 30 insertions(+), 39 deletions(-) diff --git a/.travis.yml b/.travis.yml index e0616ee06..80eafae2b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,8 +15,7 @@ matrix: - os: osx osx_image: xcode6.4 env: variant=test_barebones toolset=darwin - - sudo: required - dist: trusty + - dist: trusty env: arch=arm toolset=gcc-arm git: @@ -29,8 +28,6 @@ branches: - RC_1_1 - RC_1_0 -# container-based builds -sudo: false cache: directories: - $HOME/.ccache diff --git a/CMakeLists.txt b/CMakeLists.txt index 431e4a3c5..b334065bc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR) project(libtorrent) set (SOVERSION "8") -set (VERSION "1.1.0") +set (VERSION "1.2.0") list(APPEND CMAKE_MODULE_PATH ${libtorrent_SOURCE_DIR}/cmake/Modules) diff --git a/Jamfile b/Jamfile index d1f4eb46f..6dfccb12c 100644 --- a/Jamfile +++ b/Jamfile @@ -48,7 +48,7 @@ else : : $(boost-include-path) ; } -VERSION = 1.1.0 ; +VERSION = 1.2.0 ; # rule for linking the correct libraries depending # on features and target-os diff --git a/appveyor.yml b/appveyor.yml index ae066648b..bd6f051ac 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -version: 1.0.{build} +version: "{build}" branches: only: - master @@ -112,4 +112,3 @@ test_script: - 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 ) - diff --git a/bindings/python/setup.py b/bindings/python/setup.py index 4a7e1afea..deec0492e 100644 --- a/bindings/python/setup.py +++ b/bindings/python/setup.py @@ -120,7 +120,7 @@ else: libraries = ['torrent-rasterbar'] + flags.libraries)] setup(name = 'python-libtorrent', - version = '1.1.0', + version = '1.2.0', author = 'Arvid Norberg', author_email = 'arvid@libtorrent.org', description = 'Python bindings for libtorrent-rasterbar', diff --git a/configure.ac b/configure.ac index a3d6d2898..623cd72dc 100644 --- a/configure.ac +++ b/configure.ac @@ -5,7 +5,7 @@ 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]) AC_CONFIG_SRCDIR([src/torrent.cpp]) 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 ############################################################################### -# 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.]) COMPILETIME_OPTIONS="$COMPILETIME_OPTIONS -DBOOST_ASIO_HAS_STD_CHRONO=1 " @@ -549,10 +544,10 @@ AC_SUBST(PYTHON_INSTALL_PARAMS) AC_SUBST(COMPILETIME_OPTIONS) -# Try to guess real svn 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'` -AS_IF([test -z "$SVN_REVISION"], - [SVN_REVISION=`sed -n -e 's/^#define LIBTORRENT_REVISION \"\$Rev\: \([0-9]*\) \$\" $/\1/p' include/libtorrent/version.hpp`]) +# Try to guess real git revision if any, fallback to hardcoded otherwise +GIT_REVISION=`git log -1 --format=format:%h 2>/dev/null` +AS_IF([test -z "GIT_REVISION"], + [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: name: ${PACKAGE_NAME} version: ${PACKAGE_VERSION} - svn revision: ${SVN_REVISION} + git revision: ${GIT_REVISION} Build environment: build system: ${build} diff --git a/docs/building.rst b/docs/building.rst index ee2797ccb..dc20f5936 100644 --- a/docs/building.rst +++ b/docs/building.rst @@ -3,7 +3,7 @@ libtorrent manual ================= :Author: Arvid Norberg, arvid@libtorrent.org -:Version: 1.1.0 +:Version: 1.2.0 .. contents:: Table of contents :depth: 2 diff --git a/docs/contributing.rst b/docs/contributing.rst index 35307c9e2..3ce81a836 100644 --- a/docs/contributing.rst +++ b/docs/contributing.rst @@ -3,7 +3,7 @@ libtorrent manual ================= :Author: Arvid Norberg, arvid@libtorrent.org -:Version: 1.1.0 +:Version: 1.2.0 .. contents:: Table of contents :depth: 2 diff --git a/docs/dht_rss.rst b/docs/dht_rss.rst index a49876a56..6e4874363 100644 --- a/docs/dht_rss.rst +++ b/docs/dht_rss.rst @@ -3,7 +3,7 @@ BitTorrent extension for DHT RSS feeds ====================================== :Author: Arvid Norberg, arvid@libtorrent.org -:Version: 1.1.0 +:Version: 1.2.0 .. contents:: Table of contents :depth: 2 diff --git a/docs/dht_sec.rst b/docs/dht_sec.rst index 77fb7a010..7ed42de8f 100644 --- a/docs/dht_sec.rst +++ b/docs/dht_sec.rst @@ -3,7 +3,7 @@ BitTorrent DHT security extension ================================= :Author: Arvid Norberg, arvid@libtorrent.org -:Version: 1.1.0 +:Version: 1.2.0 .. contents:: Table of contents :depth: 2 diff --git a/docs/dht_store.rst b/docs/dht_store.rst index 5605a459a..809e3c25a 100644 --- a/docs/dht_store.rst +++ b/docs/dht_store.rst @@ -3,7 +3,7 @@ BitTorrent extension for arbitrary DHT store ============================================ :Author: Arvid Norberg, arvid@libtorrent.org -:Version: 1.1.0 +:Version: 1.2.0 .. contents:: Table of contents :depth: 2 diff --git a/docs/examples.rst b/docs/examples.rst index 9e153611a..a1bf459fd 100644 --- a/docs/examples.rst +++ b/docs/examples.rst @@ -3,7 +3,7 @@ libtorrent Examples =================== :Author: Arvid Norberg, arvid@libtorrent.org -:Version: 1.1.0 +:Version: 1.2.0 .. contents:: Table of contents :depth: 2 diff --git a/docs/features.rst b/docs/features.rst index a16d5a1b8..b6cc800bf 100644 --- a/docs/features.rst +++ b/docs/features.rst @@ -3,7 +3,7 @@ libtorrent manual ================= :Author: Arvid Norberg, arvid@libtorrent.org -:Version: 1.1.0 +:Version: 1.2.0 .. contents:: Table of contents :depth: 2 diff --git a/docs/gen_reference_doc.py b/docs/gen_reference_doc.py index 8863ccf38..a56f7266d 100644 --- a/docs/gen_reference_doc.py +++ b/docs/gen_reference_doc.py @@ -993,7 +993,7 @@ for cat in categories: out.write(''' :Author: Arvid Norberg, arvid@libtorrent.org -:Version: 1.1.0 +:Version: 1.2.0 %s diff --git a/docs/hacking.rst b/docs/hacking.rst index a3e414189..cc76ab322 100644 --- a/docs/hacking.rst +++ b/docs/hacking.rst @@ -3,7 +3,7 @@ libtorrent hacking ================== :Author: Arvid Norberg, arvid@libtorrent.org -:Version: 1.1.0 +:Version: 1.2.0 .. contents:: Table of contents :depth: 2 diff --git a/docs/index.rst b/docs/index.rst index cb816b59d..e08b5d39f 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -1,5 +1,5 @@ :Author: Arvid Norberg, arvid@libtorrent.org -:Version: 1.1.0 +:Version: 1.2.0 .. raw:: html diff --git a/docs/manual.rst b/docs/manual.rst index 19cd29fec..b0a0868db 100644 --- a/docs/manual.rst +++ b/docs/manual.rst @@ -3,7 +3,7 @@ libtorrent API Documentation ============================ :Author: Arvid Norberg, arvid@libtorrent.org -:Version: 1.1.0 +:Version: 1.2.0 .. contents:: Table of contents :depth: 1 diff --git a/docs/troubleshooting.rst b/docs/troubleshooting.rst index 3166e5994..2b43d06d0 100644 --- a/docs/troubleshooting.rst +++ b/docs/troubleshooting.rst @@ -3,7 +3,7 @@ libtorrent manual ================= :Author: Arvid Norberg, arvid@libtorrent.org -:Version: 1.1.0 +:Version: 1.2.0 .. contents:: Table of contents :depth: 2 diff --git a/docs/tuning.rst b/docs/tuning.rst index 96c8cd164..38af97441 100644 --- a/docs/tuning.rst +++ b/docs/tuning.rst @@ -3,7 +3,7 @@ libtorrent manual ================= :Author: Arvid Norberg, arvid@libtorrent.org -:Version: 1.1.0 +:Version: 1.2.0 .. contents:: Table of contents :depth: 2 diff --git a/docs/tutorial.rst b/docs/tutorial.rst index eae609ac7..3d88381f1 100644 --- a/docs/tutorial.rst +++ b/docs/tutorial.rst @@ -3,7 +3,7 @@ libtorrent manual ================= :Author: Arvid Norberg, arvid@libtorrent.org -:Version: 1.1.0 +:Version: 1.2.0 .. contents:: Table of contents :depth: 2 diff --git a/docs/utp.rst b/docs/utp.rst index e8709b6c1..d4984aa97 100644 --- a/docs/utp.rst +++ b/docs/utp.rst @@ -3,7 +3,7 @@ libtorrent manual ================= :Author: Arvid Norberg, arvid@libtorrent.org -:Version: 1.1.0 +:Version: 1.2.0 .. contents:: Table of contents :depth: 2 diff --git a/include/libtorrent/version.hpp b/include/libtorrent/version.hpp index 3dafe18e1..f63e91974 100644 --- a/include/libtorrent/version.hpp +++ b/include/libtorrent/version.hpp @@ -36,15 +36,15 @@ POSSIBILITY OF SUCH DAMAGE. #include "libtorrent/export.hpp" #define LIBTORRENT_VERSION_MAJOR 1 -#define LIBTORRENT_VERSION_MINOR 1 +#define LIBTORRENT_VERSION_MINOR 2 #define LIBTORRENT_VERSION_TINY 0 // the format of this version is: MMmmtt // 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 "1.1.0.0" -#define LIBTORRENT_REVISION "044ee0f" +#define LIBTORRENT_VERSION "1.2.0.0" +#define LIBTORRENT_REVISION "62cdec8" namespace libtorrent { diff --git a/src/settings_pack.cpp b/src/settings_pack.cpp index 22417f101..31aa12a7c 100644 --- a/src/settings_pack.cpp +++ b/src/settings_pack.cpp @@ -141,7 +141,7 @@ namespace libtorrent SET_NOPREV(proxy_username, "", &session_impl::update_proxy), SET_NOPREV(proxy_password, "", &session_impl::update_proxy), 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] =