X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=installman;h=38bd0af10e867da3f7e865695a76be777eb926d7;hb=21c92a1de962a30d8936572d83b08b08e916d3e4;hp=b6765632fe9baf822c7a6361b39497542928e52b;hpb=e50aee73b3d4c555c37e4b4a16694765fb16c887;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/installman b/installman
index b676563..38bd0af 100644
--- a/installman
+++ b/installman
@@ -3,9 +3,12 @@ BEGIN { @INC = ('lib') }
 use Config;
 use Getopt::Long;
 use File::Find;
+use File::Path qw(mkpath);
+use subs qw(unlink chmod rename link);
 require Cwd;
 
 umask 022;
+$ENV{SHELL} = 'sh' if $^O eq 'os2';
 
 $ver = $];
 $release = substr($ver,0,3);   # Not used presently.
@@ -25,8 +28,9 @@ $usage =
 	man3ext = $Config{'man3ext'};
 	--notify (or -n) just lists commands that would be executed.\n";
 
-GetOptions( qw( man1dir=s man1ext=s man3dir=s man3ext=s notify help)) 
+GetOptions( qw( man1dir=s man1ext=s man3dir=s man3ext=s notify n help)) 
 	|| die $usage;
+die $usage if $opt_help;
 
 # These are written funny to avoid -w typo warnings.
 $man1dir = defined($opt_man1dir) ? $opt_man1dir : $Config{'installman1dir'};
@@ -34,15 +38,16 @@ $man1ext = defined($opt_man1ext) ? $opt_man1ext : $Config{'man1ext'};
 $man3dir = defined($opt_man3dir) ? $opt_man3dir : $Config{'installman3dir'};
 $man3ext = defined($opt_man3ext) ? $opt_man3ext : $Config{'man3ext'};
 
-$notify = defined($opt_notify) ? $opt_notify : 0;
+$notify = $opt_notify || $opt_n;
 
 #Sanity checks
 
--x  "./perl"	|| warn "./perl not found!  Have you run make?\n";
+-x  "./perl$Config{exe_ext}" 
+  or warn "./perl$Config{exe_ext} not found!  Have you run make?\n";
 -d  $Config{'installprivlib'}
 	|| warn "Perl library directory $Config{'installprivlib'} not found.
 		Have you run make install?.  (Installing anyway.)\n";
--x 't/TEST'		|| warn "WARNING: You've never run 'make test'!!!",
+-x "t/perl$Config{exe_ext}"		|| warn "WARNING: You've never run 'make test'!!!",
 	"  (Installing anyway.)\n";
 
 # Install the main pod pages.
@@ -66,16 +71,16 @@ sub runpod2man {
     # are enhancements or changes from previous installed versions.
     # The error message doesn't include the '..' because the user
     # won't be aware that we've chdir to $poddir.
-    -x  "../pod/pod2man" || die "Executable pod/pod2man not found.\n";
+    -r  "../pod/pod2man" || die "Executable pod/pod2man not found.\n";
 
     # We want to be sure to use the current perl.  We can't rely on
     # the installed perl because it might not be actually installed
     # yet. (The user may have set the $install* Configure variables 
     # to point to some temporary home, from which the executable gets
     # installed by occult means.)
-    $pod2man = "../perl -I ../lib ../pod/pod2man";
+    $pod2man = "../perl -I ../lib ../pod/pod2man --section=$manext --official";
 
-    &makedir($mandir);
+    mkpath($mandir, 1, 0777);  # In File::Path
     # Make a list of all the .pm and .pod files in the directory.  We will
     # always run pod2man from the lib directory and feed it the full pathname
     # of the pod.  This might be useful for pod2man someday.
@@ -83,13 +88,27 @@ sub runpod2man {
     find(\&lsmodpods, '.');
     foreach $mod (@modpods) {
 	$manpage = $mod;
+	my $tmp;
+	# Skip .pm files that have corresponding .pod files, and Functions.pm.
+	next if (($tmp = $mod) =~ s/\.pm$/.pod/ && -f $tmp);
+	next if ($mod eq 'Pod/Functions.pm');	#### Used only by pod itself
+
 	# Convert name from  File/Basename.pm to File::Basename.3 format,
 	# if necessary.
 	$manpage =~ s#\.p(m|od)$##;
-	$manpage =~ s#/#::#g;
+	if ($^O eq 'os2') {
+	  $manpage =~ s#/#.#g;
+	} else {
+	  $manpage =~ s#/#::#g;
+	}
+	$tmp = "${mandir}/${manpage}.tmp";
 	$manpage = "${mandir}/${manpage}.${manext}";
-	# Print $release $patchlevel stuff?  or should pod2man do that?
-	&cmd("$pod2man $mod > $manpage");
+	if (&cmd("$pod2man $mod > $tmp") == 0 && !$notify && -s $tmp) {
+	    rename($tmp, $manpage) && next;
+	}
+	unless ($notify) {
+    unlink($tmp);
+	}
     }
     chdir "$builddir" || die "Unable to cd back to $builddir directory!\n$!\n";
 }
@@ -115,39 +134,62 @@ sub cmd {
     local($cmd) = @_;
     print STDERR "  $cmd\n";
     unless ($notify) {
-	system $cmd;
-	warn "Command failed!!!\n" if $?;
+	if ($Config{d_fork}) {
+	    fork ? wait : exec $cmd;  # Allow user to ^C out of command.
+	}
+	else {
+	    system $cmd;
+	}
+	warn "Command failed!!\n" if $?;
+    }
+    return $? != 0;
+}
+
+sub unlink {
+    local(@names) = @_;
+    my $cnt = 0;
+
+    foreach $name (@names) {
+next unless -e $name;
+chmod 0777, $name if $^O eq 'os2';
+print STDERR "  unlink $name\n";
+( CORE::unlink($name) and ++$cnt 
+    or warn "Couldn't unlink $name: $!\n" ) unless $nonono;
     }
+    return $cnt;
 }
 
 sub link {
     local($from,$to) = @_;
 
     print STDERR "  ln $from $to\n";
-    link($from,$to) || warn "Couldn't link $from to $to: $!\n" unless $notify;
+    eval { CORE::link($from,$to) }
+|| system('cp', $from, $to) == 0
+|| warn "Couldn't link $from to $to: $!\n" unless $notify;
+}
+
+sub rename {
+    local($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);
 }
 
 sub chmod {
     local($mode,$name) = @_;
 
     printf STDERR "  chmod %o %s\n", $mode, $name;
-    chmod($mode,$name) || warn sprintf("Couldn't chmod %o %s: $!\n",$mode,$name)
+    CORE::chmod($mode,$name) || warn sprintf("Couldn't chmod %o %s: $!\n",$mode,$name)
 	unless $notify;
 }
 
-sub makedir {
-    local($dir) = @_;
-    unless (-d $dir) {
-	local($shortdir) = $dir;
-
-	$shortdir =~ s#(.*)/.*#$1#;
-	&makedir($shortdir);
-
-	print STDERR "  mkdir $dir\n";
-	mkdir($dir, 0777) || warn "Couldn't create $dir: $!\n" unless $notify;
-    }
-}
-
 sub samepath {
     local($p1, $p2) = @_;
     local($dev1, $ino1, $dev2, $ino2);