X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=installperl;h=6d2fad9bdc634b1edec9122a8cfde282dee10b7a;hb=3f9aafa052abab5917516312e3f78b01a9ea73c3;hp=fe168c9217155f27f979225ff1a5d9b8502a736c;hpb=17f28c40fa08b585b95d4a2531b1cd975d11e986;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/installperl b/installperl
index fe168c9..6d2fad9 100755
--- a/installperl
+++ b/installperl
@@ -6,9 +6,13 @@ BEGIN {
     @INC = 'lib';
     $ENV{PERL5LIB} = 'lib';
     $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' : '');
+
 use File::Find;
 use File::Compare;
 use File::Copy ();
@@ -26,6 +30,9 @@ sub mkpath {
 $mainperldir = "/usr/bin";
 $exe_ext = $Config{exe_ext};
 
+# Allow ``make install PERLNAME=something_besides_perl'':
+$perl = defined($ENV{PERLNAME}) ? $ENV{PERLNAME} : 'perl';
+
 while (@ARGV) {
     $nonono = 1 if $ARGV[0] eq '-n';
     $versiononly = 1 if $ARGV[0] eq '-v';
@@ -34,22 +41,35 @@ while (@ARGV) {
 
 umask 022 unless $Is_VMS;
 
-@scripts = qw(	utils/c2ph utils/h2ph utils/h2xs
-		utils/perlbug utils/perldoc utils/pl2pm utils/splain
-		x2p/s2p x2p/find2perl
+@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 ($Is_VMS) { @scripts = map { "$_.Com" } @scripts; }
+if ($scr_ext) { @scripts = map { "$_$scr_ext" } @scripts; }
 
 @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.
+%archpms = (
+    Config => 1, 
+);
 
 if ($^O eq 'dos') {
     push(@scripts,'djgpp/fixpmain');
     $archpms{config} = $archpms{filehand} = 1;
 }
 
+if ((-e "testcompile") && (defined($ENV{'COMPILE'})))
+{
+	push(@scripts, map("$_.exe", @scripts));
+}
+
 find(sub {
 	if ("$File::Find::dir/$_" =~ m{^ext/[^/]+/(.*)\.pm$}) {
 	    (my $pm = $1) =~ s{^lib/}{};
@@ -102,19 +122,22 @@ 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'		|| $^O eq 'MSWin32'
+-x 't/TEST'		|| $Is_W32
 			|| warn "WARNING: You've never run 'make test'!!!",
 				"  (Installing anyway.)\n";
 
-if ($^O eq 'MSWin32') {
+if ($Is_W32) {
 
--f 'perl.' . $dlext || die "No perl DLL built\n";
+$perldll = 'perl.' . $dlext;
+$perldll = 'perlcore.' . $dlext if $Config{'ccflags'} =~ /PERL_OBJECT/i;
+
+-f $perldll || die "No perl DLL built\n";
 
 # Install the DLL
 
-safe_unlink("$installbin/perl.$dlext");
-copy("perl.$dlext", "$installbin/perl.$dlext");
-chmod(0755, "$installbin/perl.$dlext");
+safe_unlink("$installbin/$perldll");
+copy("$perldll", "$installbin/$perldll");
+chmod(0755, "$installbin/$perldll");
 }
 
 # This will be used to store the packlist
@@ -123,26 +146,26 @@ $packlist = ExtUtils::Packlist->new("$installarchlib/.packlist");
 # First we install the version-numbered executables.
 
 if ($Is_VMS) {
-    safe_unlink("$installbin/perl$exe_ext");
-    copy("perl$exe_ext", "$installbin/perl$exe_ext");
-    chmod(0755, "$installbin/perl$exe_ext");
-    safe_unlink("$installbin/perlshr$exe_ext");
-    copy("perlshr$exe_ext", "$installbin/perlshr$exe_ext");
-    chmod(0755, "$installbin/perlshr$exe_ext");
+    safe_unlink("$installbin/$perl$exe_ext");
+    copy("perl$exe_ext", "$installbin/$perl$exe_ext");
+    chmod(0755, "$installbin/$perl$exe_ext");
+    safe_unlink("$installbin/${perl}shr$exe_ext");
+    copy("perlshr$exe_ext", "$installbin/${perl}shr$exe_ext");
+    chmod(0755, "$installbin/${perl}shr$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");
+    safe_unlink("$installbin/$perl$ver$exe_ext");
+    copy("perl$exe_ext", "$installbin/$perl$ver$exe_ext");
+    chmod(0755, "$installbin/$perl$ver$exe_ext");
 } else {
-    safe_unlink("$installbin/perl.exe");
-    copy("perl.exe", "$installbin/perl.exe");
+    safe_unlink("$installbin/$perl.exe");
+    copy("perl.exe", "$installbin/$perl.exe");
 }
 
-safe_unlink("$installbin/sperl$ver$exe_ext");
+safe_unlink("$installbin/s$perl$ver$exe_ext");
 if ($d_dosuid) {
-    copy("suidperl$exe_ext", "$installbin/sperl$ver$exe_ext");
-    chmod(04711, "$installbin/sperl$ver$exe_ext");
+    copy("suidperl$exe_ext", "$installbin/s$perl$ver$exe_ext");
+    chmod(04711, "$installbin/s$perl$ver$exe_ext");
 }
 
 # Install library files.
@@ -194,9 +217,9 @@ foreach $file (@corefiles) {
 # Make links to ordinary names if installbin directory isn't current directory.
 
 if (! $versiononly && ! samepath($installbin, '.') && ($^O ne 'dos') && ! $Is_VMS) {
-    safe_unlink("$installbin/perl$exe_ext", "$installbin/suidperl$exe_ext");
-    link("$installbin/perl$ver$exe_ext", "$installbin/perl$exe_ext");
-    link("$installbin/sperl$ver$exe_ext", "$installbin/suidperl$exe_ext") 
+    safe_unlink("$installbin/$perl$exe_ext", "$installbin/suid$perl$exe_ext");
+    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;
 }
 
@@ -204,11 +227,11 @@ if (! $versiononly && ! samepath($installbin, '.') && ($^O ne 'dos') && ! $Is_VM
 
 $mainperl_is_instperl = 0;
 
-if (!$versiononly && !$nonono && $^O ne 'MSWin32' && !$Is_VMS && -t STDIN && -t STDERR
+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";
+    local($usrbinperl)	= "$mainperldir/$perl$exe_ext";
+    local($instperl)	= "$installbin/$perl$exe_ext";
+    local($expinstperl)	= "$binexp/$perl$exe_ext";
 
     # First make sure $usrbinperl is not already the same as the perl we
     # just installed.
@@ -268,12 +291,11 @@ if (! $versiononly) {
 # pstruct should be a link to c2ph
 
 if (! $versiononly) {
-    safe_unlink("$installscript/pstruct" . ($Is_VMS ? '.Com' : ''));
+    safe_unlink("$installscript/pstruct$scr_ext");
     if ($^O eq 'dos' or $Is_VMS) {
-        copy("$installscript/c2ph" . ($Is_VMS ? '.Com' : ''),
-             "$installscript/pstruct" . ($Is_VMS ? '.Com' : '')); 
+        copy("$installscript/c2ph$scr_ext", "$installscript/pstruct$scr_ext"); 
     } else {
-        link("$installscript/c2ph","$installscript/pstruct");
+        link("$installscript/c2ph$scr_ext", "$installscript/pstruct$scr_ext");
     }
 }
 
@@ -302,15 +324,6 @@ if (! $versiononly || !($installprivlib =~ m/\Q$]/)) {
 	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
@@ -321,7 +334,7 @@ if (! $versiononly || !($installprivlib =~ m/\Q$]/)) {
 
 if (!$versiononly) {
 
-    $dirsep = ($^O eq 'os2' || $^O eq 'MSWin32') ? ';' : ':' ;
+    $dirsep = ($Is_OS2 || $Is_W32) ? ';' : ':' ;
     ($path = $ENV{"PATH"}) =~ s:\\:/:g ;
     @path = split(/$dirsep/, $path);
     if ($Is_VMS) {
@@ -338,11 +351,11 @@ if (!$versiononly) {
 	# to $mainperldir (like SunOS)
 	next if samepath($_, $binexp);
 	next if ($mainperl_is_instperl && samepath($_, $mainperldir));
-	push(@otherperls, "$_/perl$exe_ext")
-	    if (-x "$_/perl$exe_ext" && ! -d "$_/perl$exe_ext");
+	push(@otherperls, "$_/$perl$exe_ext")
+	    if (-x "$_/$perl$exe_ext" && ! -d "$_/$perl$exe_ext");
     }
     if (@otherperls) {
-	print STDERR "\nWarning: perl appears in your path in the following " .
+	print STDERR "\nWarning: $perl appears in your path in the following " .
 	    "locations beyond where\nwe just installed it:\n";
 	for (@otherperls) {
 	    print STDERR "    ", $_, "\n";
@@ -352,7 +365,7 @@ if (!$versiononly) {
 
 }
 
-$packlist->write() unless $nono;
+$packlist->write() unless $nonono;
 print STDERR "  Installation complete\n";
 
 exit 0;
@@ -377,7 +390,7 @@ sub unlink {
 
     foreach $name (@names) {
 	next unless -e $name;
-	chmod 0777, $name if ($^O eq 'os2' || $^O eq 'MSWin32');
+	chmod 0777, $name if ($Is_OS2 || $Is_W32);
 	print STDERR "  unlink $name\n";
 	( CORE::unlink($name) and ++$cnt 
 	  or warn "Couldn't unlink $name: $!\n" ) unless $nonono;
@@ -390,7 +403,7 @@ sub safe_unlink {
     local @names = @_;
     foreach $name (@names) {
 	next unless -e $name;
-	chmod 0777, $name if ($^O eq 'os2' || $^O eq 'MSWin32');
+	chmod 0777, $name if ($Is_OS2 || $Is_W32);
 	print STDERR "  unlink $name\n";
 	next if CORE::unlink($name);
 	warn "Couldn't unlink $name: $!\n";
@@ -465,7 +478,7 @@ sub copy {
 sub samepath {
     local($p1, $p2) = @_;
 
-    return (lc($p1) eq lc($p2)) if ($^O eq 'MSWin32');
+    return (lc($p1) eq lc($p2)) if $Is_W32;
 
     if ($p1 ne $p2) {
 	local($dev1, $ino1, $dev2, $ino2);
@@ -498,7 +511,7 @@ sub installlib {
     my $installlib = $installprivlib;
     if ($dir =~ /^auto/ ||
 	  ($name =~ /^(.*)\.(?:pm|pod)$/ && $archpms{$1}) ||
-	  ($name =~ /^(.*)\.(?:h|lib)$/i && $^O eq 'MSWin32')
+	  ($name =~ /^(.*)\.(?:h|lib)$/i && $Is_W32)
        ) {
         $installlib = $installarchlib;
 	return unless $do_installarchlib;
@@ -542,6 +555,7 @@ sub installlib {
 
 sub copy_if_diff {
     my($from,$to)=@_;
+    return 1 if (($^O eq 'VMS') && (-d $from));
     -f $from || die "$0: $from not found";
     $packlist->{$to} = { type => 'file' };
     if (compare($from, $to) || $nonono) {
@@ -551,7 +565,7 @@ sub copy_if_diff {
         }
 	copy($from, $to);
 	# Restore timestamps if it's a .a library or for OS/2.
-	if (!$nonono && ($^O eq 'os2' || $to =~ /\.a$/)) {
+	if (!$nonono && ($Is_OS2 || $to =~ /\.a$/)) {
 	    my ($atime, $mtime) = (stat $from)[8,9];
 	    utime $atime, $mtime, $to;
 	}