diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2000-05-01 16:53:13 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2000-05-01 16:53:13 +0000 |
commit | a4ad94873205720065ae596cf3bbd52ad539bf7f (patch) | |
tree | e83067bfbcabd4e794f72d4a9e72b4c70ac5393e /doc/tools | |
parent | Added on 4.5-branch (diff) | |
download | rtems-a4ad94873205720065ae596cf3bbd52ad539bf7f.tar.bz2 |
Patch rtemsdoc-4.5.0-rc-3.diff from Ralf Corsepius <corsepiu@faw.uni-ulm.de>:
It addresses:
* .cvsignore (only minor changes to yours, as they were pretty clean,
most changes result from my mkcvsignore script being overly pedantic
sorting entries alphabetically.)
* timing.t handling and time<BSP>_.texi handling in supplements
* network.t handling in bsp_howto
* RTEMS_DATE and RTEMS_UPDATE handling in configure.in. [It actually is
a hack, as we could apply automake's version.texi handling instead - I
know think to understand what automake does with it.]
* avoid using temporary files; Therefore a new tool called bmenu2,
derived from bemenu, is introduced, which reads a single file from stdin
and writes to stdio.
To apply:
cd rtemsdoc
patch -p1 < rtemsdoc-4.5.0-rc-3.diff
cvs rm -f bsp_howto/network.t
cvs add tools/bmenu/bmenu2.c
./bootstrap
BTW: word-replace now is unused. It could be removed if you like to.
Diffstat (limited to '')
-rw-r--r-- | doc/tools/.cvsignore | 13 | ||||
-rw-r--r-- | doc/tools/bmenu/.cvsignore | 5 | ||||
-rw-r--r-- | doc/tools/bmenu/Makefile.am | 8 | ||||
-rw-r--r-- | doc/tools/pdl2texi/.cvsignore | 4 | ||||
-rw-r--r-- | doc/tools/src2html/.cvsignore | 2 | ||||
-rw-r--r-- | doc/tools/src2html1.4a/.cvsignore | 2 | ||||
-rw-r--r-- | doc/tools/src2html1.4a/Ctags/.cvsignore | 4 | ||||
-rw-r--r-- | doc/tools/src2html1.4a/FreeBSD/.cvsignore | 2 | ||||
-rw-r--r-- | doc/tools/src2html1.4a/ctags-emacs/.cvsignore | 2 | ||||
-rw-r--r-- | doc/tools/texi2www/.cvsignore | 2 | ||||
-rw-r--r-- | doc/tools/word-replace2 | 20 |
11 files changed, 39 insertions, 25 deletions
diff --git a/doc/tools/.cvsignore b/doc/tools/.cvsignore index 7663ba0604..525275c115 100644 --- a/doc/tools/.cvsignore +++ b/doc/tools/.cvsignore @@ -1,6 +1,13 @@ -aclocal.m4 -configure +Makefile Makefile.in +aclocal.m4 +config.cache +config.guess config.log config.status -Makefile +config.sub +configure +depcomp +install-sh +missing +mkinstalldirs diff --git a/doc/tools/bmenu/.cvsignore b/doc/tools/bmenu/.cvsignore index c61522900c..27f2171dc1 100644 --- a/doc/tools/bmenu/.cvsignore +++ b/doc/tools/bmenu/.cvsignore @@ -1,4 +1,5 @@ -Makefile.in -Makefile .deps +Makefile +Makefile.in bmenu +bmenu2 diff --git a/doc/tools/bmenu/Makefile.am b/doc/tools/bmenu/Makefile.am index 122467187b..51dd466a4c 100644 --- a/doc/tools/bmenu/Makefile.am +++ b/doc/tools/bmenu/Makefile.am @@ -8,9 +8,15 @@ AUTOMAKE_OPTIONS = foreign 1.4 -noinst_PROGRAMS=bmenu +noinst_PROGRAMS=bmenu bmenu2 bmenu_SOURCES = \ address.h chain.c isr.h \ address.inl chain.h main.c \ base.h chain.inl system.h + +bmenu2_SOURCES = \ +address.h chain.c isr.h \ +address.inl chain.h bmenu2.c \ +base.h chain.inl system.h + diff --git a/doc/tools/pdl2texi/.cvsignore b/doc/tools/pdl2texi/.cvsignore index 2ef4dad165..409c01ea4f 100644 --- a/doc/tools/pdl2texi/.cvsignore +++ b/doc/tools/pdl2texi/.cvsignore @@ -1,4 +1,4 @@ -Makefile.in -Makefile .deps +Makefile +Makefile.in pdl2texi diff --git a/doc/tools/src2html/.cvsignore b/doc/tools/src2html/.cvsignore index 3dda72986f..282522db03 100644 --- a/doc/tools/src2html/.cvsignore +++ b/doc/tools/src2html/.cvsignore @@ -1,2 +1,2 @@ -Makefile.in Makefile +Makefile.in diff --git a/doc/tools/src2html1.4a/.cvsignore b/doc/tools/src2html1.4a/.cvsignore index 3dda72986f..282522db03 100644 --- a/doc/tools/src2html1.4a/.cvsignore +++ b/doc/tools/src2html1.4a/.cvsignore @@ -1,2 +1,2 @@ -Makefile.in Makefile +Makefile.in diff --git a/doc/tools/src2html1.4a/Ctags/.cvsignore b/doc/tools/src2html1.4a/Ctags/.cvsignore index febb8e79bc..93a72f6c91 100644 --- a/doc/tools/src2html1.4a/Ctags/.cvsignore +++ b/doc/tools/src2html1.4a/Ctags/.cvsignore @@ -1,4 +1,4 @@ -Makefile.in -Makefile .deps +Makefile +Makefile.in ctags-new diff --git a/doc/tools/src2html1.4a/FreeBSD/.cvsignore b/doc/tools/src2html1.4a/FreeBSD/.cvsignore index 3dda72986f..282522db03 100644 --- a/doc/tools/src2html1.4a/FreeBSD/.cvsignore +++ b/doc/tools/src2html1.4a/FreeBSD/.cvsignore @@ -1,2 +1,2 @@ -Makefile.in Makefile +Makefile.in diff --git a/doc/tools/src2html1.4a/ctags-emacs/.cvsignore b/doc/tools/src2html1.4a/ctags-emacs/.cvsignore index 3dda72986f..282522db03 100644 --- a/doc/tools/src2html1.4a/ctags-emacs/.cvsignore +++ b/doc/tools/src2html1.4a/ctags-emacs/.cvsignore @@ -1,2 +1,2 @@ -Makefile.in Makefile +Makefile.in diff --git a/doc/tools/texi2www/.cvsignore b/doc/tools/texi2www/.cvsignore index 3dda72986f..282522db03 100644 --- a/doc/tools/texi2www/.cvsignore +++ b/doc/tools/texi2www/.cvsignore @@ -1,2 +1,2 @@ -Makefile.in Makefile +Makefile.in diff --git a/doc/tools/word-replace2 b/doc/tools/word-replace2 index a56d88a688..55d24fcb9b 100644 --- a/doc/tools/word-replace2 +++ b/doc/tools/word-replace2 @@ -76,26 +76,26 @@ if ( $#ARGV > -1 ) shift @ARGV ; } -print STDERR "$outfile\t"; - open (INFILE, "<$infile") || die "could not open input file $infile: $!"; +$line = join('',<INFILE>) ; +close INFILE; + + +print STDERR "$outfile\t"; open (OUTFILE, ">$outfile") || die "could not open output file $outfile: $!"; -$line = join('',<INFILE>) ; - - foreach $key (keys %patterns) +foreach $key (keys %patterns) +{ + if ( $line =~ s/\b$key\b/$patterns{$key}/ge ) { - if ( $line =~ s/\b$key\b/$patterns{$key}/ge ) - { - print STDERR "." ; - } + print STDERR "." ; } +} print OUTFILE $line ; print STDERR "\n"; -close INFILE; close OUTFILE; |