X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/d026567169117ec75730af8e7bc75ee589117e4e..e2be431cf9fb36275f577ea52b8593e9088e2558:/installman

diff --git a/installman b/installman
index 145c366..5f0a7a6 100755
--- a/installman
+++ b/installman
@@ -8,12 +8,14 @@ BEGIN {
 use strict;
 
 use Getopt::Long;
-use File::Find;
-use File::Path qw(mkpath);
+require File::Path;
 use ExtUtils::Packlist;
 use Pod::Man;
 use vars qw(%opts $packlist);
 
+require './Porting/pod_lib.pl';
+my %man1 = (map {($_->[0], $_->[1])} @{get_pod_metadata()->{master}});
+
 $ENV{SHELL} = 'sh' if $^O eq 'os2';
 
 my $patchlevel = substr($],3,2);
@@ -61,27 +63,25 @@ $opts{verbose} ||= $opts{V} || $opts{notify};
 
 $packlist = ExtUtils::Packlist->new("$opts{destdir}$Config{installarchlib}/.packlist");
 
-# manpages not to be installed
-my %do_not_install = map { ($_ => 1) } qw(
-    Pod/Functions.pm
-    XS/APItest.pm
-    XS/Typemap.pm
-);
-
 # Install the main pod pages.
-pod2man('pod', $opts{man1dir}, $opts{man1ext});
+pod2man(\%man1, $opts{man1dir}, $opts{man1ext}, 'pod');
 
 # Install the pods for library modules.
-pod2man('lib', $opts{man3dir}, $opts{man3ext});
+{
+    my $found = pods_to_install();
+    pod2man($found->{$_}, $opts{man3dir}, $opts{man3ext}, 'lib')
+        foreach qw(MODULE PRAGMA);
+}
 
 # Install the pods embedded in the installed scripts
 my $has_man1dir = $opts{man1dir} ne '' && -d $opts{man1dir};
-open UTILS, "utils.lst" or die "Can't open 'utils.lst': $!";
-while (<UTILS>) {
+my $fh = open_or_die('utils.lst');
+while (<$fh>) {
     next if /^#/;
     chomp;
-    $_ = $1 if /#.*pod\s*=\s*(\S+)/;
     my ($path, $leaf) = m|^(\S*/(\S+))|;
+    # Have we already installed the manpage for this? (eg perldoc, a2p)
+    next if $man1{$leaf};
     pod2man({$leaf, $path}, $opts{man1dir}, $opts{man1ext});
     if ($has_man1dir) {
         if (my ($link) = m|#.*link\s*=\s*\S+/(\S+)|) {
@@ -89,78 +89,53 @@ while (<UTILS>) {
             my $new = "$opts{man1dir}/$link.$opts{man1ext}";
 	    unlink($new);
 	    link($old, $new);
-	    my $xold = $old;
-	    $xold =~ s/^\Q$opts{'destdir'}\E// if $opts{'destdir'};
-	    my $xnew = $new;
-	    $xnew =~ s/^\Q$opts{'destdir'}\E// if $opts{'destdir'};
-	    $packlist->{$xnew} = { from => $xold, type => 'link' };
+            $old =~ s/^\Q$opts{destdir}\E// if $opts{destdir};
+            $new =~ s/^\Q$opts{destdir}\E// if $opts{destdir};
+            $packlist->{$new} = { from => $old, type => 'link' };
 	}
     }
 }
+close $fh or my_die("close 'utils.lst': $!");
 
 sub pod2man {
-    my($what, $mandir, $manext) = @_;
+    my($modpods, $mandir, $manext, $where) = @_;
     if ($mandir eq ' ' or $mandir eq '') {
-        if (ref $what) {
+        if ($where) {
+            warn "Skipping installation of $where man pages.\n"
+        } else {
             warn "Skipping installation of $_ man page.\n"
-                foreach values %$what;
-	} else {
-            warn "Skipping installation of $what man pages.\n"
-	}
-	return;
+                foreach values %$modpods;
+        }
+        return;
     }
 
     if ($opts{verbose}) {
-        if (ref $what) {
-            print "installing $_\n"
-                foreach sort keys %$what;
+        if ($where) {
+            print "installing from $where\n";
         } else {
-            print "installing from $what\n";
+            print "installing $_\n"
+                foreach sort keys %$modpods;
         }
     }
 
-    mkpath($mandir, $opts{verbose}, 0777) unless $opts{notify};  # In File::Path
-
-    my $modpods;
-    if (ref $what) {
-        $modpods = $what;
-    }
-    else {
-        # Make a list of all the .pm and .pod files in the directory.
-	File::Find::find({no_chdir=>1,
-                          wanted => sub {
-                              # $_ is $File::Find::name when using no_chdir
-                              if (-f $_ and /\.p(?:m|od)$/) {
-                                  my $pod = $_;
-                                  # Skip .pm files that have corresponding .pod files
-                                  return if $pod =~ s/\.pm$/.pod/ && -f $pod;
-                                  return if m!(?:^|/)t/!;
-                                  s!^\Q$what\E/!!;
-                                  return if $do_not_install{$_};
-                                  # perlfaq manpages are installed in section 1,
-                                  # so skip when searching files for section 3
-                                  return if m(perlfaq.?\.pod|perlglossary.pod);
-                                  $modpods->{$_} = $File::Find::name;
-                              }
-                          }},
-                         $what);
-    }
+    File::Path::mkpath($mandir, $opts{verbose}, 0777) unless $opts{notify};
 
     foreach my $manpage (sort keys %$modpods) {
         my $mod = $modpods->{$manpage};
 
 	# Skip files without pod docs
 	my $has_pod;
-	if (open T, $mod)
-	{
-	    local $_;
-	    while (<T>)
-	    {
-                ++$has_pod and last if /^=head1\b/;
-	    }
-
-	    close T;
-	}
+        my $fh = open_or_die($mod);
+        while (my $line = <$fh>) {
+            if ($line =~ /^=head1\b/) {
+                ++$has_pod;
+                last;
+            }
+        }
+	close $fh or my_die("close '$mod': $!");
+        # Sadly it doesn't seem possible to re-use this handle for the call
+        # to parse_from_file() below, as Pod::Man relies on source_filename(),
+        # which Pod::Simple only sets accurately if it opens the file itself.
 
 	unless ($has_pod)
 	{
@@ -168,14 +143,8 @@ sub pod2man {
 	    next;
 	}
 
-	# Convert name from  File/Basename.pm to File::Basename.3 format,
-	# if necessary.
-	$manpage =~ s#\.p(m|od)$##;
 	if ($^O eq 'os2' || $^O eq 'amigaos' || $^O eq 'uwin' || $^O eq 'cygwin') {
-	  $manpage =~ s#/#.#g;
-	}
-	else {
-	  $manpage =~ s#/#::#g;
+            $manpage =~ s#::#.#g;
 	}
         my $tmp = "${mandir}/${manpage}.tmp";
 	$manpage = "${mandir}/${manpage}.${manext}";
@@ -202,8 +171,6 @@ sub pod2man {
 $packlist->write() unless $opts{notify};
 print "  Installation complete\n" if $opts{verbose};
 
-exit 0;
-
 sub rename {
     my($from,$to) = @_;
     if (-f $to and not unlink($to)) {