X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=pod%2Fbuildtoc;h=4054fdac431b6ddd90b5973e3e2d889da35142e7;hb=6e0733998eff7a098d2d21d5602f3eb2a7521e1f;hp=4d61eab644fb9a2537fd8f38aa5dafa30cbe1266;hpb=d525b9bcd92b1f03636e9bd59ae526cc52792c4c;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/pod/buildtoc b/pod/buildtoc
index 4d61eab..4054fda 100644
--- a/pod/buildtoc
+++ b/pod/buildtoc
@@ -2,7 +2,8 @@
 
 use strict;
 use vars qw($masterpodfile %Build %Targets $Verbose $Up %Ignore
-	    @Master %Readmes %Pods %Aux %Readmepods %Pragmata %Modules);
+	    @Master %Readmes %Pods %Aux %Readmepods %Pragmata %Modules
+	    %Copies);
 use File::Spec;
 use File::Find;
 use FindBin;
@@ -31,6 +32,8 @@ $masterpodfile = File::Spec->catdir($Up, "pod.lst");
      dmake => File::Spec->catdir($Up, "win32", "makefile.mk"),
      podmak => File::Spec->catdir($Up, "win32", "pod.mak"),
      # plan9 =>  File::Spec->catdir($Up, "plan9", "mkfile"),
