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 {
$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';
+ $verbose = 1 if $ARGV[0] eq '-V' || $ARGV [0] eq '-n';
+ $archname = 1 if $ARGV[0] eq '-A';
shift;
}
-my @scripts = qw(utils/c2ph utils/h2ph utils/h2xs utils/perlbug utils/perldoc
- 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);
+$versiononly = 1 if $Config{versiononly} && !defined $versiononly;
+my (@scripts, @tolink);
+open SCRIPTS, "utils.lst" or die "Can't open utils.lst: $!";
+while (<SCRIPTS>) {
+ next if /^#/;
+ next if /#\s*pod\s*=/; # Binary programs need separate treatment
+ chomp;
+ if (/(\S*)\s*#\s*link\s*=\s*(\S*)/) {
+ push @scripts, $1;
+ push @tolink, [$1, $2];
+ } else {
+ push @scripts, $_;
+ }
+}
+close SCRIPTS;
if ($scr_ext) { @scripts = map { "$_$scr_ext" } @scripts; }
# files under the archlib directory.
my %archpms = (
Config => 1,
+ lib => 1,
);
if ($^O eq 'dos') {
# print "[$_]\n" for sort keys %archpms;
my $ver = $Config{version};
-my $release = substr($],0,3); # Not used presently.
+my $release = substr($],0,3); # Not used currently.
my $patchlevel = substr($],3,2);
die "Patchlevel of perl ($patchlevel)",
"and patchlevel of config.sh ($Config{'PERL_VERSION'}) don't match\n"
my $so = $Config{so};
my $dlext = $Config{dlext};
my $dlsrc = $Config{dlsrc};
+if ($^O eq 'os390') {
+ my $pwd;
+ chomp($pwd=`pwd`);
+ my $archlibexp = $Config{archlibexp};
+ my $usedl = $Config{usedl};
+ if ($usedl eq 'define') {
+ `./$^X -pibak -e 's{$pwd\/libperl.x}{$archlibexp/CORE/libperl.x}' lib/Config.pm`;
+ }
+}
my $d_dosuid = $Config{d_dosuid};
my $binexp = $Config{binexp};
if ($d_dosuid && $>) { die "You must run as root to install suidperl\n"; }
$installbin || die "No installbin directory in config.sh\n";
--d $installbin || mkpath($installbin, 1, 0777);
+-d $installbin || mkpath($installbin, $verbose, 0777);
-d $installbin || $nonono || die "$installbin is not a directory\n";
-w $installbin || $nonono || die "$installbin is not writable by you\n"
unless $installbin =~ m#^/afs/# || $nonono;
-x 'perl' . $exe_ext || die "perl isn't executable!\n";
-x 'suidperl' . $exe_ext|| die "suidperl isn't executable!\n" if $d_dosuid;
--f 't/ran_tests' || $Is_W32
- || warn "WARNING: You've never run 'make test'!!!",
- " (Installing anyway.)\n";
+-f 't/rantests' || $Is_W32
+ || warn "WARNING: You've never run 'make test' or",
+ " some tests failed! (Installing anyway.)\n";
if ($Is_W32 or $Is_Cygwin) {
my $perldll;
};
};
} else {
- $perldll = 'perl56.' . $dlext;
+ $perldll = 'perl57.' . $dlext;
}
if ($dlsrc ne "dl_none.xs") {
my ($do_installarchlib, $do_installprivlib) = (0, 0);
-mkpath($installprivlib, 1, 0777);
-mkpath($installarchlib, 1, 0777);
-mkpath($installsitelib, 1, 0777) if ($installsitelib);
-mkpath($installsitearch, 1, 0777) if ($installsitearch);
+mkpath($installprivlib, $verbose, 0777);
+mkpath($installarchlib, $verbose, 0777);
+mkpath($installsitelib, $verbose, 0777) if ($installsitelib);
+mkpath($installsitearch, $verbose, 0777) if ($installsitearch);
if (chdir "lib") {
$do_installarchlib = ! samepath($installarchlib, '.');
}
# Install header files and libraries.
-mkpath("$installarchlib/CORE", 1, 0777);
+mkpath("$installarchlib/CORE", $verbose, 0777);
my @corefiles;
if ($Is_VMS) { # We did core file selection during build
my $coredir = "lib/$Config{archname}/$ver/CORE";
push(@corefiles,'perl.exp') if $^O eq 'aix';
if ($^O eq 'mpeix') {
# MPE needs mpeixish.h installed as well.
- mkpath("$installarchlib/CORE/mpeix", 1, 0777);
+ mkpath("$installarchlib/CORE/mpeix", $verbose, 0777);
push(@corefiles,'mpeix/mpeixish.h');
}
# If they have built sperl.o...
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;
chmod(0755, "$installbin/cppstdin");
}
-# Install scripts.
+sub script_alias {
+ my ($installscript, $orig, $alias, $scr_ext) = @_;
-mkpath($installscript, 1, 0777);
+ safe_unlink("$installscript/$alias$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.
+mkpath($installscript, $verbose, 0777);
+if ($versiononly) {
for (@scripts) {
(my $base = $_) =~ s#.*/##;
- copy($_, "$installscript/$base");
+ $base .= $ver;
+ copy($_, "$installscript/$base");
chmod(0755, "$installscript/$base");
}
-}
-# pstruct should be a link to c2ph
+ for (@tolink) {
+ my ($from, $to) = map { "$_$ver" } @$_;
+ (my $frbase = $from) =~ s#.*/##;
+ (my $tobase = $to) =~ s#.*/##;
+ script_alias($installscript, $frbase, $tobase, $scr_ext);
+ }
+} else {
+ for (@scripts) {
+ (my $base = $_) =~ s#.*/##;
+ copy($_, "$installscript/$base");
+ chmod(0755, "$installscript/$base");
+ }
-if (! $versiononly) {
- 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");
+ for (@tolink) {
+ my ($from, $to) = @$_;
+ (my $frbase = $from) =~ s#.*/##;
+ (my $tobase = $to) =~ s#.*/##;
+ script_alias($installscript, $frbase, $tobase, $scr_ext);
}
}
# ($installprivlib/pods for cygwin).
my $pod = $Is_Cygwin ? 'pods' : 'pod';
-unless ( $versiononly && !($installprivlib =~ m/\Q$ver/)) {
- mkpath("${installprivlib}/$pod", 1, 0777);
+if ( !$versiononly || ($installprivlib =~ m/\Q$ver/)) {
+ mkpath("${installprivlib}/$pod", $verbose, 0777);
# If Perl 5.003's perldiag.pod is there, rename it.
if (open POD, "${installprivlib}/$pod/perldiag.pod") {
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]/);
}
# ignore patch backups, RCS files, emacs backup & temp files and the
- # .exists files.
- return if $name =~ m{\.orig$|~$|^#.+#$|,v$|^\.exists};
+ # .exists files, and .PL files.
+ return if $name =~ m{\.orig$|~$|^#.+#$|,v$|^\.exists|\.PL$};
$name = "$dir/$name" if $dir ne '';
$packlist->{"$installlib/$name"} = { type => 'file' };
if (compare($_, "$installlib/$name") || $nonono) {
unlink("$installlib/$name");
- mkpath("$installlib/$dir", 1, 0777);
+ mkpath("$installlib/$dir", $verbose, 0777);
# HP-UX (at least) needs to maintain execute permissions
# on dynamically-loaded libraries.
copy_if_diff($_, "$installlib/$name")