From 33943f718459f039cf2eb80c735b684f7974aca1 Mon Sep 17 00:00:00 2001 From: Arvid Norberg Date: Sat, 29 Sep 2012 21:30:40 +0000 Subject: [PATCH] merged set_version fix --- CMakeLists.txt | 2 +- Jamfile | 2 +- configure.ac | 2 +- docs/auth.rst | 2 +- docs/building.rst | 2 +- docs/contributing.rst | 2 +- docs/dht_rss.rst | 2 +- docs/dht_sec.rst | 2 +- docs/dht_store.rst | 2 +- docs/features.rst | 2 +- docs/hacking.rst | 2 +- docs/make_torrent.rst | 2 +- docs/manual.rst | 2 +- docs/tuning.rst | 2 +- docs/utp.rst | 2 +- include/libtorrent/version.hpp | 4 ++-- set_version.py | 11 +++-------- 17 files changed, 20 insertions(+), 25 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a391232f8..1cebb85c6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -244,7 +244,7 @@ set_target_properties(torrent-rasterbar PROPERTIES SOVERSION 1 VERSION 1) -set (VERSION "0.16.1") +set (VERSION "0.16.4") get_property (COMPILETIME_OPTIONS_LIST DIRECTORY ${CMAKE_CURRENT_SOURCE_DIRECTORY} diff --git a/Jamfile b/Jamfile index e038368f4..2dae70652 100755 --- a/Jamfile +++ b/Jamfile @@ -23,7 +23,7 @@ if $(BOOST_ROOT) use-project /boost : $(BOOST_ROOT) ; } -VERSION = 0.16.1 ; +VERSION = 0.16.4 ; # rule for linking the correct libraries depending # on features and target-os diff --git a/configure.ac b/configure.ac index 3ece674fc..3fe21a423 100644 --- a/configure.ac +++ b/configure.ac @@ -5,7 +5,7 @@ AC_PREREQ([2.63]) -AC_INIT([libtorrent-rasterbar],[0.16.1],[arvid@cs.umu.se], +AC_INIT([libtorrent-rasterbar],[0.16.4],[arvid@cs.umu.se], [libtorrent-rasterbar],[http://www.libtorrent.org]) AC_CONFIG_SRCDIR([src/torrent.cpp]) AC_CONFIG_AUX_DIR([build-aux]) diff --git a/docs/auth.rst b/docs/auth.rst index eadc9543e..3d140b748 100644 --- a/docs/auth.rst +++ b/docs/auth.rst @@ -3,7 +3,7 @@ BitTorrent authentication extension =================================== :Author: Arvid Norberg, arvid@rasterbar.com -:Version: Draft +:Version: 0.16.4 .. contents:: Table of contents :depth: 2 diff --git a/docs/building.rst b/docs/building.rst index f2881e2e7..1e8c9cde4 100644 --- a/docs/building.rst +++ b/docs/building.rst @@ -3,7 +3,7 @@ libtorrent manual ================= :Author: Arvid Norberg, arvid@rasterbar.com -:Version: 0.16.1 +:Version: 0.16.4 .. contents:: Table of contents :depth: 2 diff --git a/docs/contributing.rst b/docs/contributing.rst index 64d63a234..706a58fbb 100644 --- a/docs/contributing.rst +++ b/docs/contributing.rst @@ -3,7 +3,7 @@ libtorrent manual ================= :Author: Arvid Norberg, arvid@rasterbar.com -:Version: 0.16.1 +:Version: 0.16.4 .. contents:: Table of contents :depth: 2 diff --git a/docs/dht_rss.rst b/docs/dht_rss.rst index 2a52249d5..9eadffba5 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@rasterbar.com -:Version: Draft +:Version: 0.16.4 .. contents:: Table of contents :depth: 2 diff --git a/docs/dht_sec.rst b/docs/dht_sec.rst index df5290dc5..a4e1fffb7 100644 --- a/docs/dht_sec.rst +++ b/docs/dht_sec.rst @@ -3,7 +3,7 @@ BitTorrent DHT security extension ================================= :Author: Arvid Norberg, arvid@rasterbar.com -:Version: Draft +:Version: 0.16.4 .. contents:: Table of contents :depth: 2 diff --git a/docs/dht_store.rst b/docs/dht_store.rst index 723ab2724..a256c9722 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@rasterbar.com -:Version: Draft +:Version: 0.16.4 .. contents:: Table of contents :depth: 2 diff --git a/docs/features.rst b/docs/features.rst index 7c5e3212c..7b814b0c2 100644 --- a/docs/features.rst +++ b/docs/features.rst @@ -3,7 +3,7 @@ libtorrent manual ================= :Author: Arvid Norberg, arvid@rasterbar.com -:Version: 0.16.1 +:Version: 0.16.4 .. contents:: Table of contents :depth: 2 diff --git a/docs/hacking.rst b/docs/hacking.rst index 4435d2fd6..cdd7b0a55 100644 --- a/docs/hacking.rst +++ b/docs/hacking.rst @@ -3,7 +3,7 @@ libtorrent hacking ================== :Author: Arvid Norberg, arvid@rasterbar.com -:Version: 0.16.1 +:Version: 0.16.4 .. contents:: Table of contents :depth: 2 diff --git a/docs/make_torrent.rst b/docs/make_torrent.rst index a66ae4415..445d63345 100644 --- a/docs/make_torrent.rst +++ b/docs/make_torrent.rst @@ -3,7 +3,7 @@ creating torrents ================= :Author: Arvid Norberg, arvid@rasterbar.com -:Version: 0.16.1 +:Version: 0.16.4 .. contents:: Table of contents :depth: 2 diff --git a/docs/manual.rst b/docs/manual.rst index 64ac5acd1..2be74a88e 100644 --- a/docs/manual.rst +++ b/docs/manual.rst @@ -3,7 +3,7 @@ libtorrent API Documentation ============================ :Author: Arvid Norberg, arvid@rasterbar.com -:Version: 0.16.1 +:Version: 0.16.4 .. contents:: Table of contents :depth: 1 diff --git a/docs/tuning.rst b/docs/tuning.rst index 5fe363d55..c10696d3f 100644 --- a/docs/tuning.rst +++ b/docs/tuning.rst @@ -3,7 +3,7 @@ libtorrent manual ================= :Author: Arvid Norberg, arvid@rasterbar.com -:Version: 0.16.1 +:Version: 0.16.4 .. contents:: Table of contents :depth: 2 diff --git a/docs/utp.rst b/docs/utp.rst index 7f424a2e3..1d02aa0d5 100644 --- a/docs/utp.rst +++ b/docs/utp.rst @@ -3,7 +3,7 @@ libtorrent manual ================= :Author: Arvid Norberg, arvid@rasterbar.com -:Version: 0.16.1 +:Version: 0.16.4 .. contents:: Table of contents :depth: 2 diff --git a/include/libtorrent/version.hpp b/include/libtorrent/version.hpp index b9adafa0e..978b760e3 100644 --- a/include/libtorrent/version.hpp +++ b/include/libtorrent/version.hpp @@ -35,13 +35,13 @@ POSSIBILITY OF SUCH DAMAGE. #define LIBTORRENT_VERSION_MAJOR 0 #define LIBTORRENT_VERSION_MINOR 16 -#define LIBTORRENT_VERSION_TINY 1 +#define LIBTORRENT_VERSION_TINY 4 // 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 "0.16.1.0" +#define LIBTORRENT_VERSION "0.16.4.0" #define LIBTORRENT_REVISION "$Rev$" #endif diff --git a/set_version.py b/set_version.py index 7c6abc2db..b983a30c0 100644 --- a/set_version.py +++ b/set_version.py @@ -1,6 +1,7 @@ #! /usr/bin/env python import os import sys +import glob version = (int(sys.argv[1]), int(sys.argv[2]), int(sys.argv[3]), int(sys.argv[4])) @@ -34,14 +35,8 @@ def substitute_file(name): substitute_file('include/libtorrent/version.hpp') substitute_file('CMakeLists.txt') substitute_file('configure.ac') -substitute_file('docs/manual.rst') -substitute_file('docs/building.rst') -substitute_file('docs/features.rst') -substitute_file('docs/contributing.rst') -substitute_file('docs/utp.rst') -substitute_file('docs/make_torrent.rst') -substitute_file('docs/tuning.rst') -substitute_file('docs/hacking.rst') +for i in glob.glob('docs/*.rst'): + substitute_file(i) substitute_file('Jamfile')