diff options
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/ChangeLog | 76 | ||||
| -rw-r--r-- | etc/Makefile.in | 33 | ||||
| -rw-r--r-- | etc/configure.texi | 12 | ||||
| -rw-r--r-- | etc/standards.texi | 16 | ||||
| -rw-r--r-- | etc/texi2pod.pl | 56 |
5 files changed, 68 insertions, 125 deletions
diff --git a/etc/ChangeLog b/etc/ChangeLog index 64fdee6c0..6865f2df1 100644 --- a/etc/ChangeLog +++ b/etc/ChangeLog @@ -1,23 +1,3 @@ -2006-02-27 Carlos O'Donell <carlos@codesourcery.com> - - * Makefile.in: TEXI2HTML uses makeinfo. Define - HTMLFILES. Add html targets. - * configure.texi: Use ifnottex. Add alternative - image format specifier as jpg. - * standards.texi: Use ifnottex. - -2005-10-21 Mark Mitchell <mark@codesourcery.com> - - * texi2pod.pl: Substitue for @value even when part of @include. - -2005-10-21 Bob Wilson <bob.wilson@acm.org> - - * texi2pod.pl: Import latest version from GCC. - -2005-05-19 Zack Weinberg <zack@codesourcery.com> - - * Makefile.in: Have 'all' depend on 'info'. - 2003-05-16 Kelley Cook <kelleycook@wideopenwest.com> * configure.texi: Use "i[3-7]86" in example. @@ -83,7 +63,7 @@ 1998-12-03 Nick Clifton <nickc@cygnus.com> * targetdoc/fr30.texi: New document. - + 1998-10-01 Angela Marie Thomas (angela@cygnus.com) * comp-tools-fix, cross-tools-fix: Replace /usr/include @@ -148,7 +128,7 @@ Mon May 18 14:27:37 1998 Angela Marie Thomas (angela@cygnus.com) Thu May 14 14:43:10 1998 Nick Clifton <nickc@cygnus.com> * targetdoc/arm-interwork.texi: Document dlltool support of - interworking. + interworking. Thu May 7 16:49:38 1998 Jason Molenda (crash@bugshack.cygnus.com) @@ -157,7 +137,7 @@ Thu May 7 16:49:38 1998 Jason Molenda (crash@bugshack.cygnus.com) Wed Apr 1 17:11:44 1998 Nick Clifton <nickc@cygnus.com> - * targetdoc/arm-interwork.texi: Document ARM/thumb interworking. + * targetdoc/arm-interwork.texi: Document ARM/thumb interworking. Tue Mar 31 15:28:20 1998 Ian Lance Taylor <ian@cygnus.com> @@ -167,7 +147,7 @@ Tue Mar 31 15:28:20 1998 Ian Lance Taylor <ian@cygnus.com> Tue Mar 24 16:13:26 1998 Stu Grossman <grossman@bhuna.cygnus.co.uk> * configure: Regenerate with autoconf 2.12.1 to fix shell issues - for NT native builds. + for NT native builds. Mon Mar 9 16:41:04 1998 Doug Evans <devans@canuck.cygnus.com> @@ -203,7 +183,7 @@ Tue Jun 17 15:50:23 1997 Angela Marie Thomas (angela@cygnus.com) Thu Jun 12 13:47:00 1997 Angela Marie Thomas (angela@cygnus.com) - * Install.in (show_exec_prefix_msg): fix quoting + * Install.in (show_exec_prefix_msg): fix quoting Wed Jun 4 15:31:43 1997 Jason Molenda (crash@godzilla.cygnus.co.jp) @@ -251,8 +231,8 @@ Thu Apr 10 23:23:33 1997 Jason Molenda (crash@godzilla.cygnus.co.jp) Mon Apr 7 18:15:00 1997 Brendan Kehoe <brendan@cygnus.com> - * Fix the version string for OSF1 4.0 to recognize either - V4.* or X4.* + * Fix the version string for OSF1 4.0 to recognize either + V4.* or X4.* Mon Apr 7 15:34:47 1997 Ian Lance Taylor <ian@cygnus.com> @@ -323,8 +303,8 @@ Mon Aug 28 17:25:49 1995 Jason Molenda (crash@phydeaux.cygnus.com) Tue Aug 15 21:51:58 1995 Jason Molenda (crash@phydeaux.cygnus.com) - * Install.in (guess_system): Match OSF/1 v3.x as the same as - v2.x--v2.x binaries are upward compatible. + * Install.in (guess_system): Match OSF/1 v3.x as the same as + v2.x--v2.x binaries are upward compatible. Tue Aug 15 21:46:54 1995 Jason Molenda (crash@phydeaux.cygnus.com) @@ -339,8 +319,8 @@ Tue Aug 8 13:11:56 1995 Brendan Kehoe <brendan@lisa.cygnus.com> Thu Jun 8 00:42:56 1995 Angela Marie Thomas <angela@cirdan.cygnus.com> - * subst-strings: change du commands to $BINDIR/. & $SRCDIR/. just - in case they are symlinks. + * subst-strings: change du commands to $BINDIR/. & $SRCDIR/. just + in case they are symlinks. Tue Apr 18 14:23:10 1995 J.T. Conklin <jtc@rtl.cygnus.com> @@ -355,7 +335,7 @@ Tue Apr 18 14:23:10 1995 J.T. Conklin <jtc@rtl.cygnus.com> * Install.in (do_mkdir): New function. * Install.in: Added support for --with and --without options. - Changed so that tape commands are not run when extracting + Changed so that tape commands are not run when extracting from a file. (do_mt): Changed to take only one argument. @@ -363,7 +343,7 @@ Wed Mar 29 11:16:38 1995 Jason Molenda (crash@phydeaux.cygnus.com) * Install.in: catch UNAME==alpha-dec-osf2.x and correct entry for alpha-dec-osf1.x - + Fri Jan 27 12:04:29 1995 J.T. Conklin <jtc@rtl.cygnus.com> * subst-strings (mips-sgi-irix5): New entry in table. @@ -408,8 +388,8 @@ Thu Apr 28 14:42:22 1994 David J. Mackenzie (djm@rtl.cygnus.com) Tue Apr 26 17:18:03 1994 Jason Molenda (crash@sendai.cygnus.com) - * Install.in: fixincludes output is actually put in fixincludes.log, - but echo'ed messages claim it is fixinc.log. This is the same + * Install.in: fixincludes output is actually put in fixincludes.log, + but echo'ed messages claim it is fixinc.log. This is the same messages as I logged in March 4 1994, but for some reason we found the change hadn't been done. I'll have to dig through the logs and find out what I really did do that day. :) @@ -469,21 +449,21 @@ Wed Mar 23 23:38:24 1994 Jason Molenda (crash@sendai.cygnus.com) Wed Mar 23 13:42:48 1994 Jason Molenda (crash@sendai.cygnus.com) - * Install.in: set PATH to $PATH:/bin:/usr/bin so we can pick - up native tools even if the user doesn't have them in his - path. + * Install.in: set PATH to $PATH:/bin:/usr/bin so we can pick + up native tools even if the user doesn't have them in his + path. - * Install.in: ``hppa-1.1-hp-hpux'' -> ``hppa1.1-hp-hpux''. + * Install.in: ``hppa-1.1-hp-hpux'' -> ``hppa1.1-hp-hpux''. Tue Mar 15 22:09:20 1994 Jason Molenda (crash@sendai.cygnus.com) - - * Install.in: TAPE_REWIND and TAPE_FORWARD variables for Unixunaware, - added switch statement to detect if system is Unixunaware. + + * Install.in: TAPE_REWIND and TAPE_FORWARD variables for Unixunaware, + added switch statement to detect if system is Unixunaware. Fri Mar 4 12:10:30 1994 Jason Molenda (crash@sendai.cygnus.com) - * Install.in: fixincludes output is actually put in fixincludes.log, - but echo'ed messages claim it is fixinc.log. + * Install.in: fixincludes output is actually put in fixincludes.log, + but echo'ed messages claim it is fixinc.log. Wed Nov 3 02:58:02 1993 Jeffrey Osier (jeffrey@thepub.cygnus.com) @@ -514,9 +494,9 @@ Thu Jun 10 16:01:25 1993 Jeffrey Osier (jeffrey@cygnus.com) Wed Jun 9 19:23:59 1993 Jeffrey Osier (jeffrey@rtl.cygnus.com) - * install-texi.in: added conditionals (nearly complete) - cleaned up - added support for other releases (not done) + * install-texi.in: added conditionals (nearly complete) + cleaned up + added support for other releases (not done) Wed Jun 9 15:53:58 1993 Jim Kingdon (kingdon@cygnus.com) @@ -531,7 +511,7 @@ Fri Jun 4 17:09:56 1993 Jeffrey Osier (jeffrey@cygnus.com) Thu Jun 3 00:37:01 1993 david d `zoo' zuhn (zoo at cirdan.cygnus.com) - * Install.in: pull COPYING and COPYING.LIB off of the tape + * Install.in: pull COPYING and COPYING.LIB off of the tape Tue Jun 1 16:52:08 1993 david d `zoo' zuhn (zoo at cirdan.cygnus.com) diff --git a/etc/Makefile.in b/etc/Makefile.in index df461cfd5..63f7738c6 100644 --- a/etc/Makefile.in +++ b/etc/Makefile.in @@ -39,10 +39,7 @@ MAKEINFO = `if [ -f ../texinfo/makeinfo/makeinfo ]; \ TEXI2DVI = `if [ -f ../texinfo/util/texi2dvi ]; \ then echo ../texinfo/util/texi2dvi; \ else echo texi2dvi; fi` -TEXI2HTML = `if [ -f ../texinfo/makeinfo/makeinfo ]; \ - then echo "../texinfo/makeinfo/makeinfo --html"; \ - else echo "makeinfo --html"; fi` - +TEXI2HTML = texi2html DVIPS = dvips # Where to find texinfo.tex to format documentation with TeX. @@ -53,9 +50,10 @@ TEXIDIR = $(srcdir)/../texinfo INFOFILES = standards.info configure.info DVIFILES = standards.dvi configure.dvi -HTMLFILES = standards.html configure.html -all: info +all: + +# We want install to imply install-info as per GNU standards. install: install-info uninstall: @@ -86,18 +84,6 @@ install-info: info done; \ fi -html: - for f in $(HTMLFILES); do \ - if test -f $(srcdir)/`echo $$f | sed -e 's/.html$$/.texi/'`; then \ - if $(MAKE) "TEXI2HTML=$(TEXI2HTML)" $$f; then \ - true; \ - else \ - exit 1; \ - fi; \ - fi; \ - done - - dvi: for f in $(DVIFILES); do \ if test -f $(srcdir)/`echo $$f | sed -e 's/.dvi$$/.texi/'`; then \ @@ -112,9 +98,6 @@ dvi: standards.info: $(srcdir)/standards.texi $(srcdir)/make-stds.texi $(MAKEINFO) --no-split -I$(srcdir) -o standards.info $(srcdir)/standards.texi -standards.html: $(srcdir)/standards.texi $(srcdir)/make-stds.texi - $(TEXI2HTML) --no-split -I$(srcdir) -o standards.html $(srcdir)/standards.texi - standards.dvi: $(srcdir)/standards.texi TEXINPUTS=$(TEXIDIR):$$TEXINPUTS $(TEXI2DVI) $(srcdir)/standards.texi @@ -150,15 +133,12 @@ configure.ps: configure.dvi $(srcdir)/configdev.ein $(srcdir)/configbuild.ein rm -f configdev.eps configbuild.eps configure.html: $(srcdir)/configure.texi - cp $(srcdir)/configdev.jin configdev.jpg - cp $(srcdir)/configbuild.jin configbuild.jpg - $(TEXI2HTML) --no-split -I$(srcdir) -o configure.html $(srcdir)/configure.texi + $(TEXI2HTML) -split_chapter $(srcdir)/configure.texi clean: rm -f *.aux *.cp *.cps *.dvi *.fn *.fns *.ky *.kys *.log rm -f *.pg *.pgs *.toc *.tp *.tps *.vr *.vrs - rm -f configdev.txt configbuild.txt - rm -f configdev.eps configbuild.eps + rm -f configdev.txt configbuild.txt configdev.eps configbuild.eps rm -f configdev.jpg configbuild.jpg mostlyclean: clean @@ -167,7 +147,6 @@ distclean: clean rm -f Makefile config.status config.cache maintainer-clean realclean: distclean - rm -f *.html* rm -f *.info* Makefile: $(srcdir)/Makefile.in $(host_makefile_frag) $(target_makefile_frag) diff --git a/etc/configure.texi b/etc/configure.texi index 385a7c447..d69dc414d 100644 --- a/etc/configure.texi +++ b/etc/configure.texi @@ -10,7 +10,7 @@ * configure: (configure). The GNU configure and build system @end direntry -@ifnottex +@ifinfo This file documents the GNU configure and build system. Copyright (C) 1998 Cygnus Solutions. @@ -35,7 +35,7 @@ Permission is granted to copy and distribute translations of this manual into another language, under the above conditions for modified versions, except that this permission notice may be stated in a translation approved by the Foundation. -@end ifnottex +@end ifinfo @titlepage @title The GNU configure and build system @@ -60,7 +60,7 @@ except that this permission notice may be stated in a translation approved by the Free Software Foundation. @end titlepage -@ifnottex +@ifinfo @node Top @top GNU configure and build system @@ -79,7 +79,7 @@ The GNU configure and build system. * Index:: Index. @end menu -@end ifnottex +@end ifinfo @node Introduction @chapter Introduction @@ -1085,7 +1085,7 @@ are in rectangles with rounded corners @end ifnotinfo (e.g., @samp{autoheader} is the name of a tool, not the name of a file). -@image{configdev,,,,jpg} +@image{configdev} @node Written Developer Files @subsection Written Developer Files @@ -1235,7 +1235,7 @@ Here is a picture of the files which will be created at build time. @file{config.status} is both a created file and a shell script which is run to create other files, and the picture attempts to show that. -@image{configbuild,,,,jpg} +@image{configbuild} @node Build Files Description @subsection Build Files Description diff --git a/etc/standards.texi b/etc/standards.texi index 490e15b15..5aa508e01 100644 --- a/etc/standards.texi +++ b/etc/standards.texi @@ -6,13 +6,13 @@ @set lastupdate February 14, 2002 @c %**end of header -@ifnottex +@ifinfo @format START-INFO-DIR-ENTRY * Standards: (standards). GNU coding standards. END-INFO-DIR-ENTRY @end format -@end ifnottex +@end ifinfo @c @setchapternewpage odd @setchapternewpage off @@ -28,11 +28,11 @@ END-INFO-DIR-ENTRY @iftex @set CHAPTER chapter @end iftex -@ifnottex +@ifinfo @set CHAPTER node -@end ifnottex +@end ifinfo -@ifnottex +@ifinfo GNU Coding Standards Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc. @@ -43,7 +43,7 @@ with no Invariant Sections, with no Front-Cover Texts, and with no Back-Cover Texts. A copy of the license is included in the section entitled ``GNU Free Documentation License''. -@end ifnottex +@end ifinfo @titlepage @title GNU Coding Standards @@ -63,12 +63,12 @@ A copy of the license is included in the section entitled ``GNU Free Documentation License''. @end titlepage -@ifnottex +@ifinfo @node Top, Preface, (dir), (dir) @top Version Last updated @value{lastupdate}. -@end ifnottex +@end ifinfo @menu * Preface:: About the GNU Coding Standards diff --git a/etc/texi2pod.pl b/etc/texi2pod.pl index 9696a12f3..bdc20e811 100644 --- a/etc/texi2pod.pl +++ b/etc/texi2pod.pl @@ -1,23 +1,23 @@ #! /usr/bin/perl -w -# Copyright (C) 1999, 2000, 2001, 2003 Free Software Foundation, Inc. +# Copyright (C) 1999, 2000, 2001, 200 Free Software Foundation, Inc. -# This file is part of GCC. +# This file is part of GNU CC. -# GCC is free software; you can redistribute it and/or modify +# GNU CC is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2, or (at your option) # any later version. -# GCC is distributed in the hope that it will be useful, +# GNU CC is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with GCC; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Fifth Floor, -# Boston MA 02110-1301, USA. +# along with GNU CC; see the file COPYING. If not, write to +# the Free Software Foundation, 59 Temple Place - Suite 330, +# Boston MA 02111-1307, USA. # This does trivial (and I mean _trivial_) conversion of Texinfo # markup to Perl POD format. It's intended to be used to extract @@ -138,7 +138,7 @@ while(<$inf>) { # Ignore @end foo, where foo is not an operation which may # cause us to skip, if we are presently skipping. my $ended = $1; - next if $skipping && $ended !~ /^(?:ifset|ifclear|ignore|menu|iftex|copying)$/; + next if $skipping && $ended !~ /^(?:ifset|ifclear|ignore|menu|iftex)$/; die "\@end $ended without \@$ended at line $.\n" unless defined $endw; die "\@$endw ended by \@end $ended at line $.\n" unless $ended eq $endw; @@ -178,7 +178,7 @@ while(<$inf>) { next; }; - /^\@(ignore|menu|iftex|copying)\b/ and do { + /^\@(ignore|menu|iftex)\b/ and do { push @endwstack, $endw; push @skstack, $skipping; $endw = $1; @@ -227,12 +227,11 @@ while(<$inf>) { /^\@include\s+(.+)$/ and do { push @instack, $inf; $inf = gensym(); - $file = postprocess($1); # Try cwd and $ibase. - open($inf, "<" . $file) - or open($inf, "<" . $ibase . "/" . $file) - or die "cannot open $file or $ibase/$file: $!\n"; + open($inf, "<" . $1) + or open($inf, "<" . $ibase . "/" . $1) + or die "cannot open $1 or $ibase/$1: $!\n"; next; }; @@ -242,14 +241,10 @@ while(<$inf>) { and $_ = "\n=head3 $1\n"; # Block command handlers: - /^\@itemize(?:\s+(\@[a-z]+|\*|-))?/ and do { + /^\@itemize\s+(\@[a-z]+|\*|-)/ and do { push @endwstack, $endw; push @icstack, $ic; - if (defined $1) { - $ic = $1; - } else { - $ic = '@bullet'; - } + $ic = $1; $_ = "\n=over 4\n"; $endw = "itemize"; }; @@ -350,13 +345,6 @@ sub postprocess s/\@w\{([^\}]*)\}/S<$1>/g; s/\@(?:dmn|math)\{([^\}]*)\}/$1/g; - # keep references of the form @ref{...}, print them bold - s/\@(?:ref)\{([^\}]*)\}/B<$1>/g; - - # Change double single quotes to double quotes. - s/''/"/g; - s/``/"/g; - # Cross references are thrown away, as are @noindent and @refill. # (@noindent is impossible in .pod, and @refill is unnecessary.) # @* is also impossible in .pod; we discard it and any newline that @@ -377,18 +365,14 @@ sub postprocess s/\@uref\{([^\},]*),([^\},]*)\}/$2 (C<$1>)/g; s/\@uref\{([^\},]*),([^\},]*),([^\},]*)\}/$3/g; - # Un-escape <> at this point. + # Turn B<blah I<blah> blah> into B<blah> I<blah> B<blah> to + # match Texinfo semantics of @emph inside @samp. Also handle @r + # inside bold. s/</</g; s/>/>/g; - - # Now un-nest all B<>, I<>, R<>. Theoretically we could have - # indefinitely deep nesting; in practice, one level suffices. - 1 while s/([BIR])<([^<>]*)([BIR])<([^<>]*)>/$1<$2>$3<$4>$1</g; - - # Replace R<...> with bare ...; eliminate empty markup, B<>; - # shift white space at the ends of [BI]<...> expressions outside - # the expression. - s/R<([^<>]*)>/$1/g; + 1 while s/B<((?:[^<>]|I<[^<>]*>)*)R<([^>]*)>/B<$1>${2}B</g; + 1 while (s/B<([^<>]*)I<([^>]+)>/B<$1>I<$2>B</g); + 1 while (s/I<([^<>]*)B<([^>]+)>/I<$1>B<$2>I</g); s/[BI]<>//g; s/([BI])<(\s+)([^>]+)>/$2$1<$3>/g; s/([BI])<([^>]+?)(\s+)>/$1<$2>$3/g; |