Vendor import Perl 5.6.1

1 files changed, 81 insertions, 65 deletions

diff --git a/contrib/perl5/installperl b/contrib/perl5/installperl
index b2ddc84c2444..d28027ce3575 100755
--- a/contrib/perl5/installperl
+++ b/contrib/perl5/installperl
@@ -8,7 +8,9 @@ BEGIN {
 }
 
 use strict;
-use vars qw($Is_VMS $Is_W32 $Is_OS2 $Is_Cygwin $nonono $dostrip $versiononly $depth);
+my ($Is_VMS, $Is_W32, $Is_OS2, $Is_Cygwin, $nonono, $dostrip,
+    $versiononly, $silent, $verbose, $otherperls);
+use vars qw /$depth/;
 
 BEGIN {
     $Is_VMS = $^O eq 'VMS';
@@ -27,7 +29,6 @@ use File::Path ();
 use ExtUtils::Packlist;
 use Config;
 use subs qw(unlink link chmod);
-use vars qw($packlist);
 
 # override the ones in the rest of the script
 sub mkpath {
@@ -48,13 +49,19 @@ my $perl_verbase = defined($ENV{PERLNAME_VERBASE})
 		    ? $ENV{PERLNAME_VERBASE}
 		    : $perl;
 
+$otherperls = 1;
 while (@ARGV) {
     $nonono = 1 if $ARGV[0] eq '-n';
     $dostrip = 1 if $ARGV[0] eq '-s';
     $versiononly = 1 if $ARGV[0] eq '-v';
+    $silent = 1 if $ARGV[0] eq '-S';
+    $otherperls = 0 if $ARGV[0] eq '-o';
+    $verbose = 1 if $ARGV[0] eq '-V' || $ARGV [0] eq '-n';
     shift;
 }
 
+$versiononly = 1 if $Config{versiononly};
+
 my @scripts = qw(utils/c2ph utils/h2ph utils/h2xs utils/perlbug utils/perldoc
 		utils/pl2pm utils/splain utils/perlcc utils/dprofpp
 		x2p/s2p x2p/find2perl 
@@ -109,7 +116,7 @@ find(sub {
 # print "[$_]\n" for sort keys %archpms;
 
 my $ver = $Config{version};
-my $release = substr($],0,3);   # Not used presently.
+my $release = substr($],0,3);   # Not used currently.
 my $patchlevel = substr($],3,2);
 die "Patchlevel of perl ($patchlevel)",
     "and patchlevel of config.sh ($Config{'PERL_VERSION'}) don't match\n"
@@ -129,6 +136,15 @@ my $libperl = $Config{libperl};
 my $so = $Config{so};
 my $dlext = $Config{dlext};
 my $dlsrc = $Config{dlsrc};
+if ($^O eq 'os390') {
+    my $usedl = $Config{usedl};
+    if ($usedl eq 'define') {
+        my $pwd;
+        chomp($pwd=`pwd`);
+        my $archlibexp = $Config{archlibexp};
+        `./$^X -p -e 's{$pwd\/libperl.x}{$archlibexp/CORE/libperl.x}' lib/Config.pm`;
+    }
+}
 
 my $d_dosuid = $Config{d_dosuid};
 my $binexp = $Config{binexp};
@@ -146,7 +162,7 @@ if ($Is_VMS) {  # Hang in there until File::Spec hits the big time
 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		|| mkpath($installbin, $verbose, 0777);
 -d $installbin		|| $nonono || die "$installbin is not a directory\n";
 -w $installbin		|| $nonono || die "$installbin is not writable by you\n"
 	unless $installbin =~ m#^/afs/# || $nonono;
@@ -154,36 +170,36 @@ if ($d_dosuid && $>) { die "You must run as root to install suidperl\n"; }
 -x 'perl' . $exe_ext	|| die "perl isn't executable!\n";
 -x 'suidperl' . $exe_ext|| die "suidperl isn't executable!\n" if $d_dosuid;
 
--x 't/TEST'		|| $Is_W32
+-f 't/rantests'		|| $Is_W32
 			|| warn "WARNING: You've never run 'make test'!!!",
 				"  (Installing anyway.)\n";
 
 if ($Is_W32 or $Is_Cygwin) {
   my $perldll;
 
-if ($Is_Cygwin) {
-  $perldll = $libperl;
-  $perldll =~ s/(\..*)?$/.$dlext/;
-  if ($Config{useshrplib} eq 'true') {
-    # install ld2 and perlld as well
-    foreach ('ld2', 'perlld') {
-      safe_unlink("$installbin/$_");
-      copy("$_", "$installbin/$_");
-      chmod(0755, "$installbin/$_");
+  if ($Is_Cygwin) {
+    $perldll = $libperl;
+    $perldll =~ s/(\..*)?$/.$dlext/;
+    if ($Config{useshrplib} eq 'true') {
+      # install ld2 and perlld as well
+      foreach ('ld2', 'perlld') {
+        safe_unlink("$installbin/$_");
+        copy("$_", "$installbin/$_");
+        chmod(0755, "$installbin/$_");
+      };
     };
-  };
-} else {
-  $perldll = 'perl56.' . $dlext;
-}
-
-   if ($dlsrc ne "dl_none.xs") {
-      -f $perldll || die "No perl DLL built\n";
-   }
-# Install the DLL
-
-   safe_unlink("$installbin/$perldll");
-   copy("$perldll", "$installbin/$perldll");
-   chmod(0755, "$installbin/$perldll");
+  } else {
+    $perldll = 'perl56.' . $dlext;
+  }
+
+  if ($dlsrc ne "dl_none.xs") {
+    -f $perldll || die "No perl DLL built\n";
+  }
+  # Install the DLL
+
+  safe_unlink("$installbin/$perldll");
+  copy("$perldll", "$installbin/$perldll");
+  chmod(0755, "$installbin/$perldll");
    
 } # if ($Is_W32 or $Is_Cygwin)
 
@@ -231,10 +247,10 @@ if ($d_dosuid) {
 
 my ($do_installarchlib, $do_installprivlib) = (0, 0);
     
-mkpath($installprivlib, 1, 0777);
-mkpath($installarchlib, 1, 0777);
-mkpath($installsitelib, 1, 0777) if ($installsitelib);
-mkpath($installsitearch, 1, 0777) if ($installsitearch);
+mkpath($installprivlib, $verbose, 0777);
+mkpath($installarchlib, $verbose, 0777);
+mkpath($installsitelib, $verbose, 0777) if ($installsitelib);
+mkpath($installsitearch, $verbose, 0777) if ($installsitearch);
 
 if (chdir "lib") {
     $do_installarchlib = ! samepath($installarchlib, '.');
@@ -251,12 +267,12 @@ else {
 }
 
 # Install header files and libraries.
-mkpath("$installarchlib/CORE", 1, 0777);
+mkpath("$installarchlib/CORE", $verbose, 0777);
 my @corefiles;
 if ($Is_VMS) {  # We did core file selection during build
-    my $coredir = "lib/$Config{'arch'}/$ver";
+    my $coredir = "lib/$Config{archname}/$ver/CORE";
     $coredir =~ tr/./_/;
-    @corefiles = map { s|^$coredir/||i; } <$coredir/*.*>;
+    map { s|^$coredir/||i; } @corefiles = <$coredir/*.*>;
 }
 else {
     # [als] hard-coded 'libperl' name... not good!
@@ -266,7 +282,7 @@ else {
     push(@corefiles,'perl.exp') if $^O eq 'aix';
     if ($^O eq 'mpeix') {
         # MPE needs mpeixish.h installed as well.
-        mkpath("$installarchlib/CORE/mpeix", 1, 0777);
+        mkpath("$installarchlib/CORE/mpeix", $verbose, 0777);
         push(@corefiles,'mpeix/mpeixish.h');
     }
     # If they have built sperl.o...
@@ -307,7 +323,7 @@ if (! $versiononly && ! samepath($installbin, '.') && ($^O ne 'dos') && ! $Is_VM
 
 my $mainperl_is_instperl = 0;
 
-if ($Config{installusrbinperl} eq 'define' &&
+if ($Config{installusrbinperl} && $Config{installusrbinperl} eq 'define' &&
     !$versiononly && !$nonono && !$Is_W32 && !$Is_VMS && -t STDIN && -t STDERR
 	&& -w $mainperldir && ! samepath($mainperldir, $installbin)) {
     my($usrbinperl)	= "$mainperldir/$perl$exe_ext";
@@ -359,26 +375,25 @@ if (! $versiononly && (-f 'cppstdin') && (! samepath($installbin, '.'))) {
     chmod(0755, "$installbin/cppstdin");
 }
 
-# Install scripts.
+if (! $versiononly) {
+    # Install scripts.
 
-mkpath($installscript, 1, 0777);
+    mkpath($installscript, $verbose, 0777);
 
-if (! $versiononly) {
     for (@scripts) {
 	(my $base = $_) =~ s#.*/##;
 	copy($_, "$installscript/$base");
 	chmod(0755, "$installscript/$base");
     }
-}
 
-# pstruct should be a link to c2ph
-
-if (! $versiononly) {
+    # pstruct should be a link to c2ph
     safe_unlink("$installscript/pstruct$scr_ext");
     if ($^O eq 'dos' or $Is_VMS or $^O eq 'transit') {
-        copy("$installscript/c2ph$scr_ext", "$installscript/pstruct$scr_ext"); 
+	copy("$installscript/c2ph$scr_ext",
+	     "$installscript/pstruct$scr_ext"); 
     } else {
-        link("$installscript/c2ph$scr_ext", "$installscript/pstruct$scr_ext");
+	link("$installscript/c2ph$scr_ext",
+	     "$installscript/pstruct$scr_ext");
     }
 }
 
@@ -386,8 +401,8 @@ if (! $versiononly) {
 # ($installprivlib/pods for cygwin).
 
 my $pod = $Is_Cygwin ? 'pods' : 'pod';
-unless ( $versiononly && !($installprivlib =~ m/\Q$ver/)) {
-    mkpath("${installprivlib}/$pod", 1, 0777);
+if ( !$versiononly || ($installprivlib =~ m/\Q$ver/)) {
+    mkpath("${installprivlib}/$pod", $verbose, 0777);
 
     # If Perl 5.003's perldiag.pod is there, rename it.
     if (open POD, "${installprivlib}/$pod/perldiag.pod") {
@@ -418,7 +433,7 @@ unless ( $versiononly && !($installprivlib =~ m/\Q$ver/)) {
 # Also skip $mainperl if the user opted to have it be a link to the
 # installed perl.
 
-if (!$versiononly) {
+if (!$versiononly && $otherperls) {
     my ($path, @path);
     my $dirsep = ($Is_OS2 || $Is_W32) ? ';' : ':' ;
     ($path = $ENV{"PATH"}) =~ s:\\:/:g ;
@@ -444,18 +459,18 @@ if (!$versiononly) {
 	    if (-x $otherperl && ! -d $otherperl);
     }
     if (@otherperls) {
-	print STDERR "\nWarning: $perl appears in your path in the following " .
+	warn "\nWarning: $perl appears in your path in the following " .
 	    "locations beyond where\nwe just installed it:\n";
 	for (@otherperls) {
-	    print STDERR "    ", $_, "\n";
+	    warn "    ", $_, "\n";
 	}
-	print STDERR "\n";
+	warn "\n";
     }
 
 }
 
 $packlist->write() unless $nonono;
-print "  Installation complete\n";
+print "  Installation complete\n" if $verbose;
 
 exit 0;
 
@@ -465,7 +480,7 @@ sub yn {
     my($prompt) = @_;
     my($answer);
     my($default) = $prompt =~ m/\[([yn])\]\s*$/i;
-    print $prompt;
+    warn $prompt;
     chop($answer = <STDIN>);
     $answer = $default if $answer =~ m/^\s*$/;
     ($answer =~ m/^[yY]/);
@@ -480,7 +495,7 @@ sub unlink {
     foreach my $name (@names) {
 	next unless -e $name;
 	chmod 0777, $name if ($Is_OS2 || $Is_W32 || $Is_Cygwin);
-	print "  unlink $name\n";
+	print "  unlink $name\n" if $verbose;
 	( CORE::unlink($name) and ++$cnt 
 	  or warn "Couldn't unlink $name: $!\n" ) unless $nonono;
     }
@@ -493,11 +508,11 @@ sub safe_unlink {
     foreach my $name (@names) {
 	next unless -e $name;
 	chmod 0777, $name if ($Is_OS2 || $Is_W32);
-	print "  unlink $name\n";
+	print "  unlink $name\n" if $verbose;
 	next if CORE::unlink($name);
 	warn "Couldn't unlink $name: $!\n";
 	if ($! =~ /busy/i) {
-	    print "  mv $name $name.old\n";
+	    print "  mv $name $name.old\n" if $verbose;
 	    safe_rename($name, "$name.old")
 		or warn "Couldn't rename $name: $!\n";
 	}
@@ -522,7 +537,7 @@ sub link {
     my($from,$to) = @_;
     my($success) = 0;
 
-    print "  ln $from $to\n";
+    print $verbose ? "  ln $from $to\n" : "  $to\n" unless $silent;
     eval {
 	CORE::link($from, $to)
 	    ? $success++
@@ -534,8 +549,9 @@ sub link {
     };
     if ($@) {
 	warn $@;
-	print "  cp $from $to\n";
-	print "  creating new version of $to\n" if $Is_VMS and -e $to;
+        print $verbose ? "  cp $from $to\n" : "  $to\n" unless $silent;
+	print "  creating new version of $to\n"
+                 if $Is_VMS and -e $to and !$silent;
 	File::Copy::copy($from, $to)
 	    ? $success++
 	    : warn "Couldn't copy $from to $to: $!\n"
@@ -549,7 +565,7 @@ sub chmod {
     my($mode,$name) = @_;
 
     return if ($^O eq 'dos');
-    printf "  chmod %o %s\n", $mode, $name;
+    printf "  chmod %o %s\n", $mode, $name if $verbose;
     CORE::chmod($mode,$name)
 	|| warn sprintf("Couldn't chmod %o %s: $!\n", $mode, $name)
       unless $nonono;
@@ -558,8 +574,8 @@ sub chmod {
 sub copy {
     my($from,$to) = @_;
 
-    print "  cp $from $to\n";
-    print "  creating new version of $to\n" if $Is_VMS and -e $to;
+    print $verbose ? "  cp $from $to\n" : "  $to\n" unless $silent;
+    print "  creating new version of $to\n" if $Is_VMS and -e $to and !$silent;
     File::Copy::copy($from, $to)
 	|| warn "Couldn't copy $from to $to: $!\n"
       unless $nonono;
@@ -624,7 +640,7 @@ sub installlib {
         $packlist->{"$installlib/$name"} = { type => 'file' };
 	if (compare($_, "$installlib/$name") || $nonono) {
 	    unlink("$installlib/$name");
-	    mkpath("$installlib/$dir", 1, 0777);
+	    mkpath("$installlib/$dir", $verbose, 0777);
 	    # HP-UX (at least) needs to maintain execute permissions
 	    # on dynamically-loaded libraries.
 	    copy_if_diff($_, "$installlib/$name")
@@ -677,10 +693,10 @@ sub strip
 
     foreach my $file (@args) {
         if (-f $file) {
-            print "  strip $file\n";
+            print "  strip $file\n" if $verbose;
             system("strip", @opts, $file);
         } else {
-            print "# file '$file' skipped\n";
+            print "# file '$file' skipped\n" if $verbose;
         }
     }
 }