X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=installperl;h=7c0bed7acf8340f27f97acc631ba1048f742c512;hb=cb50131aab68ac6dda048612c6e853b8cb08701e;hp=208c276c8dd609851c7ffed014571c862b8c3e92;hpb=f89d6eaa35318513fcfc9665bbb2d0bcea3326ee;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/installperl b/installperl
index 208c276..7c0bed7 100755
--- a/installperl
+++ b/installperl
@@ -14,7 +14,7 @@ BEGIN {
     $Is_VMS = $^O eq 'VMS';
     $Is_W32 = $^O eq 'MSWin32';
     $Is_OS2 = $^O eq 'os2';
-    $Is_Cygwin = $^O =~ /cygwin/i;
+    $Is_Cygwin = $^O eq 'cygwin';
     if ($Is_VMS) { eval 'use VMS::Filespec;' }
 }
 
@@ -40,10 +40,10 @@ my $exe_ext = $Config{exe_ext};
 # Allow ``make install PERLNAME=something_besides_perl'':
 my $perl = defined($ENV{PERLNAME}) ? $ENV{PERLNAME} : 'perl';
 
-# This is the base used for versioned names, like "perl5.005".
+# This is the base used for versioned names, like "perl5.6.0".
 # It's separate because a common use of $PERLNAME is to install
 # perl as "perl5", if that's used as base for versioned files you
-# get "perl55.005".
+# get "perl55.6.0".
 my $perl_verbase = defined($ENV{PERLNAME_VERBASE})
 		    ? $ENV{PERLNAME_VERBASE}
 		    : $perl;
@@ -54,10 +54,8 @@ while (@ARGV) {
     shift;
 }
 
-umask 022 unless $Is_VMS;
-
 my @scripts = qw(utils/c2ph utils/h2ph utils/h2xs utils/perlbug utils/perldoc
-		utils/pl2pm utils/splain utils/perlcc
+		utils/pl2pm utils/splain utils/perlcc utils/dprofpp
 		x2p/s2p x2p/find2perl 
 		pod/pod2man pod/pod2html pod/pod2latex pod/pod2text
 		pod/pod2usage pod/podchecker pod/podselect);
@@ -93,9 +91,9 @@ find(sub {
 	}
     }, 'ext');
 
-my $ver = $];
-my $release = substr($ver,0,3);   # Not used presently.
-my $patchlevel = substr($ver,3,2);
+my $ver = $Config{version};
+my $release = substr($],0,3);   # Not used presently.
+my $patchlevel = substr($],3,2);
 die "Patchlevel of perl ($patchlevel)",
     "and patchlevel of config.sh ($Config{'PERL_VERSION'}) don't match\n"
 	if $patchlevel != $Config{'PERL_VERSION'};
@@ -113,6 +111,7 @@ my $libperl = $Config{libperl};
 # Shared library and dynamic loading suffixes.
 my $so = $Config{so};
 my $dlext = $Config{dlext};
+my $dlsrc = $Config{dlsrc};
 
 my $d_dosuid = $Config{d_dosuid};
 my $binexp = $Config{binexp};
@@ -157,18 +156,19 @@ if ($Is_Cygwin) {
     };
   };
 } else {
-  $perldll = 'perl.' . $dlext;
-  $perldll = 'perlcore.' . $dlext if $Config{'ccflags'} =~ /PERL_OBJECT/i;
+  $perldll = 'perl56.' . $dlext;
 }
 
--f $perldll || die "No perl DLL built\n";
-
+   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");
-}
+   safe_unlink("$installbin/$perldll");
+   copy("$perldll", "$installbin/$perldll");
+   chmod(0755, "$installbin/$perldll");
+   
+} # if ($Is_W32 or $Is_Cygwin)
 
 # This will be used to store the packlist
 my $packlist = ExtUtils::Packlist->new("$installarchlib/.packlist");
@@ -222,7 +222,7 @@ mkpath($installsitearch, 1, 0777) if ($installsitearch);
 if (chdir "lib") {
     $do_installarchlib = ! samepath($installarchlib, '.');
     $do_installprivlib = ! samepath($installprivlib, '.');
-    $do_installprivlib = 0 if $versiononly && !($installprivlib =~ m/\Q$]/);
+    $do_installprivlib = 0 if $versiononly && !($installprivlib =~ m/\Q$ver/);
 
     if ($do_installarchlib || $do_installprivlib) {
 	find(\&installlib, '.');
@@ -237,7 +237,7 @@ else {
 mkpath("$installarchlib/CORE", 1, 0777);
 my @corefiles;
 if ($Is_VMS) {  # We did core file selection during build
-    my $coredir = "lib/$Config{'arch'}/$]";
+    my $coredir = "lib/$Config{'arch'}/$ver";
     $coredir =~ tr/./_/;
     @corefiles = <$coredir/*.*>;
 }
@@ -365,29 +365,32 @@ if (! $versiononly) {
     }
 }
 
-# Install pod pages.  Where? I guess in $installprivlib/pod.
+# Install pod pages.  Where? I guess in $installprivlib/pod
+# ($installprivlib/pods for cygwin).
 
-unless ( $versiononly && !($installprivlib =~ m/\Q$]/)) {
-    mkpath("${installprivlib}/pod", 1, 0777);
+my $pod = $Is_Cygwin ? 'pods' : 'pod';
+unless ( $versiononly && !($installprivlib =~ m/\Q$ver/)) {
+    mkpath("${installprivlib}/$pod", 1, 0777);
 
     # If Perl 5.003's perldiag.pod is there, rename it.
-    if (open POD, "${installprivlib}/pod/perldiag.pod") {
+    if (open POD, "${installprivlib}/$pod/perldiag.pod") {
 	read POD, $_, 4000;
 	close POD;
 	# Some of Perl 5.003's diagnostic messages ended with periods.
 	if (/^=.*\.$/m) {
-	    my ($from, $to) = ("${installprivlib}/pod/perldiag.pod",
-			       "${installprivlib}/pod/perldiag-5.003.pod");
-	    print STDERR "  rename $from $to";
+	    my ($from, $to) = ("${installprivlib}/$pod/perldiag.pod",
+			       "${installprivlib}/$pod/perldiag-5.003.pod");
+	    print "  rename $from $to";
 	    rename($from, $to)
 		or warn "Couldn't rename $from to $to: $!\n"
 		unless $nonono;
 	}
     }
 
-    foreach my $file (@pods) {
-	# $file is a name like  pod/perl.pod
-	copy_if_diff($file, "${installprivlib}/${file}");
+    for (@pods) {
+	# $_ is a name like  pod/perl.pod
+        (my $base = $_) =~ s#.*/##;
+	copy_if_diff($_, "${installprivlib}/$pod/${base}");
     }
 
 }
@@ -399,7 +402,7 @@ unless ( $versiononly && !($installprivlib =~ m/\Q$]/)) {
 # installed perl.
 
 if (!$versiononly) {
-	my ($path, @path);
+    my ($path, @path);
     my $dirsep = ($Is_OS2 || $Is_W32) ? ';' : ':' ;
     ($path = $ENV{"PATH"}) =~ s:\\:/:g ;
     @path = split(/$dirsep/, $path);
@@ -411,14 +414,17 @@ if (!$versiononly) {
         }
     }
     my @otherperls;
+    my %otherperls;
     for (@path) {
 	next unless m,^/,;
 	# Use &samepath here because some systems have other dirs linked
 	# 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");
+        my $otherperl = "$_/$perl$exe_ext";
+	next if $otherperls{$otherperl}++;
+	push(@otherperls, $otherperl)
+	    if (-x $otherperl && ! -d $otherperl);
     }
     if (@otherperls) {
 	print STDERR "\nWarning: $perl appears in your path in the following " .
@@ -432,7 +438,7 @@ if (!$versiononly) {
 }
 
 $packlist->write() unless $nonono;
-print STDERR "  Installation complete\n";
+print "  Installation complete\n";
 
 exit 0;
 
@@ -442,7 +448,7 @@ sub yn {
     my($prompt) = @_;
     my($answer);
     my($default) = $prompt =~ m/\[([yn])\]\s*$/i;
-    print STDERR $prompt;
+    print $prompt;
     chop($answer = <STDIN>);
     $answer = $default if $answer =~ m/^\s*$/;
     ($answer =~ m/^[yY]/);
@@ -457,7 +463,7 @@ sub unlink {
     foreach my $name (@names) {
 	next unless -e $name;
 	chmod 0777, $name if ($Is_OS2 || $Is_W32 || $Is_Cygwin);
-	print STDERR "  unlink $name\n";
+	print "  unlink $name\n";
 	( CORE::unlink($name) and ++$cnt 
 	  or warn "Couldn't unlink $name: $!\n" ) unless $nonono;
     }
@@ -470,11 +476,11 @@ sub safe_unlink {
     foreach my $name (@names) {
 	next unless -e $name;
 	chmod 0777, $name if ($Is_OS2 || $Is_W32);
-	print STDERR "  unlink $name\n";
+	print "  unlink $name\n";
 	next if CORE::unlink($name);
 	warn "Couldn't unlink $name: $!\n";
 	if ($! =~ /busy/i) {
-	    print STDERR "  mv $name $name.old\n";
+	    print "  mv $name $name.old\n";
 	    safe_rename($name, "$name.old")
 		or warn "Couldn't rename $name: $!\n";
 	}
@@ -499,18 +505,20 @@ sub link {
     my($from,$to) = @_;
     my($success) = 0;
 
-    print STDERR "  ln $from $to\n";
+    print "  ln $from $to\n";
     eval {
 	CORE::link($from, $to)
 	    ? $success++
 	    : ($from =~ m#^/afs/# || $to =~ m#^/afs/#)
 	      ? die "AFS"  # okay inside eval {}
-	      : warn "Couldn't link $from to $to: $!\n"
+	      : die "Couldn't link $from to $to: $!\n"
 	  unless $nonono;
         $packlist->{$to} = { from => $from, type => 'link' };
     };
     if ($@) {
-	print STDERR "  creating new version of $to\n" if $Is_VMS and -e $to;
+	warn $@;
+	print "  cp $from $to\n";
+	print "  creating new version of $to\n" if $Is_VMS and -e $to;
 	File::Copy::copy($from, $to)
 	    ? $success++
 	    : warn "Couldn't copy $from to $to: $!\n"
@@ -524,7 +532,7 @@ sub chmod {
     my($mode,$name) = @_;
 
     return if ($^O eq 'dos');
-    printf STDERR "  chmod %o %s\n", $mode, $name;
+    printf "  chmod %o %s\n", $mode, $name;
     CORE::chmod($mode,$name)
 	|| warn sprintf("Couldn't chmod %o %s: $!\n", $mode, $name)
       unless $nonono;
@@ -533,8 +541,8 @@ sub chmod {
 sub copy {
     my($from,$to) = @_;
 
-    print STDERR "  cp $from $to\n";
-    print STDERR "  creating new version of $to\n" if $Is_VMS and -e $to;
+    print "  cp $from $to\n";
+    print "  creating new version of $to\n" if $Is_VMS and -e $to;
     File::Copy::copy($from, $to)
 	|| warn "Couldn't copy $from to $to: $!\n"
       unless $nonono;
@@ -564,13 +572,15 @@ sub installlib {
 
     my $name = $_;
 
-    if ($name eq 'CVS' && -d $name) {
+    # Ignore RCS and CVS directories.
+    if (($name eq 'CVS' or $name eq 'RCS') and -d $name) {
 	$File::Find::prune = 1;
 	return;
     }
     
-    # ignore patch backups and the .exists files.
-    return if $name =~ m{\.orig$|~$|^\.exists};
+    # ignore patch backups, RCS files, emacs backup & temp files and the
+    # .exists files.
+    return if $name =~ m{\.orig$|~$|^#.+#$|,v$|^\.exists};
 
     $name = "$dir/$name" if $dir ne '';
 
@@ -648,10 +658,10 @@ sub strip
 
     foreach my $file (@args) {
         if (-f $file) {
-            print STDERR "  strip $file\n";
+            print "  strip $file\n";
             system("strip", @opts, $file);
         } else {
-            print STDERR "# file '$file' skipped\n";
+            print "# file '$file' skipped\n";
         }
     }
 }