This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
Patch for version numbers in manuals: use gcc-common.texi
- From: "Joseph S. Myers" <jsm28 at cam dot ac dot uk>
- To: <gcc-patches at gcc dot gnu dot org>
- Cc: <java-patches at gcc dot gnu dot org>
- Date: Mon, 23 Dec 2002 19:42:04 +0000 (GMT)
- Subject: Patch for version numbers in manuals: use gcc-common.texi
This patch gets rid of the multiple copies of the GCC version number
in the Fortran and Java manuals, making them use gcc-common.texi.
(Patch to update branching.html and releasing.html below.) It also
fixes some missing dependencies, makes the GNAT manuals consistently
use the GCC version number, makes the DEVELOPMENT flag common in
gcc-common.texi and fixes the build process for treelang.dvi to use
texi2dvi.
(cppinternals.texi includes a version number, but since that manual is
maintained I'm supposing it is intentional that this number is the
last GCC version for which there were significant revisions rather
than another copy of the exact GCC version. If not, and it should be
the current version, then this manual should be made to use
gcc-common.texi. Likewise, I'm supposing that the use of a major
version number (3) only in cpp.texi is intentional, and the date there
reflects the last major revisions. I'll leave these issues for the
cpp maintainers (though I prefer each manual to state the exact
compiler version it comes from).)
(I don't believe the separate (1.0) version for the treelang front end
is at all useful, but I'll leave its removal to the treelang
maintainer.)
Bootstrapped and passed "make dvi" and "make install" with no
regressions on i686-pc-linux-gnu. Applied to mainline. Corresponding
patch (with @clear DEVELOPMENT) applied to 3.3 branch.
2002-12-23 Joseph S. Myers <jsm@polyomino.org.uk>
* doc/include/gcc-common.texi: Define DEVELOPMENT.
ada:
2002-12-23 Joseph S. Myers <jsm@polyomino.org.uk>
* gnat_rm.texi: Include gcc-common.texi. Use GCC version number
only.
* Make-lang.in ($(srcdir)/ada/gnat_ug_unx.info,
$(srcdir)/ada/gnat_ug_vms.info, $(srcdir)/ada/gnat_ug_vxw.info,
$(srcdir)/ada/gnat_ug_wnt.info, $(srcdir)/ada/gnat_rm.info,
ada/gnat_ug_unx.dvi, ada/gnat_ug_vms.dvi, ada/gnat_ug_vxw.dvi,
ada/gnat_ug_wnt.dvi, ada/gnat_rm.dvi): Depend on
$(srcdir)/doc/include/gcc-common.texi.
f:
2002-12-23 Joseph S. Myers <jsm@polyomino.org.uk>
* root.texi: Include gcc-common.texi.
* bugs.texi, news.texi: Don't include root.texi as part of full
manual.
* g77.texi: Update for use of gcc-common.texi.
* Make-lang.in ($(srcdir)/f/g77.info, f/g77.dvi): Depend on
$(srcdir)/doc/include/gcc-common.texi.
java:
2002-12-23 Joseph S. Myers <jsm@polyomino.org.uk>
* gcj.texi: Include gcc-common.texi.
* Make-lang.in ($(srcdir)/java/gcj.info, java/gcj.dvi): Depend on
$(srcdir)/doc/include/gcc-common.texi.
treelang:
2002-12-23 Joseph S. Myers <jsm@polyomino.org.uk>
* treelang.texi: Include gcc-common.texi.
* Make-lang.in ($(srcdir)/treelang/treelang.info, treelang.dvi):
Depend on gcc-common.texi. Add other missing dependencies.
(treelang.dvi): Use texi2dvi.
diff -ruN gcc.orig/ada/Make-lang.in gcc/ada/Make-lang.in
--- gcc.orig/ada/Make-lang.in 2002-12-22 17:49:55.000000000 +0000
+++ gcc/ada/Make-lang.in 2002-12-22 22:46:38.000000000 +0000
@@ -366,23 +366,23 @@
ada/doctools/xgnatug wnt $(srcdir)/ada/gnat_ug.texi $(srcdir)/ada/ug_words $(srcdir)/ada/gnat_ug_wnt.texi
$(srcdir)/ada/gnat_ug_unx.info : $(srcdir)/ada/gnat_ug_unx.texi \
- $(srcdir)/doc/include/fdl.texi
+ $(srcdir)/doc/include/fdl.texi $(srcdir)/doc/include/gcc-common.texi
cd $(srcdir) && $(MAKEINFO) -I doc/include -I ada -o ada/gnat_ug_unx.info ada/gnat_ug_unx.texi
$(srcdir)/ada/gnat_ug_vms.info : $(srcdir)/ada/gnat_ug_vms.texi \
- $(srcdir)/doc/include/fdl.texi
+ $(srcdir)/doc/include/fdl.texi $(srcdir)/doc/include/gcc-common.texi
cd $(srcdir) && $(MAKEINFO) -I doc/include -I ada -o ada/gnat_ug_vms.info ada/gnat_ug_vms.texi
$(srcdir)/ada/gnat_ug_vxw.info : $(srcdir)/ada/gnat_ug_vxw.texi \
- $(srcdir)/doc/include/fdl.texi
+ $(srcdir)/doc/include/fdl.texi $(srcdir)/doc/include/gcc-common.texi
cd $(srcdir) && $(MAKEINFO) -I doc/include -I ada -o ada/gnat_ug_vxw.info ada/gnat_ug_vxw.texi
$(srcdir)/ada/gnat_ug_wnt.info : $(srcdir)/ada/gnat_ug_wnt.texi \
- $(srcdir)/doc/include/fdl.texi
+ $(srcdir)/doc/include/fdl.texi $(srcdir)/doc/include/gcc-common.texi
cd $(srcdir) && $(MAKEINFO) -I doc/include -I ada -o ada/gnat_ug_wnt.info ada/gnat_ug_wnt.texi
$(srcdir)/ada/gnat_rm.info : $(srcdir)/ada/gnat_rm.texi \
- $(srcdir)/doc/include/fdl.texi
+ $(srcdir)/doc/include/fdl.texi $(srcdir)/doc/include/gcc-common.texi
cd $(srcdir) && $(MAKEINFO) -I doc/include -I ada -o ada/gnat_rm.info ada/gnat_rm.texi
$(srcdir)/ada/gnat-style.info : $(srcdir)/ada/gnat-style.texi \
@@ -420,27 +420,27 @@
-chmod a-x $(infodir)/gnat_rm.info* $(infodir)/gnat-style.info*
ada/gnat_ug_unx.dvi : $(srcdir)/ada/gnat_ug_unx.texi \
- $(srcdir)/doc/include/fdl.texi
+ $(srcdir)/doc/include/fdl.texi $(srcdir)/doc/include/gcc-common.texi
s=`cd $(srcdir); ${PWD}`; \
cd ada && $(TEXI2DVI) -c -I $$s/doc/include -o gnat_ug_unx.dvi $$s/ada/gnat_ug_unx.texi
ada/gnat_ug_vms.dvi : $(srcdir)/ada/gnat_ug_vms.texi \
- $(srcdir)/doc/include/fdl.texi
+ $(srcdir)/doc/include/fdl.texi $(srcdir)/doc/include/gcc-common.texi
s=`cd $(srcdir); ${PWD}`; \
cd ada && $(TEXI2DVI) -c -I $$s/doc/include -o gnat_ug_vms.dvi $$s/ada/gnat_ug_vms.texi
ada/gnat_ug_vxw.dvi : $(srcdir)/ada/gnat_ug_vxw.texi \
- $(srcdir)/doc/include/fdl.texi
+ $(srcdir)/doc/include/fdl.texi $(srcdir)/doc/include/gcc-common.texi
s=`cd $(srcdir); ${PWD}`; \
cd ada && $(TEXI2DVI) -c -I $$s/doc/include -o gnat_ug_vxw.dvi $$s/ada/gnat_ug_vxw.texi
ada/gnat_ug_wnt.dvi : $(srcdir)/ada/gnat_ug_wnt.texi \
- $(srcdir)/doc/include/fdl.texi
+ $(srcdir)/doc/include/fdl.texi $(srcdir)/doc/include/gcc-common.texi
s=`cd $(srcdir); ${PWD}`; \
cd ada && $(TEXI2DVI) -c -I $$s/doc/include -o gnat_ug_wnt.dvi $$s/ada/gnat_ug_wnt.texi
ada/gnat_rm.dvi : $(srcdir)/ada/gnat_rm.texi \
- $(srcdir)/doc/include/fdl.texi
+ $(srcdir)/doc/include/fdl.texi $(srcdir)/doc/include/gcc-common.texi
s=`cd $(srcdir); ${PWD}`; \
cd ada && $(TEXI2DVI) -c -I $$s/doc/include -o gnat_rm.dvi $$s/ada/gnat_rm.texi
diff -ruN gcc.orig/ada/gnat_rm.texi gcc/ada/gnat_rm.texi
--- gcc.orig/ada/gnat_rm.texi 2002-06-04 09:16:08.000000000 +0000
+++ gcc/ada/gnat_rm.texi 2002-12-22 22:43:47.000000000 +0000
@@ -22,6 +22,8 @@
@setchapternewpage odd
@syncodeindex fn cp
+@include gcc-common.texi
+
@dircategory GNU Ada tools
@direntry
* GNAT Reference Manual: (gnat_rm). Reference Manual for GNU Ada tools.
@@ -31,12 +33,7 @@
@title GNAT Reference Manual
@subtitle GNAT, The GNU Ada 95 Compiler
-@ifset vxworks
-@title Version 3.16w
-@end ifset
-@ifclear vxworks
-@subtitle Version 3.16w
-@end ifclear
+@subtitle GNAT Version for GCC @value{version-GCC}
@author Ada Core Technologies, Inc.
@page
@@ -64,12 +61,7 @@
GNAT, The GNU Ada 95 Compiler
-@ifset vxworks
-Version 3.16w
-@end ifset
-@ifclear vxworks
-Version 3.16w
-@end ifclear
+GNAT Version for GCC @value{version-GCC}
Ada Core Technologies, Inc.
diff -ruN gcc.orig/doc/include/gcc-common.texi gcc/doc/include/gcc-common.texi
--- gcc.orig/doc/include/gcc-common.texi 2002-12-22 17:50:45.000000000 +0000
+++ gcc/doc/include/gcc-common.texi 2002-12-22 22:40:50.000000000 +0000
@@ -6,6 +6,11 @@
@set version-GCC 3.4
+@c DEVELOPMENT is set to indicate an in-development version,
+@c as compared to a release version. When making a release
+@c branch, clear this.
+@set DEVELOPMENT
+
@c Common macros to support generating man pages:
@macro gcctabopt{body}
diff -ruN gcc.orig/f/Make-lang.in gcc/f/Make-lang.in
--- gcc.orig/f/Make-lang.in 2002-12-22 17:50:46.000000000 +0000
+++ gcc/f/Make-lang.in 2002-12-22 22:46:55.000000000 +0000
@@ -153,7 +153,8 @@
$(srcdir)/f/news.texi $(srcdir)/f/intdoc.texi \
$(srcdir)/f/root.texi $(srcdir)/doc/include/fdl.texi \
$(srcdir)/doc/include/gpl.texi \
- $(srcdir)/doc/include/funding.texi
+ $(srcdir)/doc/include/funding.texi \
+ $(srcdir)/doc/include/gcc-common.texi
if [ x$(BUILD_INFO) = xinfo ]; then \
rm -f $(srcdir)/f/g77.info-*; \
cd $(srcdir)/f && $(MAKEINFO) -I../doc/include -o g77.info g77.texi; \
@@ -164,7 +165,8 @@
$(srcdir)/f/news.texi $(srcdir)/f/intdoc.texi \
$(srcdir)/f/root.texi $(srcdir)/doc/include/fdl.texi \
$(srcdir)/doc/include/gpl.texi \
- $(srcdir)/doc/include/funding.texi
+ $(srcdir)/doc/include/funding.texi \
+ $(srcdir)/doc/include/gcc-common.texi
s=`cd $(srcdir); ${PWD}`; export s; \
cd f && $(TEXI2DVI) -I $$s/doc/include $$s/f/g77.texi
diff -ruN gcc.orig/f/bugs.texi gcc/f/bugs.texi
--- gcc.orig/f/bugs.texi 2002-09-12 22:13:08.000000000 +0000
+++ gcc/f/bugs.texi 2002-12-23 17:39:48.000000000 +0000
@@ -1,4 +1,4 @@
-@c Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+@c Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
@c This is part of the G77 manual.
@c For copying conditions, see the file g77.texi.
@@ -11,9 +11,8 @@
@set last-update-bugs 2002-02-01
-@include root.texi
-
@ifset DOC-BUGS
+@include root.texi
@c The immediately following lines apply to the BUGS file
@c which is derived from this file.
@emph{Note:} This file is automatically generated from the files
diff -ruN gcc.orig/f/g77.texi gcc/f/g77.texi
--- gcc.orig/f/g77.texi 2002-12-22 17:50:46.000000000 +0000
+++ gcc/f/g77.texi 2002-12-22 22:51:58.000000000 +0000
@@ -24,33 +24,6 @@
@c and make sure the following does NOT begin with '@c':
@c @clear USING
-@c 6/27/96 FSF DO wants smallbook fmt for 1st bound edition. (from gcc.texi)
-@c @smallbook
-
-@c i also commented out the finalout command, so if there *are* any
-@c overfulls, you'll (hopefully) see the rectangle in the right hand
-@c margin. -- burley 1999-03-13 (from mew's comment in gcc.texi).
-@c @finalout
-
-@macro gcctabopt{body}
-@code{\body\}
-@end macro
-@macro gccoptlist{body}
-@smallexample
-\body\
-@end smallexample
-@end macro
-@c Makeinfo handles the above macro OK, TeX needs manual line breaks;
-@c they get lost at some point in handling the macro. But if @macro is
-@c used here rather than @alias, it produces double line breaks.
-@iftex
-@alias gol = *
-@end iftex
-@ifnottex
-@macro gol
-@end macro
-@end ifnottex
-
@ifset INTERNALS
@ifset USING
@settitle Using and Porting GNU Fortran
@@ -142,7 +115,6 @@
was contributed to Craig by David Ronis (@email{ronis@@onsager.chem.mcgill.ca}).
@setchapternewpage odd
-@c @finalout
@titlepage
@ifset INTERNALS
@ifset USING
diff -ruN gcc.orig/f/news.texi gcc/f/news.texi
--- gcc.orig/f/news.texi 2002-12-22 17:50:46.000000000 +0000
+++ gcc/f/news.texi 2002-12-23 17:39:38.000000000 +0000
@@ -12,9 +12,8 @@
@set last-update-news 2002-11-19
-@include root.texi
-
@ifset DOC-NEWS
+@include root.texi
@c The immediately following lines apply to the NEWS file
@c which is derived from this file.
@emph{Note:} This file is automatically generated from the files
diff -ruN gcc.orig/f/root.texi gcc/f/root.texi
--- gcc.orig/f/root.texi 2002-12-22 17:50:47.000000000 +0000
+++ gcc/f/root.texi 2002-12-22 22:47:32.000000000 +0000
@@ -1,9 +1,4 @@
-@c DEVELOPMENT is set to indicate an in-development version,
-@c as compared to a release version. When making a release
-@c (e.g. a release branch in the CVS repository for gcc),
-@c clear this and set the version information correctly.
-@set DEVELOPMENT
-@set version-gcc 3.4
+@include gcc-common.texi
@set email-general gcc@@gcc.gnu.org
@set email-help gcc-help@@gcc.gnu.org
@@ -12,7 +7,7 @@
@set path-g77 gcc/gcc/f
@set path-libf2c gcc/libf2c
-@set which-g77 GCC-@value{version-gcc}
+@set which-g77 GCC-@value{version-GCC}
@set which-gcc GCC
@set email-burley craig@@jcb-sc.com
diff -ruN gcc.orig/java/Make-lang.in gcc/java/Make-lang.in
--- gcc.orig/java/Make-lang.in 2002-12-22 17:50:48.000000000 +0000
+++ gcc/java/Make-lang.in 2002-12-22 22:52:53.000000000 +0000
@@ -347,14 +347,15 @@
# Documentation
$(srcdir)/java/gcj.info: $(srcdir)/java/gcj.texi \
- $(srcdir)/doc/include/fdl.texi $(srcdir)/doc/include/gpl.texi
+ $(srcdir)/doc/include/fdl.texi $(srcdir)/doc/include/gpl.texi \
+ $(srcdir)/doc/include/gcc-common.texi
if test "x$(BUILD_INFO)" = xinfo; then \
rm -f $(srcdir)/java/gcc.info*; \
cd $(srcdir)/java && $(MAKEINFO) -I../doc/include -o gcj.info gcj.texi; \
else true; fi
java/gcj.dvi: $(srcdir)/java/gcj.texi $(srcdir)/doc/include/fdl.texi \
- $(srcdir)/doc/include/gpl.texi
+ $(srcdir)/doc/include/gpl.texi $(srcdir)/doc/include/gcc-common.texi
s=`cd $(srcdir); ${PWD}`; export s; \
cd java && $(TEXI2DVI) -I $$s/doc/include $$s/java/gcj.texi
diff -ruN gcc.orig/java/gcj.texi gcc/java/gcj.texi
--- gcc.orig/java/gcj.texi 2002-12-22 17:50:48.000000000 +0000
+++ gcc/java/gcj.texi 2002-12-22 22:54:06.000000000 +0000
@@ -2,6 +2,8 @@
@setfilename gcj.info
@settitle Guide to GNU gcj
+@include gcc-common.texi
+
@c Note: When reading this manual you'll find lots of strange
@c circumlocutions like ``compiler for the Java language''.
@c This is necessary due to Sun's restrictions on the use of
@@ -11,12 +13,7 @@
@set copyrights-gcj 2001, 2002
@c Versions
-@set version-gcc 3.4
-@set which-gcj GCC-@value{version-gcc}
-
-@macro gcctabopt{body}
-@code{\body\}
-@end macro
+@set which-gcj GCC-@value{version-GCC}
@ifinfo
@format
diff -ruN gcc.orig/treelang/Make-lang.in gcc/treelang/Make-lang.in
--- gcc.orig/treelang/Make-lang.in 2002-12-22 17:50:58.000000000 +0000
+++ gcc/treelang/Make-lang.in 2002-12-22 22:57:05.000000000 +0000
@@ -132,15 +132,21 @@
.phony:treelang.info
treelang.info: $(srcdir)/treelang/treelang.info
-$(srcdir)/treelang/treelang.info: $(srcdir)/treelang/treelang.texi
+$(srcdir)/treelang/treelang.info: $(srcdir)/treelang/treelang.texi \
+ $(srcdir)/doc/include/gcc-common.texi \
+ $(srcdir)/doc/include/gpl.texi \
+ $(srcdir)/doc/include/fdl.texi \
+ $(srcdir)/doc/include/funding.texi
cd $(srcdir) && $(MAKEINFO) $(MAKEINFOFLAGS) -Idoc/include \
-o treelang/treelang.info treelang/treelang.texi
-treelang.dvi: $(srcdir)/treelang/treelang.texi
- TEXINPUTS=$(srcdir)/treelang:$(srcdir):$$TEXINPUTS $(TEXI2DVI) $(srcdir)/treelang/treelang.texi; \
- texindex treelang.??; \
- TEXINPUTS=$(srcdir)/treelang:$(srcdir):$$TEXINPUTS $(TEXI2DVI) $(srcdir)/treelang/treelang.texi; \
- mv treelang.dvi treelang;
+treelang.dvi: $(srcdir)/treelang/treelang.texi \
+ $(srcdir)/doc/include/gcc-common.texi \
+ $(srcdir)/doc/include/gpl.texi \
+ $(srcdir)/doc/include/fdl.texi \
+ $(srcdir)/doc/include/funding.texi
+ s=`cd $(srcdir); ${PWD}`; export s; \
+ cd treelang && $(TEXI2DVI) -I $$s/doc/include $$s/treelang/treelang.texi
treelang.generated-manpages:
diff -ruN gcc.orig/treelang/treelang.texi gcc/treelang/treelang.texi
--- gcc.orig/treelang/treelang.texi 2002-12-22 21:47:09.000000000 +0000
+++ gcc/treelang/treelang.texi 2002-12-22 23:23:56.000000000 +0000
@@ -8,15 +8,12 @@
@c %**start of header
@setfilename treelang.info
+@include gcc-common.texi
+
+@set version-treelang 1.0
+
@set last-update 2001-07-30
@set copyrights-treelang 1995,1996,1997,1998,1999,2000,2001,2002
-@c DEVELOPMENT is set to indicate an in-development version,
-@c as compared to a release version. When making a release
-@c (e.g. a release branch in the CVS repository for GCC),
-@c clear this and set the version information correctly.
-@clear DEVELOPMENT
-@set version-treelang 1.0
-@set version-GCC 3.0
@set email-general gcc@@gcc.gnu.org
@set email-bugs gcc-bugs@@gcc.gnu.org or bug-gcc@@gnu.org
@@ -46,14 +43,6 @@
@c and make sure the following does NOT begin with '@c':
@c @clear USING
-@c 6/27/96 FSF DO wants smallbook fmt for 1st bound edition. (from gcc.texi)
-@c @smallbook
-
-@c i also commented out the finalout command, so if there *are* any
-@c overfulls, you'll (hopefully) see the rectangle in the right hand
-@c margin. -- burley 1999-03-13 (from mew's comment in GCC.texi).
-@c @finalout
-
@ifset INTERNALS
@ifset USING
@settitle Using and Maintaining GNU Treelang
--- branching.html.orig 2002-12-22 17:42:32.000000000 +0000
+++ branching.html 2002-12-22 23:37:57.000000000 +0000
@@ -27,8 +27,7 @@
the next major release number (e.g., 3.2 instead of 3.1).</li>
<li>Update <code>doc/include/gcc-common.texi</code> on the mainline to
-use the next major release number. Also, update the version number in
-<code>java/gcj.texi</code> and <code>f/root.texi</code>.</li>
+use the next major release number.</li>
<li>Create a new <code>gcc-<var>VERSION</var></code> directory in the
<code>wwwdocs</code> repository and populate it with initial copies
@@ -40,7 +39,7 @@
release branch, the current release series, and active development
(mainline). Update the version and development stage for mainline.</li>
-<li>Update <code>f/root.texi</code> on the branch to use <code>@clear
+<li>Update <code>doc/include/gcc-common.texi</code> on the branch to use <code>@clear
DEVELOPMENT</code>.</li>
<li>Update <code>maintainer-scripts/gcc_release</code> on the
--- releasing.html.orig 2002-09-24 09:51:40.000000000 +0000
+++ releasing.html 2002-12-22 23:39:37.000000000 +0000
@@ -67,11 +67,11 @@
<li>Increment the version number in <code>gcc/version.c</code>, and
put back the date stamp and (prerelease) annotation. Increment the
-version numbers in <code>doc/include/gcc-common.texi</code>,
-<code>java/gcj.texi</code>, and <code>f/root.texi</code>. (Branches
-cut prior to GCC 3.3 have the version number stored in even more
+version number in <code>doc/include/gcc-common.texi</code>. (Branches
+cut prior to GCC 3.3 have the version number stored in more
places. You must edit all the files named <code>[vV]ersion.c</code>
-as well, and <code>gcc/ada/gnatvsn.ads</code>.)</li>
+as well, and <code>java/gcj.texi</code>, <code>f/root.texi</code>, and
+<code>gcc/ada/gnatvsn.ads</code>.)</li>
<li>Notify developers that checkins to the branch are once again
allowed.</li>
--
Joseph S. Myers
jsm28@cam.ac.uk