This is the mail archive of the
binutils@sourceware.org
mailing list for the binutils project.
More pkgversion and bugurl followup
- From: "Joseph S. Myers" <joseph at codesourcery dot com>
- To: binutils at sourceware dot org
- Date: Tue, 20 Mar 2007 01:39:53 +0000 (UTC)
- Subject: More pkgversion and bugurl followup
This patch continues refining --with-bugurl and --with-pkgversion.
* The manuals now include the --with-pkgversion value alongside the
binutils version number, in a similar arrangement to that in --version
output. The gprof manual, previously not including a version number, now
has both version numbers.
* The --help output no longer includes the "URL:" prefix for the bug
reporting URLs, since that prefix is obsolescent as per RFC 3986:
The prefix "URL:" (with or without a trailing space) was formerly
recommended as a way to help distinguish a URI from other bracketed
designators, though it is not commonly used in practice and is no
longer recommended.
bfd:
2007-03-20 Joseph Myers <joseph@codesourcery.com>
* Makefile.am (bfdver.h): Only set VERSION_PACKAGE in bfdver.texi
if nonempty.
* configure.in (REPORT_BUGS_TO): Do not use "URL:" prefix.
* Makefile.in, configure, doc/Makefile.in: Regenerate.
binutils:
2007-03-20 Joseph Myers <joseph@codesourcery.com>
* doc/binutils.texi: Include VERSION_PACKAGE when reporting
version.
gas:
2007-03-20 Joseph Myers <joseph@codesourcery.com>
* doc/as.texinfo: Include VERSION_PACKAGE when reporting version.
gprof:
2007-03-20 Joseph Myers <joseph@codesourcery.com>
* Makefile.am (TEXI2POD): Include $(AM_MAKEINFOFLAGS).
(AM_MAKEINFOFLAGS, TEXI2DVI): Define with -I ../bfd/doc.
* Makefile.in: Regenerate.
* gprof.texi: Include bfdver.texi. Report both VERSION_PACKAGE
and VERSION.
ld:
2007-03-20 Joseph Myers <joseph@codesourcery.com>
* ld.texinfo: Include VERSION_PACKAGE when reporting version.
Index: bfd/Makefile.am
===================================================================
RCS file: /cvs/src/src/bfd/Makefile.am,v
retrieving revision 1.190
diff -u -r1.190 Makefile.am
--- bfd/Makefile.am 15 Mar 2007 14:17:14 -0000 1.190
+++ bfd/Makefile.am 20 Mar 2007 01:25:39 -0000
@@ -980,7 +980,9 @@
-e "s,@report_bugs_to@,$$report_bugs_to," \
< $(srcdir)/version.h > $@; \
echo "@set VERSION $(VERSION)" > doc/bfdver.texi; \
- echo "@set VERSION_PACKAGE $(PKGVERSION)" >> doc/bfdver.texi; \
+ if [ -n "$(PKGVERSION)" ]; then \
+ echo "@set VERSION_PACKAGE $(PKGVERSION)" >> doc/bfdver.texi; \
+ fi; \
echo "@set UPDATED `date '+%B %Y'`" >> doc/bfdver.texi; \
if [ -n "$(REPORT_BUGS_TEXI)" ]; then \
echo "@set BUGURL $(REPORT_BUGS_TEXI)" >> doc/bfdver.texi; \
Index: bfd/configure.in
===================================================================
RCS file: /cvs/src/src/bfd/configure.in,v
retrieving revision 1.224
diff -u -r1.224 configure.in
--- bfd/configure.in 15 Mar 2007 14:17:15 -0000 1.224
+++ bfd/configure.in 20 Mar 2007 01:25:41 -0000
@@ -85,11 +85,11 @@
no) REPORT_BUGS_TO="";
REPORT_BUGS_TEXI=""
;;
- *) REPORT_BUGS_TO="<URL:$withval>"
+ *) REPORT_BUGS_TO="<$withval>"
REPORT_BUGS_TEXI="@uref{`echo $withval | sed 's/@/@@/g'`}"
;;
esac],
- REPORT_BUGS_TO="<URL:http://www.sourceware.org/bugzilla/>"
+ REPORT_BUGS_TO="<http://www.sourceware.org/bugzilla/>"
REPORT_BUGS_TEXI="@uref{http://www.sourceware.org/bugzilla/}"
)
AC_SUBST(REPORT_BUGS_TO)
Index: binutils/doc/binutils.texi
===================================================================
RCS file: /cvs/src/src/binutils/doc/binutils.texi,v
retrieving revision 1.102
diff -u -r1.102 binutils.texi
--- binutils/doc/binutils.texi 15 Mar 2007 14:17:16 -0000 1.102
+++ binutils/doc/binutils.texi 20 Mar 2007 01:25:43 -0000
@@ -69,6 +69,9 @@
@titlepage
@finalout
@title The @sc{gnu} Binary Utilities
+@ifset VERSION_PACKAGE
+@subtitle @value{VERSION_PACKAGE}
+@end ifset
@subtitle Version @value{VERSION}
@sp 1
@subtitle @value{UPDATED}
@@ -100,7 +103,11 @@
@cindex version
This brief manual contains documentation for the @sc{gnu} binary
-utilities (collectively version @value{VERSION}):
+utilities
+@ifset VERSION_PACKAGE
+@value{VERSION_PACKAGE}
+@end ifset
+version @value{VERSION}:
@iftex
@table @code
Index: gas/doc/as.texinfo
===================================================================
RCS file: /cvs/src/src/gas/doc/as.texinfo,v
retrieving revision 1.159
diff -u -r1.159 as.texinfo
--- gas/doc/as.texinfo 15 Mar 2007 14:17:18 -0000 1.159
+++ gas/doc/as.texinfo 20 Mar 2007 01:25:44 -0000
@@ -127,6 +127,10 @@
@ifclear GENERIC
@subtitle for the @value{TARGET} family
@end ifclear
+@ifset VERSION_PACKAGE
+@sp 1
+@subtitle @value{VERSION_PACKAGE}
+@end ifset
@sp 1
@subtitle Version @value{VERSION}
@sp 1
@@ -170,8 +174,11 @@
@node Top
@top Using @value{AS}
-This file is a user guide to the @sc{gnu} assembler @command{@value{AS}} version
-@value{VERSION}.
+This file is a user guide to the @sc{gnu} assembler @command{@value{AS}}
+@ifset VERSION_PACKAGE
+@value{VERSION_PACKAGE}
+@end ifset
+version @value{VERSION}.
@ifclear GENERIC
This version of the file describes @command{@value{AS}} configured to generate
code for @value{TARGET} architectures.
Index: gprof/Makefile.am
===================================================================
RCS file: /cvs/src/src/gprof/Makefile.am,v
retrieving revision 1.33
diff -u -r1.33 Makefile.am
--- gprof/Makefile.am 15 Mar 2007 14:17:18 -0000 1.33
+++ gprof/Makefile.am 20 Mar 2007 01:25:45 -0000
@@ -56,7 +56,7 @@
MANCONF = -Dman
-TEXI2POD = perl $(srcdir)/../etc/texi2pod.pl
+TEXI2POD = perl $(srcdir)/../etc/texi2pod.pl $(AM_MAKEINFOFLAGS)
POD2MAN = pod2man --center="GNU" --release="binutils-$(VERSION)" --section=1
@@ -64,6 +64,9 @@
gprof_TEXINFOS = config.texi
man_MANS = gprof.1
+AM_MAKEINFOFLAGS = -I "$(srcdir)" -I ../bfd/doc
+TEXI2DVI = texi2dvi -I "$(srcdir)" -I ../bfd/doc
+
config.texi:
echo "@set top_srcdir $(top_srcdir)" >> ./config.texi
Index: gprof/gprof.texi
===================================================================
RCS file: /cvs/src/src/gprof/gprof.texi,v
retrieving revision 1.21
diff -u -r1.21 gprof.texi
--- gprof/gprof.texi 17 Oct 2006 16:19:19 -0000 1.21
+++ gprof/gprof.texi 20 Mar 2007 01:25:46 -0000
@@ -5,6 +5,10 @@
@settitle GNU gprof
@setchapternewpage odd
+@c man begin INCLUDE
+@include bfdver.texi
+@c man end
+
@ifinfo
@c This is a dir.info fragment to support semi-automated addition of
@c manuals to an info tree. zoo@cygnus.com is developing this facility.
@@ -45,6 +49,10 @@
@titlepage
@title GNU gprof
@subtitle The @sc{gnu} Profiler
+@ifset VERSION_PACKAGE
+@subtitle @value{VERSION_PACKAGE}
+@end ifset
+@subtitle Version @value{VERSION}
@author Jay Fenlason and Richard Stallman
@page
@@ -76,6 +84,12 @@
execution time. We assume that you know how to write, compile, and
execute programs. @sc{gnu} @code{gprof} was written by Jay Fenlason.
+This manual is for @code{gprof}
+@ifset VERSION_PACKAGE
+@value{VERSION_PACKAGE}
+@end ifset
+version @value{VERSION}.
+
This document is distributed under the terms of the GNU Free
Documentation License. A copy of the license is included in the
section entitled ``GNU Free Documentation License''.
Index: ld/ld.texinfo
===================================================================
RCS file: /cvs/src/src/ld/ld.texinfo,v
retrieving revision 1.186
diff -u -r1.186 ld.texinfo
--- ld/ld.texinfo 15 Mar 2007 14:17:20 -0000 1.186
+++ ld/ld.texinfo 20 Mar 2007 01:25:47 -0000
@@ -61,7 +61,11 @@
@end ifinfo
@ifinfo
-This file documents the @sc{gnu} linker LD version @value{VERSION}.
+This file documents the @sc{gnu} linker LD
+@ifset VERSION_PACKAGE
+@value{VERSION_PACKAGE}
+@end ifset
+version @value{VERSION}.
Copyright (C) 1991, 92, 93, 94, 95, 96, 97, 98, 99, 2000,
2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
@@ -89,7 +93,10 @@
@titlepage
@title The GNU linker
@sp 1
-@subtitle @code{ld} version 2
+@subtitle @code{ld}
+@ifset VERSION_PACKAGE
+@subtitle @value{VERSION_PACKAGE}
+@end ifset
@subtitle Version @value{VERSION}
@author Steve Chamberlain
@author Ian Lance Taylor
@@ -125,7 +132,11 @@
@ifnottex
@node Top
@top LD
-This file documents the @sc{gnu} linker ld version @value{VERSION}.
+This file documents the @sc{gnu} linker ld
+@ifset VERSION_PACKAGE
+@value{VERSION_PACKAGE}
+@end ifset
+version @value{VERSION}.
This document is distributed under the terms of the GNU Free
Documentation License. A copy of the license is included in the
--
Joseph S. Myers
joseph@codesourcery.com