X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=installperl;h=da714586fac202b77f9a5c1c216b31e43ca426e2;hb=91bba347dac85baf813d9e41a1de89280909a30c;hp=fb4bb052420be551322b448852cb808a32bd63a8;hpb=3edbfbe5ecbb7e6fb99acc874379580a458f3cff;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/installperl b/installperl
index fb4bb05..da71458 100755
--- a/installperl
+++ b/installperl
@@ -1,7 +1,8 @@
 #!./perl
 BEGIN { @INC=('./lib', '../lib') }
-
 use File::Find;
+use File::Path qw(mkpath);
+use Config;
 
 $mainperldir = "/usr/bin";
 
@@ -13,39 +14,51 @@ while (@ARGV) {
 
 umask 022;
 
-@scripts = ('cppstdin', 'c2ph', 'pstruct', 'x2p/s2p', 'x2p/find2perl');
-@manpages = (<pod/*.man>, 'x2p/a2p.man', 'x2p/s2p.man');
-
-# Read in the config file.
+@scripts = qw(cppstdin
+		utils/c2ph utils/h2ph utils/h2xs utils/pstruct
+		utils/perlbug utils/perldoc
+		x2p/s2p x2p/find2perl
+		pod/pod2man pod/pod2html pod/pod2latex pod/pod2text);
 
-open(CONFIG, "config.sh") || die "You haven't run Configure yet!\n";
-while (<CONFIG>) {
-    if (s/^(\w+=)/\$$1/) {
-	$accum =~ s/'undef'/undef/g;
-	eval $accum;
-	$accum = '';
-    }
-    $accum .= $_;
-}
-close CONFIG;
+# pod documentation now handled by separate installman script.
+# These two are archaic leftovers.
+@manpages = qw(x2p/a2p.man x2p/s2p.man);
 
-open(PERL_C, "perl.c");
-while (<PERL_C>) {
-    last if /Revision:/;
-}
-close PERL_C;
-s/.*Revision: //;
-$major = $_ + 0;
+@pods = (<pod/*.pod>);
 
-$ver = sprintf("%5.3f", $major + $PATCHLEVEL / 1000);
-$release = substr($ver,0,3);
+$ver = $];
+$release = substr($ver,0,3);   # Not used presently.
 $patchlevel = substr($ver,3,2);
+die "Patchlevel of perl ($patchlevel)",
+    "and patchlevel of config.sh ($Config{'PATCHLEVEL'}) don't match\n"
+	if $patchlevel != $Config{'PATCHLEVEL'};
+
+# Fetch some frequently-used items from %Config
+$installbin = $Config{installbin};
+$installscript = $Config{installscript};
+$installprivlib = $Config{installprivlib};
+$installarchlib = $Config{installarchlib};
+$installsitelib = $Config{installsitelib};
+$installsitearch = $Config{installsitearch};
+$installman1dir = $Config{installman1dir};
+$man1ext = $Config{man1ext};
+# Did we build libperl as a shared library?
+$d_shrplib = $Config{d_shrplib};
+$shrpdir = $Config{shrpdir};
+# Shared library and dynamic loading suffixes.
+$so = $Config{so};
+$dlext = $Config{dlext};
+
+$d_dosuid = $Config{d_dosuid};
+$binexp = $Config{binexp};
+$osname = $Config{osname};
 
 # Do some quick sanity checks.
 
 if ($d_dosuid && $>) { die "You must run as root to install suidperl\n"; }
 
    $installbin		|| die "No installbin directory in config.sh\n";
+-d $installbin		|| mkpath($installbin, 1, 0777);
 -d $installbin		|| die "$installbin is not a directory\n";
 -w $installbin		|| die "$installbin is not writable by you\n"
 	unless $installbin =~ m#^/afs/# || $nonono;
@@ -56,12 +69,23 @@ if ($d_dosuid && $>) { die "You must run as root to install suidperl\n"; }
 -x 't/TEST'		|| warn "WARNING: You've never run 'make test'!!!",
 	"  (Installing anyway.)\n";
 
+if ($d_shrplib) {
+    if (!<libperl*.$so*>) {
+	warn "WARNING: Can't find libperl*.$so* to install into $shrpdir.",
+	    "  (Installing other things anyway.)\n";
+    } else {
+	mkpath($shrpdir, 1, 0777);
+	-w $shrpdir	|| $nonono || die "$shrpdir is not writable by you\n";
+	&cmd("cp libperl*.$so* $shrpdir");
+    }
+}
+
 # First we install the version-numbered executables.
 
-&unlink("$installbin/perl$ver");
+&safe_unlink("$installbin/perl$ver");
 &cmd("cp perl $installbin/perl$ver");
 
-&unlink("$installbin/sperl$ver");
+&safe_unlink("$installbin/sperl$ver");
 if ($d_dosuid) {
     &cmd("cp suidperl $installbin/sperl$ver");
     &chmod(04711, "$installbin/sperl$ver");
@@ -71,27 +95,21 @@ exit 0 if $versiononly;
 
 # Make links to ordinary names if installbin directory isn't current directory.
 
-($bdev,$bino) = stat($installbin);
-($ddev,$dino) = stat('.');
-
-if ($bdev != $ddev || $bino != $dino) {
-    &unlink("$installbin/perl", "$installbin/suidperl");
+if (! &samepath($installbin, '.')) {
+    &safe_unlink("$installbin/perl", "$installbin/suidperl");
     &link("$installbin/perl$ver", "$installbin/perl");
     &link("$installbin/sperl$ver", "$installbin/suidperl") if $d_dosuid;
 }
 
-($bdev,$bino) = stat($installbin);
-($ddev,$dino) = stat('x2p');
-
-if ($bdev != $ddev || $bino != $dino) {
-    &unlink("$installbin/a2p");
+if (! &samepath($installbin, 'x2p')) {
+    &safe_unlink("$installbin/a2p");
     &cmd("cp x2p/a2p $installbin/a2p");
     &chmod(0755, "$installbin/a2p");
 }
 
 # Install scripts.
 
-&makedir($installscript);
+mkpath($installscript, 1, 0777);
 
 for (@scripts) {
     if (-f $_) {   # cppstdin might not exist on this system.
@@ -100,20 +118,27 @@ for (@scripts) {
     }
 }
 
-# Install man pages.
+# Install pod pages.  Where? I guess in $installprivlib/pod.
+mkpath("${installprivlib}/pod", 1, 0777);
+foreach $file (@pods) {
+    # $file is a name like  pod/perl.pod
+    cp_if_diff($file, "${installprivlib}/${file}");
+}
+
+# Install old man pages.
 
-if ($installmansrc ne '') {
-    &makedir($installmansrc);
+if ($installman1dir ne '') {
+    mkpath($installman1dir, 1, 0777);
 
-    ($mdev,$mino) = stat($installmansrc);
-    if ($mdev != $ddev || $mino != $dino) {
+    if (! &samepath($installman1dir, '.')) {
 	for (@manpages) {
-	    ($new = $_) =~ s/man$/$manext/;
+	    ($new = $_) =~ s/man$/$man1ext/;
 	    $new =~ s#.*/##;
-	    print STDERR "  Installing $installmansrc/$new\n";
+	    print STDERR "  Installing $installman1dir/$new\n";
 	    next if $nonono;
 	    open(MI,$_) || warn "Can't open $_: $!\n";
-	    open(MO,">$installmansrc/$new") || warn "Can't install $installmansrc/$new: $!\n";
+	    open(MO,">$installman1dir/$new") || 
+		    warn "Can't install $installman1dir/$new: $!\n";
 	    print MO ".ds RP Release $release Patchlevel $patchlevel\n";
 	    while (<MI>) {
 		print MO;
@@ -128,16 +153,14 @@ if ($installmansrc ne '') {
 
 $do_installarchlib = $do_installprivlib = 0;
     
-&makedir($installprivlib);
-&makedir($installarchlib);
-if (chdir "lib") {
-    ($pdev,$pino) = stat($installarchlib);
-    ($ldev,$lino) = stat('.');
-    $do_installarchlib = ($pdev != $ldev || $pino != $lino);
+mkpath($installprivlib, 1, 0777);
+mkpath($installarchlib, 1, 0777);
+mkpath($installsitelib, 1, 0777) if ($installsitelib);
+mkpath($installsitearch, 1, 0777) if ($installsitearch);
 
-    ($pdev,$pino) = stat($installprivlib);
-    ($ldev,$lino) = stat('.');
-    $do_installprivlib = ($pdev != $ldev || $pino != $lino);
+if (chdir "lib") {
+    $do_installarchlib = ! &samepath($installarchlib, '.');
+    $do_installprivlib = ! &samepath($installprivlib, '.');
 
     if ($do_installarchlib || $do_installprivlib) {
 	find(\&installlib, '.');
@@ -148,32 +171,33 @@ else {
     warn "Can't cd to lib to install lib files: $!\n";
 }
 
-# Install header files
-makedir("$installarchlib/CORE");
-foreach $file (<*.h libperl*.a>) {
+# Install header files and libraries.
+mkpath("$installarchlib/CORE", 1, 0777);
+foreach $file (<*.h libperl*.*>) {
     cp_if_diff($file,"$installarchlib/CORE/$file");
 }
+# AIX needs perl.exp installed as well.
+cp_if_diff("perl.exp" ,"$installarchlib/CORE/perl.exp") if ($osname eq 'aix');
 
-# Offer to install perl in a "standard" location
+# If they have built sperl.o...
+cp_if_diff("sperl.o" ,"$installarchlib/CORE/sperl.o") if (-f 'sperl.o');
 
-($udev,$uino) = stat($mainperldir);
+
+# Offer to install perl in a "standard" location
 
 $mainperl_is_instperl = 0;
 
-if (-w _ && ($udev != $bdev || $uino != $bino) && !$nonono) {
+if (-w $mainperldir && ! &samepath($mainperldir, $installbin) && !$nonono) {
     # First make sure $mainperldir/perl is not already the same as
     # the perl we just installed
     if (-x "$mainperldir/perl") {
-	# Use stat so we detect symbolic links transparently 
-	($mpdev, $mpino) = stat("$mainperldir/perl");
-	($ipdev, $ipino) = stat("$installbin/perl");
 	# Try to be clever about mainperl being a symbolic link
 	# to binexp/perl if binexp and installbin are different.
 	$mainperl_is_instperl =
-	    (($mpdev == $ipdev && $mpino == $ipino) ||
+	    &samepath("$mainperldir/perl", "$installbin/perl") ||
 	     (($binexp ne $installbin) &&
 	      (-l "$mainperldir/perl") &&
-	      ((readlink "$mainperldir/perl") eq "$binexp/perl")));
+	      ((readlink "$mainperldir/perl") eq "$binexp/perl"));
     }
     if ((! $mainperl_is_instperl) &&
 	(&yn("Many scripts expect perl to be installed as " .
@@ -240,6 +264,22 @@ sub unlink {
     }
 }
 
+sub safe_unlink {
+    local(@names) = @_;
+
+    foreach $name (@names) {
+	next unless -e $name;
+	print STDERR "  unlink $name\n";
+	next if $nonono;
+	next if unlink($name);
+	warn "Couldn't unlink $name: $!\n";
+	if ($! =~ /busy/i) {
+	    print STDERR "  mv $name $name.old\n";
+	    &rename($name, "$name.old") || warn "Couldn't rename $name: $!\n";
+	}
+    }
+}
+
 sub cmd {
     local($cmd) = @_;
     print STDERR "  $cmd\n";
@@ -249,6 +289,19 @@ sub cmd {
     }
 }
 
+sub rename {
+    local($from,$to) = @_;
+    unless (unlink($to)) {
+	my($i);
+	for ($i = 1; $i < 50; $i++) {
+	    last if rename($to, "$to.$i");
+	}
+	return 0 if $i >= 50;	# Give up!
+    }
+    link($from,$to) || return 0;
+    unlink($from);
+}
+
 sub link {
     local($from,$to) = @_;
 
@@ -264,24 +317,11 @@ sub chmod {
 	unless $nonono;
 }
 
-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 $nonono;
-    }
-}
-
 sub samepath {
     local($p1, $p2) = @_;
     local($dev1, $ino1, $dev2, $ino2);
 
-    if ($p1 ne p2) {
+    if ($p1 ne $p2) {
 	($dev1, $ino1) = stat($p1);
 	($dev2, $ino2) = stat($p2);
 	($dev1 == $dev2 && $ino1 == $ino2);
@@ -296,6 +336,10 @@ sub installlib {
     $dir =~ s#^\.(?![^/])/?##;
 
     my $name = $_;
+    
+    # ignore patch backups and the .exists files.
+    return if $name =~ m{\.orig$|~$|^\.exists};
+
     $name = "$dir/$name" if $dir ne '';
 
     my $installlib = $installprivlib;
@@ -312,25 +356,48 @@ sub installlib {
 	    #We're installing *.al and *.ix files into $installprivlib,
 	    #but we have to delete old *.al and *.ix files from the 5.000
 	    #distribution:
+	    #This might not work because $archname might have changed.
 	    &unlink("$installarchlib/$name");
 	}
 	system "cmp", "-s", $_, "$installlib/$name";
 	if ($?) {
 	    &unlink("$installlib/$name");
-	    &makedir("$installlib/$dir");
-	    &cmd("cp $_ $installlib/$dir");
-	    &chmod(0644, "$installlib/$name");
+	    mkpath("$installlib/$dir", 1, 0777);
+	    cp_if_diff($_, "$installlib/$name");
+	    # HP-UX (at least) needs to maintain execute permissions
+	    # on dynamically-loaded libraries.
+	    if ($name =~ /\.(so|$dlext)$/o) {
+		&chmod(0555, "$installlib/$name");
+	    }
+	    else {
+		&chmod(0444, "$installlib/$name");
+	    }
 	}
     } elsif (-d $_) {
-	&makedir("$installlib/$name");
+	mkpath("$installlib/$name", 1, 0777);
     }
 }
 
+# Copy $from to $to, only if $from is different than $to.
+# Also preserve modification times for .a libraries.
+# On some systems, if you do
+#   ranlib libperl.a
+#   cp libperl.a /usr/local/lib/perl5/archlib/CORE/libperl.a
+# and then try to link against the installed libperl.a, you might
+# get an error message to the effect that the symbol table is older
+# than the library.
 sub cp_if_diff {
     my($from,$to)=@_;
     -f $from || die "$0: $from not found";
     system "cmp", "-s", $from, $to;
     if ($?) {
+	my ($atime, $mtime);
+	unlink($to);   # In case we don't have write permissions.
 	cmd("cp $from $to");
+	# Restore timestamps if it's a .a library.
+	if ($to =~ /\.a$/) {
+	    ($atime, $mtime) = (stat $from)[8,9];
+	    utime $atime, $mtime, $to;
+	}
     }
 }