Various updates and fixes to some of the SysV IPC ops and their tests

[perl5.git] / installman

diff --git a/installman b/installman
index cd8b094..0154be4 100755 (executable)
--- a/installman
+++ b/installman
@@ -1,17 +1,19 @@
 #!./perl -w
+
 BEGIN {
     @INC = qw(lib);
 
     # This needs to be at BEGIN time, before any use of Config
+    # install_lib itself loads and imports Config into main::
     require './install_lib.pl';
 }
+
 use strict;
 
 use Getopt::Long;
-require File::Path;
 use ExtUtils::Packlist;
 use Pod::Man;
-use vars qw(%opts $packlist);
+our ( %opts, $packlist );
 
 require './Porting/pod_lib.pl';
 my %man1 = (map {($_->[0], $_->[1])} @{get_pod_metadata()->{master}});
@@ -36,9 +38,12 @@ my $usage =
         --verbose (or -V) report all progress.
         --silent  (or -S) be silent. Only report errors.\n";
 
+# --strip intentionally does nothing. By permitting installman to accept it
+# without error, the Makefile can pass the same options to installperl and
+# installman, which permits more simplification there than this comment costs.
 GetOptions( \%opts,
             qw( man1dir=s man1ext=s man3dir=s man3ext=s
-                destdir:s notify n help silent S verbose V))
+                destdir:s notify|n help|h|? silent|S verbose|V strip))
        || die $usage;
 die $usage if $opts{help};
 $opts{destdir} //= '';
@@ -47,9 +52,13 @@ foreach my $pre (qw(man1 man3)) {
     $opts{"${pre}dir"} //= $opts{destdir} . $Config{"install${pre}dir"};
     $opts{"${pre}ext"} //= $Config{"${pre}ext"};
 }
-$opts{silent} ||= $opts{S};
-$opts{notify} ||= $opts{n};
-$opts{verbose} ||= $opts{V} || $opts{notify};
+$opts{verbose} ||= $opts{notify};
+
+# Explicitly disabled installation of man pages
+if ($opts{man1dir} eq '' && $opts{man3dir} eq '') {
+    warn "Manual page installation was disabled by Configure\n";
+    exit 0;
+}
 
 #Sanity checks
 
@@ -67,35 +76,37 @@ $packlist = ExtUtils::Packlist->new("$opts{destdir}$Config{installarchlib}/.pack
 pod2man(\%man1, $opts{man1dir}, $opts{man1ext}, 'pod');
 
 # Install the pods for library modules.
-{
+if ($opts{man3dir} ne '') {
     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};
-my $fh = open_or_die('utils.lst');
-while (<$fh>) {
-    next if /^#/;
-    chomp;
-    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+)|) {
-            my $old = "$opts{man1dir}/$leaf.$opts{man1ext}";
-            my $new = "$opts{man1dir}/$link.$opts{man1ext}";
-           unlink($new);
-           link($old, $new);
-            $old =~ s/^\Q$opts{destdir}\E// if $opts{destdir};
-            $new =~ s/^\Q$opts{destdir}\E// if $opts{destdir};
-            $packlist->{$new} = { from => $old, type => 'link' };
+if ($opts{man1dir} ne '') {
+    my $has_man1dir = -d $opts{man1dir};
+    my $fh = open_or_die('utils.lst');
+    while (<$fh>) {
+       next if /^#/;
+       chomp;
+       my ($path, $leaf) = m|^(\S*/(\S+))|;
+       # Have we already installed the manpage for this? (eg perldoc)
+       next if $man1{$leaf};
+       pod2man({$leaf, $path}, $opts{man1dir}, $opts{man1ext});
+       if ($has_man1dir) {
+           if (my ($link) = m|#.*link\s*=\s*\S+/(\S+)|) {
+               my $old = "$opts{man1dir}/$leaf.$opts{man1ext}";
+               my $new = "$opts{man1dir}/$link.$opts{man1ext}";
+               unlink($new);
+               link($old, $new);
+               $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': $!");
 }
-close $fh or my_die("close 'utils.lst': $!");
 
 sub pod2man {
     my($modpods, $mandir, $manext, $where) = @_;
@@ -118,7 +129,7 @@ sub pod2man {
         }
     }
 
-    File::Path::mkpath($mandir, $opts{verbose}, 0777) unless $opts{notify};
+    mkpath($mandir);
 
     foreach my $manpage (sort keys %$modpods) {
         my $mod = $modpods->{$manpage};
@@ -139,7 +150,7 @@ sub pod2man {
 
        unless ($has_pod)
        {
-           warn "no documentation in $mod\n" unless $opts{silent};
+           print "no documentation in $mod\n" if $opts{verbose};
            next;
        }
 
@@ -158,7 +169,10 @@ sub pod2man {
         print "  $xmanpage\n" unless $opts{silent};
         if (!$opts{notify} && $parser->parse_from_file($mod, $tmp)) {
             if (-s $tmp) {
-                if (rename($tmp, $manpage)) {
+                # We've already emitted a progress message for this file, if
+                # needed, so ensure safe_rename() doesn't emit another one.
+                local $opts{silent} = 1;
+                if (safe_rename($tmp, $manpage)) {
                     $packlist->{$xmanpage} = { type => 'file' };
                     next;
                 }
@@ -171,23 +185,4 @@ sub pod2man {
 $packlist->write() unless $opts{notify};
 print "  Installation complete\n" if $opts{verbose};
 
-sub rename {
-    my($from,$to) = @_;
-    if (-f $to and not unlink($to)) {
-       my($i);
-       for ($i = 1; $i < 50; $i++) {
-           last if CORE::rename($to, "$to.$i");
-       }
-       warn("Cannot rename to '$to.$i': $!"), return 0
-           if $i >= 50;        # Give up!
-    }
-    link($from,$to) || return 0;
-    unlink($from);
-}
-
-# Local variables:
-# cperl-indent-level: 4
-# indent-tabs-mode: nil
-# End:
-#
 # ex: set ts=8 sts=4 sw=4 et: