This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
--with-pkgversion --with-bugurl patch
- From: "Joseph S. Myers" <joseph at codesourcery dot com>
- To: gcc-patches at gcc dot gnu dot org
- Date: Fri, 17 Aug 2007 10:51:53 +0000 (UTC)
- Subject: --with-pkgversion --with-bugurl patch
This patch implements the --with-pkgversion and --with-bugurl
configure options, implementing the Stage 2 project
<http://gcc.gnu.org/wiki/ConfigVersion>. This is based on the
configure infrastructure in config/acx.m4 implemented as part of
adding this functionality to binutils; the toplevel changes mentioned
on that page also went in as part of adding it to binutils.
Note: this does not try to solve all the various --version problems
present (such as the format not corresponding to the rule that the
version number proper comes after the last space - the date and
"(experimental)" break that).
I've tried to ensure that the manual text makes sense both with the
default (GCC) as package version and with other package descriptions
substituted, but it is possible that improvements can be made (and
that the configure macros may end up providing more variants of the
package version). I removed the text describing copies of
bug-reporting instructions in the GCC distribution, and the script
support for adding such copies; apart from being inapplicable where
bugs are directed elsewhere, this is only relevant for the very
special case of a user wishing to report a bug who has the GCC source
but not a network connection. (Probably we could by now remove the
other copies of files from the website that go into releases as well.)
Bootstrapped with no regressions on i686-pc-linux-gnu. OK to commit?
gcc:
2007-08-17 Paul Brook <paul@codesourcery.com>
Nathan Sidwell <nathan@codesourcery.com>
Mark Mitchell <mark@codesourcery.com>
Joseph Myers <joseph@codesourcery.com>
* configure.ac: Add --with-pkgversion and --with-bugurl.
* configure: Regenerate.
* doc/install.texi: Document them.
* version.c (version_string): Remove VERSUFFIX.
(VERSUFFIX): Remove.
(pkgversion_string): New.
(bug_report_url): Do not hard-code initializer.
* version.h (pkgversion_string): Declare.
* Makefile.in (PKGVERSION_s, BUGURL_s, PKGVERSION, BUGURL_TEXI):
Define.
(version.o): Define PKGVERSION and BUGURL.
(gcc-vers.texi): Define VERSION_PACKAGE and BUGURL.
(%.pod): Define BUGURL.
* gcc.c (process_command, main): Use pkgversion_string.
* toplev.c (compile_file, print_version): Likewise.
* protoize.c (main): Likewise.
* gcov.c (print_version): Likewise. Update copyright date.
* gcov-dump.c (print_version): Likewise. Update copyright date.
* mips-tdump.c (main): Likewise. Update copyright date.
* mips-tfile.c (main): Likewise. Update copyright date.
* doc/include/gcc-common.texi: Include VERSION_PACKAGE as subtitle.
* doc/bugreport.texi: Use BUGURL for bug-reporting instructions;
shorten description.
* doc/gcc.texi: Include VERSION_PACKAGE in version description.
* doc/gccint.texi: Likewise.
* doc/invoke.texi: Use BUGURL for bug-reporting instructions.
Update copyright date.
gcc/fortran:
2007-08-17 Paul Brook <paul@codesourcery.com>
Nathan Sidwell <nathan@codesourcery.com>
Mark Mitchell <mark@codesourcery.com>
Joseph Myers <joseph@codesourcery.com>
* gfortranspec.c (lang_specific_driver): Use pkgversion_string.
* Make-lang.in (gfortran.pod): Define BUGURL.
* invoke.texi: Use BUGURL for bug-reporting instructions.
gcc/java:
2007-08-17 Paul Brook <paul@codesourcery.com>
Nathan Sidwell <nathan@codesourcery.com>
Mark Mitchell <mark@codesourcery.com>
Joseph Myers <joseph@codesourcery.com>
* jcf-dump.c (version): Use pkgversion_string. Update copyright
date.
gcc/treelang:
2007-08-17 Paul Brook <paul@codesourcery.com>
Nathan Sidwell <nathan@codesourcery.com>
Mark Mitchell <mark@codesourcery.com>
Joseph Myers <joseph@codesourcery.com>
* tree1.c (treelang_handle_option): Use pkgversion_string.
* treelang.texi (which-treelang): Define to use VERSION_PACKAGE.
maintainer-scripts:
2007-08-17 Paul Brook <paul@codesourcery.com>
Nathan Sidwell <nathan@codesourcery.com>
Mark Mitchell <mark@codesourcery.com>
Joseph Myers <joseph@codesourcery.com>
* gcc_release: Do not include copies of bugs.html in releases.
* update_web_docs_svn: Set VERSION_PACKAGE and BUGURL in
gcc-vers.texi.
Index: gcc/doc/gcc.texi
===================================================================
--- gcc/doc/gcc.texi (revision 127558)
+++ gcc/doc/gcc.texi (working copy)
@@ -41,7 +41,8 @@
@copying
Copyright @copyright{} 1988, 1989, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
-1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+2007 Free Software Foundation, Inc.
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.2 or
@@ -116,7 +117,11 @@
This manual documents how to use the GNU compilers,
as well as their features and incompatibilities, and how to report
-bugs. It corresponds to GCC version @value{version-GCC}.
+bugs. It corresponds to the compilers
+@ifset VERSION_PACKAGE
+@value{VERSION_PACKAGE}
+@end ifset
+version @value{version-GCC}.
The internals of the GNU compilers, including how to port them to new
targets and some information about how to write front ends for new
languages, are documented in a separate manual. @xref{Top,,
Index: gcc/doc/gccint.texi
===================================================================
--- gcc/doc/gccint.texi (revision 127558)
+++ gcc/doc/gccint.texi (working copy)
@@ -27,7 +27,8 @@
@copying
Copyright @copyright{} 1988, 1989, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
-1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+2007 Free Software Foundation, Inc.
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.2 or
@@ -77,8 +78,11 @@
This manual documents the internals of the GNU compilers, including
how to port them to new targets and some information about how to
-write front ends for new languages. It corresponds to GCC version
-@value{version-GCC}. The use of the GNU compilers is documented in a
+write front ends for new languages. It corresponds to the compilers
+@ifset VERSION_PACKAGE
+@value{VERSION_PACKAGE}
+@end ifset
+version @value{version-GCC}. The use of the GNU compilers is documented in a
separate manual. @xref{Top,, Introduction, gcc, Using the GNU
Compiler Collection (GCC)}.
Index: gcc/doc/bugreport.texi
===================================================================
--- gcc/doc/bugreport.texi (revision 127558)
+++ gcc/doc/bugreport.texi (working copy)
@@ -88,7 +88,4 @@
@section How and where to Report Bugs
@cindex compiler bugs, reporting
-Bugs should be reported to the GCC bug database. Please refer to
-@uref{http://gcc.gnu.org/bugs.html} for up-to-date instructions how to
-submit bug reports. Copies of this file in HTML (@file{bugs.html}) and
-plain text (@file{BUGS}) are also part of GCC releases.
+Bugs should be reported to the bug database at @value{BUGURL}.
Index: gcc/doc/include/gcc-common.texi
===================================================================
--- gcc/doc/include/gcc-common.texi (revision 127558)
+++ gcc/doc/include/gcc-common.texi (working copy)
@@ -1,4 +1,5 @@
-@c Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+@c Copyright (C) 2001, 2002, 2003, 2004, 2005,
+@c 2007 Free Software Foundation, Inc.
@c This is part of the GCC manual.
@c For copying conditions, see the file gcc.texi.
@@ -63,6 +64,10 @@
@ifset DEVELOPMENT
@subtitle For @sc{gcc} version @value{version-GCC} (pre-release)
@end ifset
+@ifset VERSION_PACKAGE
+@sp 1
+@subtitle @value{VERSION_PACKAGE}
+@end ifset
@c Even if there are no authors, the second titlepage line should be
@c forced to the bottom of the page.
@vskip 0pt plus 1filll
Index: gcc/doc/invoke.texi
===================================================================
--- gcc/doc/invoke.texi (revision 127558)
+++ gcc/doc/invoke.texi (working copy)
@@ -11,7 +11,8 @@
@c man begin COPYRIGHT
Copyright @copyright{} 1988, 1989, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
-1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+2007 Free Software Foundation, Inc.
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.2 or
@@ -54,7 +55,7 @@
@c man end
@c man begin BUGS
For instructions on reporting bugs, see
-@w{@uref{http://gcc.gnu.org/bugs.html}}.
+@w{@value{BUGURL}}.
@c man end
@c man begin AUTHOR
See the Info entry for @command{gcc}, or
Index: gcc/doc/install.texi
===================================================================
--- gcc/doc/install.texi (revision 127558)
+++ gcc/doc/install.texi (working copy)
@@ -581,7 +581,30 @@
% @var{srcdir}/configure [@var{options}] [@var{target}]
@end smallexample
+@heading Distributor options
+If you will be distributing binary versions of GCC, with modifications
+to the source code, you should use the options described in this
+section to make clear that your version contains modifications.
+
+@table @code
+@item --with-pkgversion=@var{version}
+Specify a string that identifies your package. You may wish
+to include a build number or build date. This version string will be
+included in the output of @command{gcc --version}. This suffix does
+not replace the default version string, only the @samp{GCC} part.
+
+The default value is @samp{GCC}.
+
+@item --with-bugurl=@var{url}
+Specify the URL that users should visit if they wish to report a bug.
+You are of course welcome to forward bugs reported to you to the FSF,
+if you determine that they are not bugs in your modifications.
+
+The default value refers to the FSF's GCC bug tracker.
+
+@end table
+
@heading Target specification
@itemize @bullet
@item
Index: gcc/java/jcf-dump.c
===================================================================
--- gcc/java/jcf-dump.c (revision 127558)
+++ gcc/java/jcf-dump.c (working copy)
@@ -1164,8 +1164,8 @@
static void
version (void)
{
- printf ("jcf-dump (GCC) %s\n\n", version_string);
- printf ("Copyright %s 2006 Free Software Foundation, Inc.\n", _("(C)"));
+ printf ("jcf-dump %s%s\n\n", pkgversion_string, version_string);
+ printf ("Copyright %s 2007 Free Software Foundation, Inc.\n", _("(C)"));
printf (_("This is free software; see the source for copying conditions. There is NO\n"
"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\n"));
exit (0);
Index: gcc/mips-tdump.c
===================================================================
--- gcc/mips-tdump.c (revision 127558)
+++ gcc/mips-tdump.c (working copy)
@@ -1410,8 +1410,8 @@
if (version)
{
- printf ("mips-tdump (GCC) %s\n", version_string);
- fputs ("Copyright (C) 2006 Free Software Foundation, Inc.\n", stdout);
+ printf ("mips-tdump %s%s\n", pkgversion_string, version_string);
+ fputs ("Copyright (C) 2007 Free Software Foundation, Inc.\n", stdout);
fputs ("This is free software; see the source for copying conditions. There is NO\n\
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\n",
stdout);
Index: gcc/mips-tfile.c
===================================================================
--- gcc/mips-tfile.c (revision 127558)
+++ gcc/mips-tfile.c (working copy)
@@ -4778,8 +4778,8 @@
if (version)
{
- printf (_("mips-tfile (GCC) %s\n"), version_string);
- fputs ("Copyright (C) 2006 Free Software Foundation, Inc.\n", stdout);
+ printf (_("mips-tfile %s%s\n"), pkgversion_string, version_string);
+ fputs ("Copyright (C) 2007 Free Software Foundation, Inc.\n", stdout);
fputs (_("This is free software; see the source for copying conditions. There is NO\n\
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\n"),
stdout);
Index: gcc/gcc.c
===================================================================
--- gcc/gcc.c (revision 127558)
+++ gcc/gcc.c (working copy)
@@ -3591,7 +3591,8 @@
else if (strcmp (argv[i], "-fversion") == 0)
{
/* translate_options () has turned --version into -fversion. */
- printf (_("%s (GCC) %s\n"), programname, version_string);
+ printf (_("%s %s%s\n"), programname, pkgversion_string,
+ version_string);
printf ("Copyright %s 2007 Free Software Foundation, Inc.\n",
_("(C)"));
fputs (_("This is free software; see the source for copying conditions. There is NO\n\
@@ -6509,10 +6510,10 @@
if (! strncmp (version_string, compiler_version, n)
&& compiler_version[n] == 0)
- notice ("gcc version %s\n", version_string);
+ notice ("gcc version %s %s\n", version_string, pkgversion_string);
else
- notice ("gcc driver version %s executing gcc version %s\n",
- version_string, compiler_version);
+ notice ("gcc driver version %s %sexecuting gcc version %s\n",
+ version_string, pkgversion_string, compiler_version);
if (n_infiles == 0)
return (0);
Index: gcc/gcov.c
===================================================================
--- gcc/gcov.c (revision 127558)
+++ gcc/gcov.c (working copy)
@@ -421,8 +421,8 @@
static void
print_version (void)
{
- fnotice (stdout, "gcov (GCC) %s\n", version_string);
- fprintf (stdout, "Copyright %s 2006 Free Software Foundation, Inc.\n",
+ fnotice (stdout, "gcov %s%s\n", pkgversion_string, version_string);
+ fprintf (stdout, "Copyright %s 2007 Free Software Foundation, Inc.\n",
_("(C)"));
fnotice (stdout,
_("This is free software; see the source for copying conditions.\n"
Index: gcc/toplev.c
===================================================================
--- gcc/toplev.c (revision 127558)
+++ gcc/toplev.c (working copy)
@@ -1103,8 +1103,14 @@
string is patterned after the ones produced by native SVR4 compilers. */
#ifdef IDENT_ASM_OP
if (!flag_no_ident)
- fprintf (asm_out_file, "%s\"GCC: (GNU) %s\"\n",
- IDENT_ASM_OP, version_string);
+ {
+ const char *pkg_version = "(GNU) ";
+
+ if (strcmp ("(GCC) ", pkgversion_string))
+ pkg_version = pkgversion_string;
+ fprintf (asm_out_file, "%s\"GCC: %s%s\"\n",
+ IDENT_ASM_OP, pkg_version, version_string);
+ }
#endif
/* This must be at the end. Some target ports emit end of file directives
@@ -1172,9 +1178,9 @@
{
static const char fmt1[] =
#ifdef __GNUC__
- N_("%s%s%s version %s (%s)\n%s\tcompiled by GNU C version %s, ")
+ N_("%s%s%s %sversion %s (%s)\n%s\tcompiled by GNU C version %s, ")
#else
- N_("%s%s%s version %s (%s) compiled by CC, ")
+ N_("%s%s%s %sversion %s (%s) compiled by CC, ")
#endif
;
static const char fmt2[] =
@@ -1189,7 +1195,7 @@
fprintf (file,
file == stderr ? _(fmt1) : fmt1,
indent, *indent != 0 ? " " : "",
- lang_hooks.name, version_string, TARGET_NAME,
+ lang_hooks.name, pkgversion_string, version_string, TARGET_NAME,
indent, __VERSION__);
/* We need to stringify the GMP macro values. Ugh, gmp_version has
Index: gcc/fortran/Make-lang.in
===================================================================
--- gcc/fortran/Make-lang.in (revision 127558)
+++ gcc/fortran/Make-lang.in (working copy)
@@ -176,7 +176,8 @@
.INTERMEDIATE: gfortran.pod
gfortran.pod: $(GFORTRAN_TEXI)
- -$(TEXI2POD) < $(srcdir)/fortran/invoke.texi > $@
+ -$(TEXI2POD) -DBUGURL="$(BUGURL_TEXI)" \
+ < $(srcdir)/fortran/invoke.texi > $@
# GFORTRAN internals documentation.
GFC_INTERNALS_TEXI = \
Index: gcc/fortran/invoke.texi
===================================================================
--- gcc/fortran/invoke.texi (revision 127558)
+++ gcc/fortran/invoke.texi (working copy)
@@ -50,7 +50,7 @@
@c man end
@c man begin BUGS
For instructions on reporting bugs, see
-@w{@uref{http://gcc.gnu.org/bugs.html}}.
+@w{@value{BUGURL}}.
@c man end
@c man begin AUTHOR
See the Info entry for @command{gfortran} for contributors to GCC and
Index: gcc/fortran/gfortranspec.c
===================================================================
--- gcc/fortran/gfortranspec.c (revision 127558)
+++ gcc/fortran/gfortranspec.c (working copy)
@@ -375,7 +375,7 @@
break;
case OPTION_version:
- printf ("GNU Fortran (GCC) %s\n", version_string);
+ printf ("GNU Fortran %s%s\n", pkgversion_string, version_string);
printf ("Copyright %s 2007 Free Software Foundation, Inc.\n\n",
_("(C)"));
printf (_("GNU Fortran comes with NO WARRANTY, to the extent permitted by law.\n\
Index: gcc/configure.ac
===================================================================
--- gcc/configure.ac (revision 127558)
+++ gcc/configure.ac (working copy)
@@ -747,6 +747,9 @@
[onestep=""])
AC_SUBST(onestep)
+ACX_PKGVERSION([GCC])
+ACX_BUGURL([http://gcc.gnu.org/bugs.html])
+
# Sanity check enable_languages in case someone does not run the toplevel
# configure # script.
AC_ARG_ENABLE(languages,
Index: gcc/treelang/tree1.c
===================================================================
--- gcc/treelang/tree1.c (revision 127558)
+++ gcc/treelang/tree1.c (working copy)
@@ -107,6 +107,7 @@
if (!version_done)
{
fputs (language_string, stdout);
+ fputs (pkgversion_string, stdout);
fputs (version_string, stdout);
fputs ("\n", stdout);
version_done = 1;
Index: gcc/treelang/treelang.texi
===================================================================
--- gcc/treelang/treelang.texi (revision 127558)
+++ gcc/treelang/treelang.texi (working copy)
@@ -16,7 +16,12 @@
@set email-patches gcc-patches@@gcc.gnu.org
@set path-treelang gcc/gcc/treelang
-@set which-treelang GCC-@value{version-GCC}
+@ifset VERSION_PACKAGE
+@set which-treelang @value{version-GCC} @value{VERSION_PACKAGE}
+@end ifset
+@ifclear VERSION_PACKAGE
+@set which-treelang @value{version-GCC}
+@end ifclear
@set which-GCC GCC
@set email-josling tej@@melbpc.org.au
Index: gcc/version.c
===================================================================
--- gcc/version.c (revision 127558)
+++ gcc/version.c (working copy)
@@ -1,25 +1,16 @@
#include "version.h"
-/* This is the trailing component of the string reported as the
- version number by all components of the compiler. For an official
- FSF release, it is empty. If you distribute a modified version of
- GCC, please change this string to indicate that. The suggested
- format is a leading space, followed by your organization's name
- in parentheses. You may also wish to include a number indicating
- the revision of your modified compiler. */
-
-#define VERSUFFIX ""
-
/* This is the location of the online document giving instructions for
reporting bugs. If you distribute a modified version of GCC,
- please change this to refer to a document giving instructions for
- reporting bugs to you, not us. (You are of course welcome to
- forward us bugs reported to you, if you determine that they are
- not bugs in your modifications.) */
+ please configure with --with-bugurl pointing to a document giving
+ instructions for reporting bugs to you, not us. (You are of course
+ welcome to forward us bugs reported to you, if you determine that
+ they are not bugs in your modifications.) */
-const char bug_report_url[] = "<URL:http://gcc.gnu.org/bugs.html>";
+const char bug_report_url[] = BUGURL;
/* The complete version string, assembled from several pieces.
- BASEVER, DATESTAMP, and DEVPHASE are defined by the Makefile. */
+ BASEVER, DATESTAMP and DEVPHASE are defined by the Makefile. */
-const char version_string[] = BASEVER DATESTAMP DEVPHASE VERSUFFIX;
+const char version_string[] = BASEVER DATESTAMP DEVPHASE;
+const char pkgversion_string[] = PKGVERSION;
Index: gcc/version.h
===================================================================
--- gcc/version.h (revision 127558)
+++ gcc/version.h (working copy)
@@ -1,5 +1,6 @@
#ifndef GCC_VERSION_H
#define GCC_VERSION_H
extern const char version_string[];
+extern const char pkgversion_string[];
extern const char bug_report_url[];
#endif /* ! GCC_VERSION_H */
Index: gcc/protoize.c
===================================================================
--- gcc/protoize.c (revision 127558)
+++ gcc/protoize.c (working copy)
@@ -4525,7 +4525,8 @@
else
{
if (version_flag)
- fprintf (stderr, "%s: %s\n", pname, version_string);
+ fprintf (stderr, "%s %s%s\n", pname, pkgversion_string,
+ version_string);
do_processing ();
}
Index: gcc/Makefile.in
===================================================================
--- gcc/Makefile.in (revision 127558)
+++ gcc/Makefile.in (working copy)
@@ -743,7 +743,12 @@
BASEVER_s := "\"$(BASEVER_c)\""
DEVPHASE_s := "\"$(if $(DEVPHASE_c), ($(DEVPHASE_c)))\""
DATESTAMP_s := "\"$(if $(DEVPHASE_c), $(DATESTAMP_c))\""
+PKGVERSION_s:= "\"@PKGVERSION@\""
+BUGURL_s := "\"@REPORT_BUGS_TO@\""
+PKGVERSION := @PKGVERSION@
+BUGURL_TEXI := @REPORT_BUGS_TEXI@
+
# Shorthand variables for dependency lists.
TARGET_H = $(TM_H) target.h insn-modes.h
MACHMODE_H = machmode.h mode-classes.def insn-modes.h
@@ -1889,7 +1894,8 @@
version.o: version.c version.h $(DATESTAMP) $(BASEVER) $(DEVPHASE)
$(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) \
-DBASEVER=$(BASEVER_s) -DDATESTAMP=$(DATESTAMP_s) \
- -DDEVPHASE=$(DEVPHASE_s) -c $(srcdir)/version.c $(OUTPUT_OPTION)
+ -DDEVPHASE=$(DEVPHASE_s) -DPKGVERSION=$(PKGVERSION_s) \
+ -DBUGURL=$(BUGURL_s) -c $(srcdir)/version.c $(OUTPUT_OPTION)
gtype-desc.o: gtype-desc.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
$(VARRAY_H) $(HASHTAB_H) $(SPLAY_TREE_H) bitmap.h $(TREE_H) $(RTL_H) \
@@ -3608,6 +3614,10 @@
else echo "@clear DEVELOPMENT"; \
fi) > $@T
echo "@set srcdir $(srcdir)" >> $@T
+ if [ -n "$(PKGVERSION)" ]; then \
+ echo "@set VERSION_PACKAGE $(PKGVERSION)" >> $@T; \
+ fi
+ echo "@set BUGURL $(BUGURL_TEXI)" >> $@T; \
mv -f $@T $@
@@ -3719,7 +3729,7 @@
%.pod: %.texi
$(STAMP) $@
- -$(TEXI2POD) $< > $@
+ -$(TEXI2POD) -DBUGURL="$(BUGURL_TEXI)" $< > $@
.INTERMEDIATE: cpp.pod gcc.pod gfdl.pod fsf-funding.pod
cpp.pod: cpp.texi cppenv.texi cppopts.texi
Index: gcc/gcov-dump.c
===================================================================
--- gcc/gcov-dump.c (revision 127558)
+++ gcc/gcov-dump.c (working copy)
@@ -119,8 +119,8 @@
static void
print_version (void)
{
- printf ("gcov-dump (GCC) %s\n", version_string);
- printf ("Copyright (C) 2006 Free Software Foundation, Inc.\n");
+ printf ("gcov-dump %s%s\n", pkgversion_string, version_string);
+ printf ("Copyright (C) 2007 Free Software Foundation, Inc.\n");
printf ("This is free software; see the source for copying conditions.\n"
"There is NO warranty; not even for MERCHANTABILITY or \n"
"FITNESS FOR A PARTICULAR PURPOSE.\n\n");
Index: maintainer-scripts/gcc_release
===================================================================
--- maintainer-scripts/gcc_release (revision 127558)
+++ maintainer-scripts/gcc_release (working copy)
@@ -196,7 +196,7 @@
# Obtain some documentation files from the wwwdocs module.
inform "Retrieving HTML documentation"
changedir "${WORKING_DIRECTORY}"
- for x in bugs faq; do
+ for x in faq; do
(${CVS} export -r HEAD wwwdocs/htdocs/${x}.html && \
cp ${WORKING_DIRECTORY}/wwwdocs/htdocs/${x}.html \
${SOURCE_DIRECTORY}) || \
Index: maintainer-scripts/update_web_docs_svn
===================================================================
--- maintainer-scripts/update_web_docs_svn (revision 127558)
+++ maintainer-scripts/update_web_docs_svn (working copy)
@@ -146,6 +146,8 @@
echo "@clear DEVELOPMENT"
fi
echo "@set srcdir $WORKDIR/gcc/gcc"
+ echo "@set VERSION_PACKAGE (GCC)"
+ echo "@set BUGURL @uref{http://gcc.gnu.org/bugs.html}";
) > $includedir/gcc-vers.texi
# Now convert the relevant files from texi to HTML, PDF and PostScript.
--
Joseph S. Myers
joseph@codesourcery.com