Skip to content

Commit

Permalink
Documentation: fix dependency generation.
Browse files Browse the repository at this point in the history
The previous rule misses the case where git.txt or tutorial.txt
includes new files.

Signed-off-by: Junio C Hamano <junkio@cox.net>
  • Loading branch information
Junio C Hamano committed Nov 8, 2005
1 parent b2d09f0 commit fb612d5
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 11 deletions.
3 changes: 1 addition & 2 deletions Documentation/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,7 @@ install: man
#
# Determine "include::" file references in asciidoc files.
#
TEXTFILES = $(wildcard git-*.txt)
doc.dep : $(TEXTFILES) build-docdep.perl
doc.dep : $(wildcard *.txt) build-docdep.perl
rm -f $@+ $@
perl ./build-docdep.perl >$@+
mv $@+ $@
Expand Down
44 changes: 35 additions & 9 deletions Documentation/build-docdep.perl
Original file line number Diff line number Diff line change
@@ -1,28 +1,54 @@
#!/usr/bin/perl

my %include = ();
my %included = ();

for my $text (<git-*.txt>) {
for my $text (<*.txt>) {
open I, '<', $text || die "cannot read: $text";
(my $base = $text) =~ s/\.txt$//;
while (<I>) {
if (/^include::/) {
chomp;
s/^include::\s*//;
s/\[\]//;
$include{$base}{$_} = 1;
$include{$text}{$_} = 1;
$included{$_} = 1;
}
}
close I;
}

# Do we care about chained includes???

while (my ($base, $included) = each %include) {
my ($suffix) = '1';
if ($base eq 'git') {
$suffix = '7'; # yuck...
my $changed = 1;
while ($changed) {
$changed = 0;
while (my ($text, $included) = each %include) {
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";
}
}

0 comments on commit fb612d5

Please sign in to comment.