X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=installperl;h=c35482db939e71ce4cb23f1e793d064f8fab21dd;hb=0ecd3ba2f9cc10124e1b1548816d989cfc59a802;hp=dbdd6b558e8d530bcfdf86070027931682922576;hpb=b82d478d407f1381d69179104035c975c1d1402e;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/installperl b/installperl
index dbdd6b5..c35482d 100755
--- a/installperl
+++ b/installperl
@@ -9,7 +9,7 @@ BEGIN {
 
 use strict;
 my ($Is_VMS, $Is_W32, $Is_OS2, $Is_Cygwin, $nonono, $dostrip,
-    $versiononly, $silent, $verbose, $otherperls);
+    $versiononly, $silent, $verbose, $otherperls, $archname);
 use vars qw /$depth/;
 
 BEGIN {
@@ -54,13 +54,15 @@ while (@ARGV) {
     $nonono = 1 if $ARGV[0] eq '-n';
     $dostrip = 1 if $ARGV[0] eq '-s';
     $versiononly = 1 if $ARGV[0] eq '-v';
+    $versiononly = 0 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';
+    $archname = 1 if $ARGV[0] eq '-A';
     shift;
 }
 
-$versiononly = 1 if $Config{versiononly};
+$versiononly = 1 if $Config{versiononly} && !defined $versiononly;
 
 my @scripts = qw(utils/c2ph utils/h2ph utils/h2xs utils/perlbug utils/perldoc
 		utils/pl2pm utils/splain utils/perlcc utils/dprofpp
@@ -190,7 +192,7 @@ if ($Is_W32 or $Is_Cygwin) {
       };
     };
   } else {
-    $perldll = 'perl56.' . $dlext;
+    $perldll = 'perl57.' . $dlext;
   }
 
   if ($dlsrc ne "dl_none.xs") {
@@ -320,6 +322,21 @@ if (! $versiononly && ! samepath($installbin, '.') && ($^O ne 'dos') && ! $Is_VM
       if $d_dosuid;
 }
 
+# For development purposes it can be very useful to have multiple perls
+# build for different "architectures" (eg threading or not) simultaneously.
+if ($archname && ! samepath($installbin, '.') && ($^O ne 'dos') && ! $Is_VMS) {
+    my $archperl = "$perl_verbase$ver-$Config{archname}$exe_ext";
+    safe_unlink("$installbin/$archperl");
+    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/$archperl");
+    } else {
+	link("$installbin/$perl_verbase$ver$exe_ext",
+		"$installbin/$archperl");
+    }
+}
+
 # Offer to install perl in a "standard" location
 
 my $mainperl_is_instperl = 0;
@@ -376,6 +393,19 @@ if (! $versiononly && (-f 'cppstdin') && (! samepath($installbin, '.'))) {
     chmod(0755, "$installbin/cppstdin");
 }
 
+sub script_alias {
+    my ($installscript, $orig, $alias, $scr_ext) = @_;
+
+    safe_unlink("$installscript/pstruct$scr_ext");
+    if ($^O eq 'dos' or $Is_VMS or $^O eq 'transit') {
+	copy("$installscript/$orig$scr_ext",
+	     "$installscript/$alias$scr_ext"); 
+    } else {
+	link("$installscript/$orig$scr_ext",
+	     "$installscript/$alias$scr_ext");
+    }
+}
+
 if (! $versiononly) {
     # Install scripts.
 
@@ -388,14 +418,10 @@ 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"); 
-    } else {
-	link("$installscript/c2ph$scr_ext",
-	     "$installscript/pstruct$scr_ext");
-    }
+    script_alias('c2ph', 'pstruct');
+
+    # psed should be a link to s2p
+    script_alias('s2p', 'psed');
 }
 
 # Install pod pages.  Where? I guess in $installprivlib/pod
@@ -481,7 +507,7 @@ sub yn {
     my($prompt) = @_;
     my($answer);
     my($default) = $prompt =~ m/\[([yn])\]\s*$/i;
-    warn $prompt;
+    print STDERR $prompt;
     chop($answer = <STDIN>);
     $answer = $default if $answer =~ m/^\s*$/;
     ($answer =~ m/^[yY]/);