This is more uniform. A lot of churn, though.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
-doctest.sd.mk
-doctest.mk.part
+doctests.sd.mk
+doctests.mk.part
# test cases for generate script
# doctests:
# test cases for generate script
# doctests:
-&:include &doctest.sd.mk
+&:include &doctests.sd.mk
-expand <../../README | ./extract-doctest . >/dev/null
+expand <../../README | ./extract-doctests . >/dev/null
../../generate sub/dir
files=$(find -name \*.expected)
../../generate sub/dir
files=$(find -name \*.expected)
o=$f.tmp
sed <$i >$o '
/^# doctests:/ {
o=$f.tmp
sed <$i >$o '
/^# doctests:/ {
- r '"${f%/*}/doctest.mk.part"'
+ r '"${f%/*}/doctests.mk.part"'
# script for extracting doctests from README
#
# usage:
# script for extracting doctests from README
#
# usage:
-# expand <README | tests/filter/extract-doctest tests/filter/
+# expand <README | tests/filter/extract-doctests tests/filter/
-# tests/filter/doctest.mk.part
-# tests/filter/sub/dir/doctest.mk.part
+# tests/filter/doctests.mk.part
+# tests/filter/sub/dir/doctests.mk.part
#
# Relies on some properties of the way README is laid out.
# See comments below marked `parse:' and `adhoc:'.
#
# Relies on some properties of the way README is laid out.
# See comments below marked `parse:' and `adhoc:'.
sub writeout ($) {
my ($dir_prefix) = @_;
sub writeout ($) {
my ($dir_prefix) = @_;
- open I, '>', "$outdir/${dir_prefix}doctest.sd.mk" or die $!;
- open O, '>', "$outdir/${dir_prefix}doctest.mk.part" or die $!;
- oh "# doctest starts $dir_prefix\n";
+ open I, '>', "$outdir/${dir_prefix}doctests.sd.mk" or die $!;
+ open O, '>', "$outdir/${dir_prefix}doctests.mk.part" or die $!;
+ oh "# doctests start $dir_prefix\n";
write_permode($dir_prefix,
'','','', 'normal',
sub { !$_[0]{DD} && !$_[0]{CQ} } );
write_permode($dir_prefix,
'','','', 'normal',
sub { !$_[0]{DD} && !$_[0]{CQ} } );
"",
'changequote',
sub { $_[0]{CQ} } );
"",
'changequote',
sub { $_[0]{CQ} } );
MAKEFILE_TEMPLATES += ./Final.sd.mk
MAKEFILE_TEMPLATES += ./Prefix.sd.mk
MAKEFILE_TEMPLATES += ./Suffix.sd.mk
MAKEFILE_TEMPLATES += ./Final.sd.mk
MAKEFILE_TEMPLATES += ./Prefix.sd.mk
MAKEFILE_TEMPLATES += ./Suffix.sd.mk
-MAKEFILE_TEMPLATES += ./doctest.sd.mk
+MAKEFILE_TEMPLATES += ./doctests.sd.mk
MAKEFILE_TEMPLATES += ./sub/dir/Dir.sd.mk
MAKEFILE_TEMPLATES += ./sub/dir/Dir.sd.mk
-MAKEFILE_TEMPLATES += ./sub/dir/doctest.sd.mk
+MAKEFILE_TEMPLATES += ./sub/dir/doctests.sd.mk
include $(SUBDIRMK_MAKEFILES)
include $(SUBDIRMK_MAKEFILES)
-&:include &doctest.sd.mk
+&:include &doctests.sd.mk
for f in $files; do
perl -pe '
(s/\n//, $stripnl=0) if $stripnl;
for f in $files; do
perl -pe '
(s/\n//, $stripnl=0) if $stripnl;
- next unless /^# doctest starts/../^# doctest ends/;
+ next unless /^# doctests start/../^# doctests end/;