[svn] commit: r2939 - in /branches/trac302/src/bin/bind10: Makefile.am bind10.py.in
BIND 10 source code commits
bind10-changes at lists.isc.org
Thu Sep 16 13:21:24 UTC 2010
Author: jreed
Date: Thu Sep 16 13:21:23 2010
New Revision: 2939
Log:
For ticket #302.
This completes initial problem in ticket, but I will use this same branch
to do version for the rest too.
Update the version.
Remove "v" from start of version.
Also show the BIND 10 (suite) version too, for example:
t1:bind10$ ./run_bind10.sh --version
bind10 20100816 (BIND 10 20100701)
(Note in above example at the configure.ac version not bumped yet.)
Modified:
branches/trac302/src/bin/bind10/Makefile.am
branches/trac302/src/bin/bind10/bind10.py.in
Modified: branches/trac302/src/bin/bind10/Makefile.am
==============================================================================
--- branches/trac302/src/bin/bind10/Makefile.am (original)
+++ branches/trac302/src/bin/bind10/Makefile.am Thu Sep 16 13:21:23 2010
@@ -23,6 +23,7 @@
# this is done here since configure.ac AC_OUTPUT doesn't expand exec_prefix
bind10: bind10.py
$(SED) -e "s|@@PYTHONPATH@@|@pyexecdir@|" \
+ -e "s|@@PACKAGE_VERSION@@|$(PACKAGE_VERSION)|" \
-e "s|@@LIBEXECDIR@@|$(pkglibexecdir)|" bind10.py >$@
chmod a+x $@
Modified: branches/trac302/src/bin/bind10/bind10.py.in
==============================================================================
--- branches/trac302/src/bin/bind10/bind10.py.in (original)
+++ branches/trac302/src/bin/bind10/bind10.py.in Thu Sep 16 13:21:23 2010
@@ -65,7 +65,9 @@
import isc.cc
# This is the version that gets displayed to the user.
-__version__ = "v20100531"
+# The VERSION string consists of the module name, the module version
+# number, and the overall BIND 10 version number (set in configure.ac).
+VERSION = "bind10 20100816 (BIND 10 @@PACKAGE_VERSION@@)"
class RestartSchedule:
"""
@@ -627,7 +629,7 @@
# Parse any command-line options.
- parser = OptionParser(version=__version__)
+ parser = OptionParser(version=VERSION)
parser.add_option("-a", "--address", dest="address", type="string",
action="callback", callback=check_addr, default='',
help="address the b10-auth daemon will use (default: listen on all addresses)")
@@ -680,7 +682,7 @@
# Announce startup.
if options.verbose:
- sys.stdout.write("BIND 10 %s\n" % __version__)
+ sys.stdout.write("%s\n" % VERSION)
# TODO: set process name, perhaps by:
# http://code.google.com/p/procname/
More information about the bind10-changes
mailing list