X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=installperl;h=0ce39bf73ae99578d4c066a4bb42b9b39aff1cf5;hb=606932feba6a7c07d368ce4e766975b0fe622bfc;hp=44e5d1b49318db5fa85da4c48f74b066a379637a;hpb=8530e788ed7c379a2ce97baf3a0eaa5e1470f685;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/installperl b/installperl
index 44e5d1b..0ce39bf 100755
--- a/installperl
+++ b/installperl
@@ -5,13 +5,19 @@ BEGIN {
     chdir '..' if !-d 'lib' and -d '..\lib';
     @INC = 'lib';
     $ENV{PERL5LIB} = 'lib';
+}
+
+use strict;
+use vars qw($Is_VMS $Is_W32 $Is_OS2 $nonono $versiononly $depth);
+
+BEGIN {
     $Is_VMS = $^O eq 'VMS';
     $Is_W32 = $^O eq 'MSWin32';
     $Is_OS2 = $^O eq 'os2';
     if ($Is_VMS) { eval 'use VMS::Filespec;' }
 }
 
-$scr_ext = ($Is_VMS ? '.Com' : $Is_W32 ? '.bat' : '');
+my $scr_ext = ($Is_VMS ? '.Com' : $Is_W32 ? '.bat' : '');
 
 use File::Find;
 use File::Compare;
@@ -27,11 +33,11 @@ sub mkpath {
     File::Path::mkpath(@_) unless $nonono;
 }
 
-$mainperldir = "/usr/bin";
-$exe_ext = $Config{exe_ext};
+my $mainperldir = "/usr/bin";
+my $exe_ext = $Config{exe_ext};
 
 # Allow ``make install PERLNAME=something_besides_perl'':
