Documentation: fix dependency generation.

The previous rule misses the case where git.txt or tutorial.txt
includes new files.

Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano 2005-11-07 22:21:21 -08:00
parent b2d09f063a
commit fb612d54c1
2 changed files with 36 additions and 11 deletions

View file

@ -53,8 +53,7 @@ install: man
# #
# Determine "include::" file references in asciidoc files. # Determine "include::" file references in asciidoc files.
# #
TEXTFILES = $(wildcard git-*.txt) doc.dep : $(wildcard *.txt) build-docdep.perl
doc.dep : $(TEXTFILES) build-docdep.perl
rm -f $@+ $@ rm -f $@+ $@
perl ./build-docdep.perl >$@+ perl ./build-docdep.perl >$@+
mv $@+ $@ mv $@+ $@

View file

@ -1,28 +1,54 @@
#!/usr/bin/perl #!/usr/bin/perl
my %include = (); my %include = ();
my %included = ();
for my $text (<git-*.txt>) { for my $text (<*.txt>) {
open I, '<', $text || die "cannot read: $text"; open I, '<', $text || die "cannot read: $text";
(my $base = $text) =~ s/\.txt$//;
while (<I>) { while (<I>) {
if (/^include::/) { if (/^include::/) {
chomp; chomp;
s/^include::\s*//; s/^include::\s*//;
s/\[\]//; s/\[\]//;
$include{$base}{$_} = 1; $include{$text}{$_} = 1;
$included{$_} = 1;
} }
} }
close I; close I;
} }
# Do we care about chained includes??? # Do we care about chained includes???
my $changed = 1;
while (my ($base, $included) = each %include) { while ($changed) {
my ($suffix) = '1'; $changed = 0;
if ($base eq 'git') { while (my ($text, $included) = each %include) {
$suffix = '7'; # yuck... print STDERR "Looking at $text...\n";
for my $i (keys %$included) {
print STDERR "$text includes $i.\n";
# $text has include::$i; if $i includes $j
# $text indirectly includes $j.
if (exists $include{$i}) {
print STDERR "$i includes something.\n";
for my $j (keys %{$include{$i}}) {
print STDERR "$text includes $i include $j\n";
if (!exists $include{$text}{$j}) {
$include{$text}{$j} = 1;
$included{$j} = 1;
$changed = 1;
}
}
}
}
} }
print "$base.html $base.$suffix : ", join(" ", keys %$included), "\n";
} }
while (my ($text, $included) = each %include) {
if (! exists $included{$text} &&
(my $base = $text) =~ s/\.txt$//) {
my ($suffix) = '1';
if ($base eq 'git') {
$suffix = '7'; # yuck...
}
print "$base.html $base.$suffix : ", join(" ", keys %$included), "\n";
}
}