X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=installperl;h=09ffc806dd53505e429427be0c2f49fd958d780c;hb=be341bcebb03d2f97192fb78a6a1bc33c7bca5ce;hp=7c0bed7acf8340f27f97acc631ba1048f742c512;hpb=8a85dc4e6fdf7b2ed7c6cd4124c74094397d931d;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/installperl b/installperl
index 7c0bed7..09ffc80 100755
--- a/installperl
+++ b/installperl
@@ -8,7 +8,7 @@ BEGIN {
 }
 
 use strict;
-use vars qw($Is_VMS $Is_W32 $Is_OS2 $Is_Cygwin $nonono $versiononly $depth);
+use vars qw($Is_VMS $Is_W32 $Is_OS2 $Is_Cygwin $nonono $dostrip $versiononly $depth);
 
 BEGIN {
     $Is_VMS = $^O eq 'VMS';
@@ -50,6 +50,7 @@ my $perl_verbase = defined($ENV{PERLNAME_VERBASE})
 
 while (@ARGV) {
     $nonono = 1 if $ARGV[0] eq '-n';
+    $dostrip = 1 if $ARGV[0] eq '-s';
     $versiononly = 1 if $ARGV[0] eq '-v';
     shift;
 }
@@ -85,12 +86,28 @@ if ((-e "testcompile") && (defined($ENV{'COMPILE'})))
 }
 
 find(sub {
-	if ("$File::Find::dir/$_" =~ m{^ext/[^/]+/(.*)\.pm$}) {
-	    (my $pm = $1) =~ s{^lib/}{};
-	    $archpms{$pm} = 1;
+	if ("$File::Find::dir/$_" =~ m{^ext\b(.*)/([^/]+)\.pm$}) {
+	    my($path, $modname) = ($1,$2);
+
+	    # strip trailing component first
+	    $path =~ s{/[^/]*$}{};
+
+	    # strip optional "/lib";
+	    $path =~ s{/lib\b}{};
+
+	    # strip any leading /
+	    $path =~ s{^/}{};
+
+	    # reconstitute canonical module name
+	    $modname = "$path/$modname" if length $path;
+
+	    # remember it
+	    $archpms{$modname} = 1;
 	}
     }, 'ext');
 
+# print "[$_]\n" for sort keys %archpms;
+
 my $ver = $Config{version};
 my $release = substr($],0,3);   # Not used presently.
 my $patchlevel = substr($],3,2);
@@ -196,7 +213,7 @@ elsif ($^O eq 'mpeix') {
 elsif ($^O ne 'dos') {
     safe_unlink("$installbin/$perl_verbase$ver$exe_ext");
     copy("perl$exe_ext", "$installbin/$perl_verbase$ver$exe_ext");
-    strip("$installbin/$perl_verbase$ver$exe_ext") if $^O =~ /^(rhapsody)$/;
+    strip("$installbin/$perl_verbase$ver$exe_ext");
     chmod(0755, "$installbin/$perl_verbase$ver$exe_ext");
 }
 else {
@@ -237,9 +254,9 @@ else {
 mkpath("$installarchlib/CORE", 1, 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 = <$coredir/*.*>;
+    map { s|^$coredir/||i; } @corefiles = <$coredir/*.*>;
 }
 else {
     # [als] hard-coded 'libperl' name... not good!
@@ -259,9 +276,9 @@ foreach my $file (@corefiles) {
     # HP-UX (at least) needs to maintain execute permissions
     # on dynamically-loadable libraries. So we do it for all.
     if (copy_if_diff($file,"$installarchlib/CORE/$file")) {
-	if ($file =~ /\.(so|\Q$dlext\E)$/) {
+	if ($file =~ /\.(\Q$so\E|\Q$dlext\E)$/) {
 	    chmod(0555, "$installarchlib/CORE/$file");
-	    strip("-S", "$installarchlib/CORE/$file") if $^O =~ /^(rhapsody)$/;
+	    strip("-S", "$installarchlib/CORE/$file") if $^O =~ /^(rhapsody|darwin)$/;
 	} else {
 	    chmod(0444, "$installarchlib/CORE/$file");
 	}
@@ -358,7 +375,7 @@ if (! $versiononly) {
 
 if (! $versiononly) {
     safe_unlink("$installscript/pstruct$scr_ext");
-    if ($^O eq 'dos' or $Is_VMS) {
+    if ($^O eq 'dos' or $Is_VMS or $^O eq 'transit') {
         copy("$installscript/c2ph$scr_ext", "$installscript/pstruct$scr_ext"); 
     } else {
         link("$installscript/c2ph$scr_ext", "$installscript/pstruct$scr_ext");
@@ -630,7 +647,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";
+    -f $from || warn "$0: $from not found";
     $packlist->{$to} = { type => 'file' };
     if (compare($from, $to) || $nonono) {
 	safe_unlink($to);   # In case we don't have write permissions.
@@ -651,6 +668,8 @@ sub strip
 {
     my(@args) = @_;
 
+    return unless $dostrip;
+
     my @opts;
     while (@args && $args[0] =~ /^(-\w+)$/) {
         push @opts, shift @args;