Build perltoc.pod, rather than shipping it. This way it can't get out…

… of date.
gbarr · Apr 21, 2009 · 7eb4769 · 7eb4769
1 parent da09dfe
commit 7eb4769
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 38,425 deletions.
diff --git a/MANIFEST b/MANIFEST
@@ -3617,7 +3617,6 @@ pod/perlsub.pod			Perl subroutines
 pod/perlsyn.pod			Perl syntax
 pod/perlthrtut.pod		Perl threads tutorial
 pod/perltie.pod			Perl objects hidden behind simple variables
-pod/perltoc.pod			Perl documentation table of contents
 pod/perltodo.pod		Perl things to do
 pod/perltooc.pod		Perl OO tutorial, part 2
 pod/perltoot.pod		Perl OO tutorial, part 1

diff --git a/Makefile.SH b/Makefile.SH
@@ -454,7 +454,8 @@ mini_obj =  $(obj1) $(obj2) $(obj3) $(ARCHOBJS)
 ndt_obj = $(obj0) $(obj1) $(obj2) $(obj3) $(ARCHOBJS)
 obj = $(ndt_obj) $(DTRACE_O)
 
-generated_pods = extra.pods pod/perlapi.pod pod/perldelta.pod pod/perlintern.pod
+perltoc_pod_prereqs = extra.pods pod/perlapi.pod pod/perldelta.pod pod/perlintern.pod
+generated_pods = pod/perltoc.pod $(perltoc_pod_prereqs)
 
 lintflags = \
     -b \
@@ -971,6 +972,12 @@ uni.data: miniperl$(EXE_EXT) $(CONFIGPM) lib/unicore/mktables
 	cd lib/unicore && $(LDLIBPTH) $(RUN) ../../miniperl$(EXE_EXT) -I../../lib mktables -w
 	touch uni.data
 
+# perl$(EXE_EXT) and ext because buildtoc uses Text::Wrap uses re
+# But also this ensures that all extensions are built before we try to scan
+# them, which picks up Devel::PPPort's documentation.
+pod/perltoc.pod: $(perltoc_pod_prereqs) perl$(EXE_EXT) ext pod/buildtoc
+	$(RUN) ./perl$(EXE_EXT) -Ilib pod/buildtoc --build-toc -q
+
 pod/perlapi.pod pod/perlintern.pod: miniperl$(EXE_EXT) autodoc.pl embed.fnc
 	$(RUN) ./miniperl$(EXE_EXT) -Ilib autodoc.pl
 

diff --git a/pod.lst b/pod.lst
@@ -11,7 +11,7 @@ h Overview
 
   perl			Perl overview (this section)
   perlintro		Perl introduction for beginners
-  perltoc		Perl documentation table of contents
+g perltoc		Perl documentation table of contents
 
 h Tutorials
 

diff --git a/pod/buildtoc b/pod/buildtoc
@@ -699,8 +699,10 @@ sub do_unix {
   my $makefile_SH = join '', @_;
   die "$0: $name contains NUL bytes" if $makefile_SH =~ /\0/;
 
-  $makefile_SH =~ s{^(generated_pods = extra.pods).*}
-		   {join ' ', $1, map "pod/$_", sort keys %Generated, keys %Copies}mge;
+  $makefile_SH =~ s{^(perltoc_pod_prereqs = extra.pods).*}
+		   {join ' ', $1, map "pod/$_",
+			sort keys %Copies, grep {!/perltoc/} keys %Generated
+		    }mge;
 
 # pod/perldelta.pod: pod/perl511delta.pod
 # 	cd pod && $(LNS) perl511delta.pod perldelta.pod