-$perl = defined($ENV{PERLNAME}) ? $ENV{PERLNAME} : 'perl';
+my $perl = defined($ENV{PERLNAME}) ? $ENV{PERLNAME} : 'perl';
 
 while (@ARGV) {
     $nonono = 1 if $ARGV[0] eq '-n';
@@ -41,17 +47,23 @@ while (@ARGV) {
 
 umask 022 unless $Is_VMS;
 
-@scripts = qw(	utils/c2ph utils/h2ph utils/h2xs utils/perlbug utils/perldoc
+my @scripts = qw(utils/c2ph utils/h2ph utils/h2xs utils/perlbug utils/perldoc
 		utils/pl2pm utils/splain utils/perlcc
 		x2p/s2p x2p/find2perl 
 		pod/pod2man pod/pod2html pod/pod2latex pod/pod2text);
 
 if ($scr_ext) { @scripts = map { "$_$scr_ext" } @scripts; }
 
-@pods = (<pod/*.pod>);
+my @pods = (<pod/*.pod>);
 
-%archpms = (
-    Config => 1, FileHandle => 1, overload => 1,
+# Specify here any .pm files that are actually architecture-dependent.
+# (Those included with XS extensions under ext/ are automatically
+# added later.)
+# Now that the default privlib has the full perl version number included,
+# we no longer have to play the trick of sticking version-specific .pm 
+# files under the archlib directory.
+my %archpms = (
+    Config => 1, 
 );
 
 if ($^O eq 'dos') {
@@ -71,29 +83,29 @@ find(sub {
 	}
     }, 'ext');
 
-$ver = $];
-$release = substr($ver,0,3);   # Not used presently.
-$patchlevel = substr($ver,3,2);
+my $ver = $];
+my $release = substr($ver,0,3);   # Not used presently.
+my $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};
-$libperl = $Config{libperl};
+my $installbin = $Config{installbin};
+my $installscript = $Config{installscript};
+my $installprivlib = $Config{installprivlib};
+my $installarchlib = $Config{installarchlib};
+my $installsitelib = $Config{installsitelib};
+my $installsitearch = $Config{installsitearch};
+my $installman1dir = $Config{installman1dir};
+my $man1ext = $Config{man1ext};
+my $libperl = $Config{libperl};
 # Shared library and dynamic loading suffixes.
-$so = $Config{so};
-$dlext = $Config{dlext};
+my $so = $Config{so};
+my $dlext = $Config{dlext};
 
-$d_dosuid = $Config{d_dosuid};
-$binexp = $Config{binexp};
+my $d_dosuid = $Config{d_dosuid};
+my $binexp = $Config{binexp};
 
 if ($Is_VMS) {  # Hang in there until File::Spec hits the big time
     foreach ( \$installbin,     \$installscript,  \$installprivlib,
@@ -122,7 +134,7 @@ if ($d_dosuid && $>) { die "You must run as root to install suidperl\n"; }
 
 if ($Is_W32) {
 
-$perldll = 'perl.' . $dlext;
+my $perldll = 'perl.' . $dlext;
 $perldll = 'perlcore.' . $dlext if $Config{'ccflags'} =~ /PERL_OBJECT/i;
 
 -f $perldll || die "No perl DLL built\n";
@@ -135,7 +147,7 @@ chmod(0755, "$installbin/$perldll");
 }
 
 # This will be used to store the packlist
-$packlist = ExtUtils::Packlist->new("$installarchlib/.packlist");
+my $packlist = ExtUtils::Packlist->new("$installarchlib/.packlist");
 
 # First we install the version-numbered executables.
 
@@ -147,11 +159,22 @@ if ($Is_VMS) {
     copy("perlshr$exe_ext", "$installbin/${perl}shr$exe_ext");
     chmod(0755, "$installbin/${perl}shr$exe_ext");
 }
+elsif ($^O eq 'mpeix') {
+    # MPE lacks hard links and requires that executables with special
+    # capabilities reside in the MPE namespace.
+    safe_unlink("$installbin/perl$ver$exe_ext", $Config{perlpath});
+    # Install the primary executable into the MPE namespace as perlpath.
+    copy("perl$exe_ext", $Config{perlpath});
+    chmod(0755, $Config{perlpath});
+    # Create a backup copy with the version number.
+    link($Config{perlpath}, "$installbin/perl$ver$exe_ext");
+}
 elsif ($^O ne 'dos') {
     safe_unlink("$installbin/$perl$ver$exe_ext");
     copy("perl$exe_ext", "$installbin/$perl$ver$exe_ext");
     chmod(0755, "$installbin/$perl$ver$exe_ext");
-} else {
+}
+else {
     safe_unlink("$installbin/$perl.exe");
     copy("perl.exe", "$installbin/$perl.exe");
 }
@@ -164,7 +187,7 @@ if ($d_dosuid) {
 
 # Install library files.
 
-$do_installarchlib = $do_installprivlib = 0;
+my ($do_installarchlib, $do_installprivlib) = (0, 0);
     
 mkpath($installprivlib, 1, 0777);
 mkpath($installarchlib, 1, 0777);
@@ -187,6 +210,7 @@ else {
 
 # Install header files and libraries.
 mkpath("$installarchlib/CORE", 1, 0777);
+my @corefiles;
 if ($Is_VMS) {  # We did core file selection during build
     my $coredir = "lib/$Config{'arch'}/$]";
     $coredir =~ tr/./_/;
@@ -199,7 +223,7 @@ else {
     # If they have built sperl.o...
     push(@corefiles,'sperl.o') if -f 'sperl.o';
 }
-foreach $file (@corefiles) {
+foreach my $file (@corefiles) {
     # HP-UX (at least) needs to maintain execute permissions
     # on dynamically-loadable libraries. So we do it for all.
     copy_if_diff($file,"$installarchlib/CORE/$file")
@@ -212,20 +236,26 @@ foreach $file (@corefiles) {
 
 if (! $versiononly && ! samepath($installbin, '.') && ($^O ne 'dos') && ! $Is_VMS) {
     safe_unlink("$installbin/$perl$exe_ext", "$installbin/suid$perl$exe_ext");
-    link("$installbin/$perl$ver$exe_ext", "$installbin/$perl$exe_ext");
+    if ($^O eq 'mpeix') {
+	# MPE doesn't support hard links, so use a symlink.
+	# We don't want another cloned copy.
+        symlink($Config{perlpath}, "$installbin/perl$exe_ext");
+    } else {
+	link("$installbin/$perl$ver$exe_ext", "$installbin/$perl$exe_ext");
+    }
     link("$installbin/s$perl$ver$exe_ext", "$installbin/suid$perl$exe_ext") 
       if $d_dosuid;
 }
 
 # Offer to install perl in a "standard" location
 
-$mainperl_is_instperl = 0;
+my $mainperl_is_instperl = 0;
 
 if (!$versiononly && !$nonono && !$Is_W32 && !$Is_VMS && -t STDIN && -t STDERR
 	&& -w $mainperldir && ! samepath($mainperldir, $installbin)) {
-    local($usrbinperl)	= "$mainperldir/$perl$exe_ext";
-    local($instperl)	= "$installbin/$perl$exe_ext";
-    local($expinstperl)	= "$binexp/$perl$exe_ext";
+    my($usrbinperl)	= "$mainperldir/$perl$exe_ext";
+    my($instperl)	= "$installbin/$perl$exe_ext";
+    my($expinstperl)	= "$binexp/$perl$exe_ext";
 
     # First make sure $usrbinperl is not already the same as the perl we
     # just installed.
@@ -243,11 +273,13 @@ if (!$versiononly && !$nonono && !$Is_W32 && !$Is_VMS && -t STDIN && -t STDERR
 	(yn("Many scripts expect perl to be installed as $usrbinperl.\n" . 
 	     "Do you wish to have $usrbinperl be the same as\n" .
 	     "$expinstperl? [y] ")))
-    {	
+    {
 	unlink($usrbinperl);
-	eval { CORE::link $instperl, $usrbinperl } ||
-	    eval { symlink $expinstperl, $usrbinperl } ||
-		copy($instperl, $usrbinperl);
+	( $Config{'d_link'} eq 'define' &&
+	  eval { CORE::link $instperl, $usrbinperl } )	||
+	eval { symlink $expinstperl, $usrbinperl }	||
+	copy($instperl, $usrbinperl);
+
 	$mainperl_is_instperl = 1;
     }
 }
@@ -313,20 +345,11 @@ if (! $versiononly || !($installprivlib =~ m/\Q$]/)) {
 	}
     }
 
-    foreach $file (@pods) {
+    foreach my $file (@pods) {
 	# $file is a name like  pod/perl.pod
 	copy_if_diff($file, "${installprivlib}/${file}");
     }
 
-    # Link perldiag.pod into archlib
-    my ($from, $to) = ("${installprivlib}/pod/perldiag.pod",
-		       "${installarchlib}/pod/perldiag.pod");
-    $packlist->{$to} = { from => $from, type => 'link' };
-    if (compare($from, $to) || $nonono) {
-	mkpath("${installarchlib}/pod", 1, 0777);
-	unlink($to);
-	link($from, $to) if ($^O ne 'dos');
-    }
 }
 
 # Check to make sure there aren't other perls around in installer's
@@ -336,18 +359,18 @@ if (! $versiononly || !($installprivlib =~ m/\Q$]/)) {
 # installed perl.
 
 if (!$versiononly) {
-
-    $dirsep = ($Is_OS2 || $Is_W32) ? ';' : ':' ;
+	my ($path, @path);
+    my $dirsep = ($Is_OS2 || $Is_W32) ? ';' : ':' ;
     ($path = $ENV{"PATH"}) =~ s:\\:/:g ;
     @path = split(/$dirsep/, $path);
     if ($Is_VMS) {
         my $i = 0;
         while (exists $ENV{'DCL$PATH' . $i}) {
-            $dir = unixpath($ENV{'DCL$PATH' . $i});  $dir =~ s-/$--;
+            my $dir = unixpath($ENV{'DCL$PATH' . $i});  $dir =~ s-/$--;
             push(@path,$dir);
         }
     }
-    @otherperls = ();
+    my @otherperls;
     for (@path) {
 	next unless m,^/,;
 	# Use &samepath here because some systems have other dirs linked
@@ -368,7 +391,7 @@ if (!$versiononly) {
 
 }
 
-$packlist->write() unless $nono;
+$packlist->write() unless $nonono;
 print STDERR "  Installation complete\n";
 
 exit 0;
@@ -376,9 +399,9 @@ exit 0;
 ###############################################################################
 
 sub yn {
-    local($prompt) = @_;
-    local($answer);
-    local($default) = $prompt =~ m/\[([yn])\]\s*$/i;
+    my($prompt) = @_;
+    my($answer);
+    my($default) = $prompt =~ m/\[([yn])\]\s*$/i;
     print STDERR $prompt;
     chop($answer = <STDIN>);
     $answer = $default if $answer =~ m/^\s*$/;
@@ -386,12 +409,12 @@ sub yn {
 }
 
 sub unlink {
-    local(@names) = @_;
+    my(@names) = @_;
     my($cnt) = 0;
 
     return scalar(@names) if $Is_VMS;
 
-    foreach $name (@names) {
+    foreach my $name (@names) {
 	next unless -e $name;
 	chmod 0777, $name if ($Is_OS2 || $Is_W32);
 	print STDERR "  unlink $name\n";
@@ -403,8 +426,8 @@ sub unlink {
 
 sub safe_unlink {
     return if $nonono or $Is_VMS;
-    local @names = @_;
-    foreach $name (@names) {
+    my @names = @_;
+    foreach my $name (@names) {
 	next unless -e $name;
 	chmod 0777, $name if ($Is_OS2 || $Is_W32);
 	print STDERR "  unlink $name\n";
@@ -419,7 +442,7 @@ sub safe_unlink {
 }
 
 sub safe_rename {
-    local($from,$to) = @_;
+    my($from,$to) = @_;
     if (-f $to and not unlink($to)) {
 	my($i);
 	for ($i = 1; $i < 50; $i++) {
@@ -458,7 +481,7 @@ sub link {
 }
 
 sub chmod {
-    local($mode,$name) = @_;
+    my($mode,$name) = @_;
 
     return if ($^O eq 'dos');
     printf STDERR "  chmod %o %s\n", $mode, $name;
@@ -479,12 +502,12 @@ sub copy {
 }
 
 sub samepath {
-    local($p1, $p2) = @_;
+    my($p1, $p2) = @_;
 
     return (lc($p1) eq lc($p2)) if $Is_W32;
 
     if ($p1 ne $p2) {
-	local($dev1, $ino1, $dev2, $ino2);
+	my($dev1, $ino1, $dev2, $ino2);
 	($dev1, $ino1) = stat($p1);
 	($dev2, $ino2) = stat($p2);
 	($dev1 == $dev2 && $ino1 == $ino2);
@@ -541,8 +564,6 @@ sub installlib {
 		and chmod($name =~ /\.(so|$dlext)$/o ? 0555 : 0444,
 			   "$installlib/$name");
 	}
-    } elsif (-d $_) {
-	mkpath("$installlib/$name", 1, 0777);
     }
 }