merged set_version fix

This commit is contained in:
Arvid Norberg 2012-09-29 21:30:40 +00:00
parent f66bead74a
commit 33943f7184
17 changed files with 20 additions and 25 deletions

View File

@ -244,7 +244,7 @@ set_target_properties(torrent-rasterbar PROPERTIES
SOVERSION 1 SOVERSION 1
VERSION 1) VERSION 1)
set (VERSION "0.16.1") set (VERSION "0.16.4")
get_property (COMPILETIME_OPTIONS_LIST get_property (COMPILETIME_OPTIONS_LIST
DIRECTORY ${CMAKE_CURRENT_SOURCE_DIRECTORY} DIRECTORY ${CMAKE_CURRENT_SOURCE_DIRECTORY}

View File

@ -23,7 +23,7 @@ if $(BOOST_ROOT)
use-project /boost : $(BOOST_ROOT) ; use-project /boost : $(BOOST_ROOT) ;
} }
VERSION = 0.16.1 ; VERSION = 0.16.4 ;
# rule for linking the correct libraries depending # rule for linking the correct libraries depending
# on features and target-os # on features and target-os

View File

@ -5,7 +5,7 @@
AC_PREREQ([2.63]) 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]) [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])

View File

@ -3,7 +3,7 @@ BitTorrent authentication extension
=================================== ===================================
:Author: Arvid Norberg, arvid@rasterbar.com :Author: Arvid Norberg, arvid@rasterbar.com
:Version: Draft :Version: 0.16.4
.. contents:: Table of contents .. contents:: Table of contents
:depth: 2 :depth: 2

View File

@ -3,7 +3,7 @@ libtorrent manual
================= =================
:Author: Arvid Norberg, arvid@rasterbar.com :Author: Arvid Norberg, arvid@rasterbar.com
:Version: 0.16.1 :Version: 0.16.4
.. contents:: Table of contents .. contents:: Table of contents
:depth: 2 :depth: 2

View File

@ -3,7 +3,7 @@ libtorrent manual
================= =================
:Author: Arvid Norberg, arvid@rasterbar.com :Author: Arvid Norberg, arvid@rasterbar.com
:Version: 0.16.1 :Version: 0.16.4
.. contents:: Table of contents .. contents:: Table of contents
:depth: 2 :depth: 2

View File

@ -3,7 +3,7 @@ BitTorrent extension for DHT RSS feeds
====================================== ======================================
:Author: Arvid Norberg, arvid@rasterbar.com :Author: Arvid Norberg, arvid@rasterbar.com
:Version: Draft :Version: 0.16.4
.. contents:: Table of contents .. contents:: Table of contents
:depth: 2 :depth: 2

View File

@ -3,7 +3,7 @@ BitTorrent DHT security extension
================================= =================================
:Author: Arvid Norberg, arvid@rasterbar.com :Author: Arvid Norberg, arvid@rasterbar.com
:Version: Draft :Version: 0.16.4
.. contents:: Table of contents .. contents:: Table of contents
:depth: 2 :depth: 2

View File

@ -3,7 +3,7 @@ BitTorrent extension for arbitrary DHT store
============================================ ============================================
:Author: Arvid Norberg, arvid@rasterbar.com :Author: Arvid Norberg, arvid@rasterbar.com
:Version: Draft :Version: 0.16.4
.. contents:: Table of contents .. contents:: Table of contents
:depth: 2 :depth: 2

View File

@ -3,7 +3,7 @@ libtorrent manual
================= =================
:Author: Arvid Norberg, arvid@rasterbar.com :Author: Arvid Norberg, arvid@rasterbar.com
:Version: 0.16.1 :Version: 0.16.4
.. contents:: Table of contents .. contents:: Table of contents
:depth: 2 :depth: 2

View File

@ -3,7 +3,7 @@ libtorrent hacking
================== ==================
:Author: Arvid Norberg, arvid@rasterbar.com :Author: Arvid Norberg, arvid@rasterbar.com
:Version: 0.16.1 :Version: 0.16.4
.. contents:: Table of contents .. contents:: Table of contents
:depth: 2 :depth: 2

View File

@ -3,7 +3,7 @@ creating torrents
================= =================
:Author: Arvid Norberg, arvid@rasterbar.com :Author: Arvid Norberg, arvid@rasterbar.com
:Version: 0.16.1 :Version: 0.16.4
.. contents:: Table of contents .. contents:: Table of contents
:depth: 2 :depth: 2

View File

@ -3,7 +3,7 @@ libtorrent API Documentation
============================ ============================
:Author: Arvid Norberg, arvid@rasterbar.com :Author: Arvid Norberg, arvid@rasterbar.com
:Version: 0.16.1 :Version: 0.16.4
.. contents:: Table of contents .. contents:: Table of contents
:depth: 1 :depth: 1

View File

@ -3,7 +3,7 @@ libtorrent manual
================= =================
:Author: Arvid Norberg, arvid@rasterbar.com :Author: Arvid Norberg, arvid@rasterbar.com
:Version: 0.16.1 :Version: 0.16.4
.. contents:: Table of contents .. contents:: Table of contents
:depth: 2 :depth: 2

View File

@ -3,7 +3,7 @@ libtorrent manual
================= =================
:Author: Arvid Norberg, arvid@rasterbar.com :Author: Arvid Norberg, arvid@rasterbar.com
:Version: 0.16.1 :Version: 0.16.4
.. contents:: Table of contents .. contents:: Table of contents
:depth: 2 :depth: 2

View File

@ -35,13 +35,13 @@ POSSIBILITY OF SUCH DAMAGE.
#define LIBTORRENT_VERSION_MAJOR 0 #define LIBTORRENT_VERSION_MAJOR 0
#define LIBTORRENT_VERSION_MINOR 16 #define LIBTORRENT_VERSION_MINOR 16
#define LIBTORRENT_VERSION_TINY 1 #define LIBTORRENT_VERSION_TINY 4
// 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 "0.16.1.0" #define LIBTORRENT_VERSION "0.16.4.0"
#define LIBTORRENT_REVISION "$Rev$" #define LIBTORRENT_REVISION "$Rev$"
#endif #endif

View File

@ -1,6 +1,7 @@
#! /usr/bin/env python #! /usr/bin/env python
import os import os
import sys import sys
import glob
version = (int(sys.argv[1]), int(sys.argv[2]), int(sys.argv[3]), int(sys.argv[4])) 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('include/libtorrent/version.hpp')
substitute_file('CMakeLists.txt') substitute_file('CMakeLists.txt')
substitute_file('configure.ac') substitute_file('configure.ac')
substitute_file('docs/manual.rst') for i in glob.glob('docs/*.rst'):
substitute_file('docs/building.rst') substitute_file(i)
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')
substitute_file('Jamfile') substitute_file('Jamfile')