From 59e37cf109824742e72b93eb9d4d61c4620a12ac Mon Sep 17 00:00:00 2001 From: cristiangreco Date: Fri, 18 Sep 2009 18:44:12 +0000 Subject: [PATCH] more fixes to set_version.py due to the new configure script --- configure.ac | 3 ++- set_version.py | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index 4d2fc14ab..9b0e1d43f 100644 --- a/configure.ac +++ b/configure.ac @@ -5,7 +5,8 @@ AC_PREREQ([2.63]) -AC_INIT([libtorrent-rasterbar],[0.15.0],[arvid@cs.umu.se],[libtorrent-rasterbar],[http://www.libtorrent.org]) +AC_INIT([libtorrent-rasterbar],[0.15.0],[arvid@cs.umu.se], + [libtorrent-rasterbar],[http://www.libtorrent.org]) AC_CONFIG_SRCDIR([src/torrent.cpp]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/set_version.py b/set_version.py index 247b33d86..fe1235b6b 100644 --- a/set_version.py +++ b/set_version.py @@ -15,9 +15,9 @@ def substitute_file(name): l = '#define LIBTORRENT_VERSION_TINY %d\n' % version[2] elif '#define LIBTORRENT_VERSION' in l and name.endswith('.hpp'): l = '#define LIBTORRENT_VERSION "%d.%d.%d.%d"\n' % (version[0], version[1], version[2], version[3]) - elif 'AC_INIT([libtorrent-rasterbar]' in l and name.endswith('.in'): - l = 'AC_INIT([libtorrent-rasterbar], [%d.%d.%d], [arvid@cs.umu.se])\n' % (version[0], version[1], version[2]) - elif 'set (VERSION ' in l and name.endswith('.in'): + elif 'AC_INIT([libtorrent-rasterbar]' in l and name.endswith('.ac'): + l = 'AC_INIT([libtorrent-rasterbar],[%d.%d.%d],[arvid@cs.umu.se],\n' % (version[0], version[1], version[2]) + elif 'set (VERSION ' in l and name.endswith('.txt'): l = 'set (VERSION "%d.%d.%d")\n' % (version[0], version[1], version[2]) elif ':Version: ' in l and name.endswith('.rst'): l = ':Version: %d.%d.%d\n' % (version[0], version[1], version[2]) @@ -32,7 +32,7 @@ def substitute_file(name): substitute_file('include/libtorrent/version.hpp') substitute_file('CMakeLists.txt') -substitute_file('configure.in') +substitute_file('configure.ac') substitute_file('docs/manual.rst') substitute_file('docs/building.rst') substitute_file('docs/features.rst')