summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAkim Demaille <demaille@gostai.com>2008-11-21 21:21:52 +0100
committerJoel E. Denny <jdenny@ces.clemson.edu>2009-04-06 05:47:16 -0400
commitfadb13b5b32b5efb354d9083fd201d1dfdb30150 (patch)
treef372d938fd7e338cc156d83b94460fb7f86af885
parent72183df4da75116a496099c856097f7f049b2d8a (diff)
downloadbison-fadb13b5b32b5efb354d9083fd201d1dfdb30150.tar.gz
Display the changes in cross-options.texi.
* build-aux/cross-options.pl ($sep): New, to separate items. * doc/Makefile.am ($(srcdir)/cross-options.texi): Use diff to display the changes.
-rw-r--r--ChangeLog9
-rwxr-xr-xbuild-aux/cross-options.pl3
-rw-r--r--doc/Makefile.am4
3 files changed, 14 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 37dd3a6e..6e00950d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-11-21 Akim Demaille <demaille@gostai.com>
+
+ Display the changes in cross-options.texi.
+ * build-aux/cross-options.pl ($sep): New, to separate items.
+ * doc/Makefile.am ($(srcdir)/cross-options.texi): Use diff to display
+ the changes.
+
2008-11-20 Di-an Jan <dianj@freeshell.org>
Improves options in the manual.
@@ -5,7 +12,7 @@
(Option Cross Key): Implement FIXME: listing directives also.
* build-aux/cross-options.pl: Read from <STDIN> rather than <>.
(Short Option): Special case -d. Put arguments inside @option.
- (Bison Directive): Add column, automatically extracted from
+ (Bison Directive): Add column, automatically extracted from
src/scan-gram.l (actual name passed as the first argument)
with special case for %define.
* doc/Makefile.am (doc/cross-options.texi): Pass src/scan-gram.l
diff --git a/build-aux/cross-options.pl b/build-aux/cross-options.pl
index 8d507254..241c741b 100755
--- a/build-aux/cross-options.pl
+++ b/build-aux/cross-options.pl
@@ -61,9 +61,12 @@ while (<STDIN>)
}
}
+my $sep = '';
foreach my $long (sort keys %option)
{
# Avoid trailing spaces.
+ print $sep;
+ $sep = "\n";
print '@item @option{', $long, "}\n\@tab";
print ' @option{', $option{$long}, '}' if $option{$long};
print "\n\@tab";
diff --git a/doc/Makefile.am b/doc/Makefile.am
index f5ff34b2..3c403275 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -26,10 +26,12 @@ clean-local:
CROSS_OPTIONS_PL = $(top_srcdir)/build-aux/cross-options.pl
$(srcdir)/cross-options.texi: $(top_srcdir)/src/getargs.c $(CROSS_OPTIONS_PL)
- -rm -f $@ $@.tmp
+ mv -f $@ $@~ || : >$@~
+ -rm -f $@.tmp
cd $(top_builddir)/src && $(MAKE) $(AM_MAKEFLAGS) bison
$(top_builddir)/src/bison --help \
| perl $(CROSS_OPTIONS_PL) $(top_srcdir)/src/scan-gram.l >$@.tmp
+ diff -u $@~ $@.tmp || true
mv $@.tmp $@
MAINTAINERCLEANFILES = $(srcdir)/cross-options.texi