+     unix => File::Spec->catdir($Up, "Makefile.SH"),
+     # TODO: add roffitall
     );
 
 {
@@ -67,7 +70,6 @@ __USAGE__
 # Don't copy these top level READMEs
 %Ignore
   = (
-     Y2K => 1,
      micro => 1,
 #     vms => 1,
      );
@@ -80,17 +82,19 @@ chdir $FindBin::Bin or die "$0: Can't chdir $FindBin::Bin: $!";
 
 open MASTER, $masterpodfile or die "$0: Can't open $masterpodfile: $!";
 
+my ($delta_source, $delta_target);
+
 foreach (<MASTER>) {
   next if /^\#/;
 
   # At least one upper case letter somewhere in the first group
-  if (/^(\S+)\s(.*)/ && $1 =~ tr/A-Z//) {
+  if (/^(\S+)\s(.*)/ && $1 =~ tr/h//) {
     # it's a heading
     my $flags = $1;
+    $flags =~ tr/h//d;
     my %flags = (header => 1);
-    $flags{toc_omit} = 1 if $flags =~ tr/O//d;
-    $flags{include} = 1 if $flags =~ tr/I//d;
-    $flags{aux} = 1 if $flags =~ tr/A//d;
+    $flags{toc_omit} = 1 if $flags =~ tr/o//d;
+    $flags{aux} = 1 if $flags =~ tr/a//d;
     die "$0: Unknown flag found in heading line: $_" if length $flags;
     push @Master, [\%flags, $2];
 
@@ -100,8 +104,18 @@ foreach (<MASTER>) {
 
     my %flags = (indent => 0);
     $flags{indent} = $1 if $flags =~ s/(\d+)//;
-    $flags{toc_omit} = 1 if $flags =~ tr/o//d;
+    $flags{toc_omit} = 1 if $flags =~ tr/o//d; 
     $flags{aux} = 1 if $flags =~ tr/a//d;
+
+    if ($flags =~ tr/D//d) {
+      $flags{perlpod_omit} = 1;
+      $delta_source = "$filename.pod";
+    }
+    if ($flags =~ tr/d//d) {
+      $flags{manifest_omit} = 1;
+      $delta_target = "$filename.pod";
+    }
+
     if ($flags =~ tr/r//d) {
       my $readme = $filename;
       $readme =~ s/^perl//;
@@ -120,6 +134,19 @@ foreach (<MASTER>) {
     die "$0: Malformed line: $_" if $1 =~ tr/A-Z//;
   }
 }
+if (defined $delta_source) {
+  if (defined $delta_target) {
+    # This way round so that keys can act as a MANIFEST skip list
+    # Targets will aways be in the pod directory. Currently we can only cope
+    # with sources being in the same directory. Fix this and do perlvms.pod
+    # with this?
+    $Copies{$delta_target} = $delta_source;
+  } else {
+    die "$0: delta source defined but not target";
+  }
+} elsif (defined $delta_target) {
+  die "$0: delta target defined but not target";
+}
 
 close MASTER;
 
@@ -130,6 +157,7 @@ close MASTER;
   my (@manireadmes, %manireadmes);
   my (@perlpods, %perlpods);
   my (%our_pods);
+  my (%sources);
 
   # Convert these to a list of filenames.
   foreach (keys %Pods, keys %Readmepods) {
@@ -140,6 +168,10 @@ close MASTER;
   @disk_pods = glob("*.pod");
   @disk_pods{@disk_pods} = @disk_pods;
 
+  # Things we copy from won't be in perl.pod
+  # Things we copy to won't be in MANIFEST
+  @sources{values %Copies} = ();
+
   open(MANI, "../MANIFEST") || die "$0: opening ../MANIFEST failed: $!";
   while (<MANI>) {
     if (m!^pod/([^.]+\.pod)\s+!i) {
@@ -170,9 +202,9 @@ close MASTER;
     warn "$0: $i exists but is unknown by buildtoc\n"
       unless $our_pods{$i};
     warn "$0: $i exists but is unknown by ../MANIFEST\n"
-      if !$manipods{$i} && !$manireadmes{$i};
+      if !$manipods{$i} && !$manireadmes{$i} && !$Copies{$i};
     warn "$0: $i exists but is unknown by perl.pod\n"
-	unless $perlpods{$i};
+	if !$perlpods{$i} && !exists $sources{$i};
   }
   foreach my $i (sort keys %our_pods) {
     warn "$0: $i is known by buildtoc but does not exist\n"
@@ -242,7 +274,7 @@ close MASTER;
   }
 }
 
-# OK. Now a lot of ancillay function definitions follow
+# OK. Now a lot of ancillary function definitions follow
 # Main program returns at "Do stuff"
 
 sub path2modname {
@@ -259,7 +291,7 @@ sub output ($);
 sub output_perltoc {
   open(OUT, ">perltoc.pod") || die "$0: creating perltoc.pod failed: $!";
 
-  $/ = '';
+  local $/ = '';
 
   ($_= <<"EOPOD2B") =~ s/^\t//gm && output($_);
 
@@ -351,6 +383,8 @@ sub podset {
 	    unhead1();
 	    output "\n \n\n=head2 ";
 	    $_ = <>;
+	    # Remove svn keyword expansions from the Perl FAQ
+	    s/ \(\$Revision: \d+ \$\)//g;
 	    if ( /^\s*$pod\b/ ) {
 		s/$pod\.pm/$pod/;       # '.pm' in NAME !?
 		output $_;
@@ -453,6 +487,7 @@ sub generate_perlpod {
   foreach (@Master) {
     my $flags = $_->[0];
     next if $flags->{aux};
+    next if $flags->{perlpod_omit};
 
     if (@$_ == 2) {
       # Heading
@@ -486,7 +521,8 @@ sub generate_manifest {
   map {s/ \t/\t\t/g; $_} @temp;
 }
 sub generate_manifest_pod {
-  generate_manifest map {["pod/$_.pod", $Pods{$_}]} sort keys %Pods;
+  generate_manifest map {["pod/$_.pod", $Pods{$_}]}
+    grep {!$Copies{"$_.pod"}} sort keys %Pods;
 }
 sub generate_manifest_readme {
   generate_manifest map {["README.$_", $Readmes{$_}]} sort keys %Readmes;
@@ -507,23 +543,25 @@ sub generate_descrip_mms_1 {
   local $Text::Wrap::columns = 150;
   my $count = 0;
   my @lines = map {"pod" . $count++ . " = $_"}
-    split /\n/, wrap('', '', join " ", map "[.lib.pod]$_.pod",
+    split /\n/, wrap('', '', join " ", map "[.lib.pods]$_.pod",
 		     sort keys %Pods, keys %Readmepods);
   @lines, "pod = " . join ' ', map {"\$(pod$_)"} 0 .. $count - 1;
 }
 
 sub generate_descrip_mms_2 {
   map {sprintf <<'SNIP', $_, $_ eq 'perlvms' ? 'vms' : 'pod', $_}
-[.lib.pod]%s.pod : [.%s]%s.pod
-	@ If F$Search("[.lib]pod.dir").eqs."" Then Create/Directory [.lib.pod]
-	Copy/NoConfirm/Log $(MMS$SOURCE) [.lib.pod]
+[.lib.pods]%s.pod : [.%s]%s.pod
+	@ If F$Search("[.lib]pods.dir").eqs."" Then Create/Directory [.lib.pods]
+	Copy/NoConfirm/Log $(MMS$SOURCE) [.lib.pods]
 SNIP
    sort keys %Pods, keys %Readmepods;
 }
 
 sub generate_nmake_1 {
-  map {sprintf "\tcopy ..\\README.%-8s .\\perl$_.pod\n", $_}
-    sort keys %Readmes;
+  # XXX Fix this with File::Spec
+  (map {sprintf "\tcopy ..\\README.%-8s ..\\pod\\perl$_.pod\n", $_}
+    sort keys %Readmes),
+      (map {"\tcopy ..\\pod\\$Copies{$_} ..\\pod\\$_\n"} sort keys %Copies);
 }
 
 # This doesn't have a trailing newline
@@ -531,7 +569,8 @@ sub generate_nmake_2 {
   # Spot the special case
   local $Text::Wrap::columns = 76;
   my $line = wrap ("\t    ", "\t    ",
-		   join " ", sort map {"perl$_.pod"} "vms", keys %Readmes);
+		   join " ", sort keys %Copies,
+				  map {"perl$_.pod"} "vms", keys %Readmes);
   $line =~ s/$/ \\/mg;
   $line;
 }
@@ -568,9 +607,11 @@ sub do_nmake {
   my $sections = () = $makefile =~ m/\0+/g;
   die "$0: $name contains no README copies" if $sections < 1;
   die "$0: $name contains discontiguous README copies" if $sections > 1;
-  $makefile =~ s/\0+/join "", &generate_nmake_1/se;
+  # Now remove the other copies that follow
+  1 while $makefile =~ s/\0\tcopy .*\n/\0/gm;
+  $makefile =~ s/\0+/join ("", &generate_nmake_1)/se;
 
-  $makefile =~ s{(cd \$\(PODDIR\) && del /f [^\n]+).*?(pod2html)}
+  $makefile =~ s{(del /f [^\n]+podchecker[^\n]+).*?(pod2html)}
     {"$1\n" . &generate_nmake_2."\n\t    $2"}se;
   $makefile;
 }
@@ -589,7 +630,7 @@ sub do_perlpod {
 		   )+
 		  }
 	  {$1 . join "", &generate_perlpod}mxe) {
-    die "$0: Failed to insert ammendments in do_perlpod";
+    die "$0: Failed to insert amendments in do_perlpod";
   }
   $pod;
 }
@@ -619,13 +660,13 @@ sub do_vms {
   die "$0: $name contains NUL bytes" if $makefile =~ /\0/;
 
 # Looking for rules like this
-# [.lib.pod]perl.pod : [.pod]perl.pod
-#	@ If F$Search("[.lib]pod.dir").eqs."" Then Create/Directory [.lib.pod]
-#	Copy/NoConfirm/Log $(MMS$SOURCE) [.lib.pod]
+# [.lib.pods]perl.pod : [.pod]perl.pod
+#	@ If F$Search("[.lib]pods.dir").eqs."" Then Create/Directory [.lib.pods]
+#	Copy/NoConfirm/Log $(MMS$SOURCE) [.lib.pods]
 
-  $makefile =~ s/\n\Q[.lib.pod]\Eperl[^\n\.]*\.pod[^\n]+\n
+  $makefile =~ s/\n\Q[.lib.pods]\Eperl[^\n\.]*\.pod[^\n]+\n
 		 [^\n]+\n	# Another line
-		 [^\n]+\Q[.lib.pod]\E\n		# ends [.lib.pod]
+		 [^\n]+\Q[.lib.pods]\E\n		# ends [.lib.pods]
 		    /\0/gsx;
   $sections = () = $makefile =~ m/\0+/g;
   die "$0: $name contains no copy rules" if $sections < 1;
@@ -635,6 +676,27 @@ sub do_vms {
   $makefile;
 }
 
+sub do_unix {
+  my $name = shift;
+  my $makefile_SH = join '', @_;
+  die "$0: $name contains NUL bytes" if $makefile_SH =~ /\0/;
+
+  $makefile_SH =~ s/\n\s+-\@test -f \S+ && cd pod && \$\(LNS\) \S+ \S+ && cd \.\. && echo "\S+" >> extra.pods \# See buildtoc\n/\0/gm;
+
+  my $sections = () = $makefile_SH =~ m/\0+/g;
+
+  die "$0: $name contains no copy rules" if $sections < 1;
+  die "$0: $name contains $sections discontigous copy rules"
+    if $sections > 1;
+
+  my @copy_rules = map "\t-\@test -f pod/$Copies{$_} && cd pod && \$(LNS) $Copies{$_} $_ && cd .. && echo \"pod/$_\" >> extra.pods # See buildtoc",
+    keys %Copies;
+
+  $makefile_SH =~ s/\0+/join "\n", '', @copy_rules, ''/se;
+  $makefile_SH;
+
+}
+
 # Do stuff
 
 my $built;
@@ -642,7 +704,9 @@ while (my ($target, $name) = each %Targets) {
   next unless $Build{$target};
   $built++;
   if ($target eq "toc") {
+    print "Now processing $name\n" if $Verbose;
     &output_perltoc;
+    print "Finished\n" if $Verbose;
     next;
   }
   print "Now processing $name\n" if $Verbose;