This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
Re: committed: PR 14150
On Fri, Apr 02, 2004 at 01:11:16AM +0000, Joseph S. Myers wrote:
> Thanks for taking the time to address this delicate issue, your
> effort is appreciated. There are a few remaining issues to solve
Thanks for your kind note, I appreciate it...
Here is a follow up commit taking your remarks into account:
* gnat-style.texi, gnat_rm.texi, gnat_ugn.texi: Remove RCS tags.
Replace ifinfo by ifnottex, to make makeinfo --html happy again.
Add info directory entry and category.
> This is not OK, gcc.gnu.org does not have gnatmake installed and should
> not need to do a build anyway to update onlinedocs. update_web_docs
> expects all generated .texi files to be in CVS. This requirement is, of
> course, itself documented in sourcebuild.texi.
Let's be positive and find a proper solution. Clearly, having the
generated .texi files under CVS has caused endless trouble in the past
and has never been addressed properly.
My approach of removing completely these files solves the problem nicely.
Now to solve the onlinedocs issue, I'd suggest that we install gnatmake on
gcc.gnu.org, and do something like the following in update_web_docs:
<<
--- update_web_docs 3 Jan 2004 21:16:13 -0000 1.21
+++ update_web_docs 2 Apr 2004 08:32:46 -0000
@@ -88,7 +88,7 @@ find $CVSROOT/gcc -name \*.texi,v -print
# Checkout all the texi files.
-cvs -Q export -r$RELEASE `cat FILES` gcc/gcc/doc/install.texi2html gcc/gcc/doc/
include/texinfo.tex
+cvs -Q export -r$RELEASE `cat FILES` gcc/gcc/doc/install.texi2html gcc/gcc/doc/
include/texinfo.tex gcc/gcc/ada/xgnatugn.adb
# Build a tarball of the sources.
tar cf docs-sources.tar gcc
@@ -97,7 +97,12 @@ tar cf docs-sources.tar gcc
# and fdl.texi.
includedir=gcc/gcc/doc/include
-MANUALS="cpp cppinternals fastjar gcc gccint gcj g77 gnat_ug_unx gnat_ug_vms gn
at_ug_vxw gnat_ug_wnt gnat-style gnat_rm libiberty porting"
+MANUALS="cpp cppinternals fastjar gcc gccint gcj g77 gnat_ugn_unw gnat-style gn
at_rm libiberty porting"
+
+# Generate gnat_ugn_unw
+
+gnatmake -q gcc/gcc/ada/xgnatugn
+./xgnatugn unw gcc/gcc/ada/gnat_ugn.texi gcc/gcc/ada/ug_words gnat_ugn_unw.texi
# Now convert the relevant files from texi to HTML and PostScript.
for file in $MANUALS; do
>>
If installing gnatmake has too much of an emotional impact (since there's
no technical difficulty), then we could have a precompiled xgnatugn
executable installed on this machine, on the grounds that xgnatugn will
likely not change very often.
> In general you need corresponding patches to update_web_docs and
> onlinedocs/index.html for any change in the set of manuals.
onlinedocs/index.html does not contain GCC 3.5 docs yet.
> You appear to have reverted my fix to PR 14630 (adding info directory
> entries and categories). Why have you reverted this (and not reopened the
> bug)? (Please check for any other patches that may have been reverted.
Maybe because there were copy/paste errors in your original change ? :-)
On a more constructive side, the regressions were caused because the docs
had never been updated and was completely obsolete, so there was no easy way
for me to try to merge changes done in this obsolete doc.
To be honest, I have no time nor intention to "check for any other patches",
although I'm willing to address issues if people raise them as I did
after your mail.
Now, if you consider that my suggestions are not acceptable, then feel free
to revert my changes, and stay with a junk obsolete doc that won't get
updated. That's not my preferred approach, but that won't stop me from
sleeping well at night.
Arno
--
Index: gnat-style.texi
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ada/gnat-style.texi,v
retrieving revision 1.8
diff -u -p -r1.8 gnat-style.texi
--- gnat-style.texi 1 Apr 2004 17:25:02 -0000 1.8
+++ gnat-style.texi 2 Apr 2004 08:49:20 -0000
@@ -46,8 +46,6 @@
@end flushright
@sp 2
@subtitle GNAT, The GNU Ada 95 Compiler
-@subtitle Document revision level $Revision: 1.8 $
-@subtitle Date: $Date: 2004/04/01 17:25:02 $
@author Ada Core Technologies, Inc.
@@ -72,7 +70,7 @@ A copy of the license is included in the
@node Top, General, , (dir)
@comment node-name, next, previous, up
-@ifinfo
+@ifnottex
@noindent
GNAT Coding Style@*
A Guide for GNAT Developers
@@ -92,7 +90,7 @@ Front-Cover Texts being
and with no Back-Cover Texts.
A copy of the license is included in the section entitled
``GNU Free Documentation License''.
-@end ifinfo
+@end ifnottex
@menu
Index: gnat_rm.texi
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ada/gnat_rm.texi,v
retrieving revision 1.14
diff -u -p -r1.14 gnat_rm.texi
--- gnat_rm.texi 1 Apr 2004 17:25:02 -0000 1.14
+++ gnat_rm.texi 2 Apr 2004 08:49:21 -0000
@@ -53,7 +53,7 @@ entitled ``GNU Free Documentation Licens
@end titlepage
-@ifinfo
+@ifnottex
@node Top, About This Guide, (dir), (dir)
@top GNAT Reference Manual
@@ -382,7 +382,7 @@ GNU Free Documentation License
Index
@end menu
-@end ifinfo
+@end ifnottex
@node About This Guide
@unnumbered About This Guide
Index: gnat_ugn.texi
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ada/gnat_ugn.texi,v
retrieving revision 1.1
diff -u -p -r1.1 gnat_ugn.texi
--- gnat_ugn.texi 1 Apr 2004 17:25:02 -0000 1.1
+++ gnat_ugn.texi 2 Apr 2004 08:49:22 -0000
@@ -81,10 +81,17 @@
@ifset vms
@settitle GNAT User's Guide for Native Platforms / OpenVMS Alpha
+@dircategory GNU Ada tools
+@direntry
+* GNAT User's Guide (gnat_ugn_vms) for Native Platforms / OpenVMS Alpha
+@end direntry
@end ifset
@ifset unw
@settitle GNAT User's Guide for Native Platforms / Unix and Windows
+@direntry
+* GNAT User's Guide (gnat_ugn_unw) for Native Platforms / Unix and Windows
+@end direntry
@end ifset
@include gcc-common.texi
@@ -141,7 +148,7 @@ A copy of the license is included in the
@end titlepage
-@ifinfo
+@ifnottex
@node Top, About This Guide, (dir), (dir)
@top GNAT User's Guide
@@ -623,7 +630,7 @@ Microsoft Windows Topics
* Index::
@end menu
-@end ifinfo
+@end ifnottex
@node About This Guide
@unnumbered About This Guide
@@ -8652,12 +8659,12 @@ and some of the techniques for making yo
It then documents the @command{gnatelim} tool, which can reduce
the size of program executables.
-@ifinfo
+@ifnottex
@menu
* Performance Considerations::
* Reducing the Size of Ada Executables with gnatelim::
@end menu
-@end ifinfo
+@end ifnottex
@c *****************************
@@ -15034,7 +15041,7 @@ Clear :
@end cartouche
@end iftex
-@ifinfo
+@ifnottex
@smallexample
@cartouche
GNAT style, compact layout Uncompact layout
@@ -15059,7 +15066,7 @@ end loop Clear;
end loop Clear;
@end cartouche
@end smallexample
-@end ifinfo
+@end ifnottex
@noindent
A further difference between GNAT style layout and compact layout is that