}
use strict;
-use vars qw($Is_VMS $Is_W32 $Is_OS2 $Is_Cygwin $nonono $versiononly $depth);
+my ($Is_VMS, $Is_W32, $Is_OS2, $Is_Cygwin, $nonono, $dostrip,
+ $versiononly, $silent, $verbose, $otherperls);
+use vars qw /$depth/;
BEGIN {
$Is_VMS = $^O eq 'VMS';
use ExtUtils::Packlist;
use Config;
use subs qw(unlink link chmod);
-use vars qw($packlist);
# override the ones in the rest of the script
sub mkpath {
? $ENV{PERLNAME_VERBASE}
: $perl;
+$otherperls = 1;
while (@ARGV) {
$nonono = 1 if $ARGV[0] eq '-n';
+ $dostrip = 1 if $ARGV[0] eq '-s';
$versiononly = 1 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';
shift;
}
}
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 $perlver = sprintf "%8.6f",$];
my $ver = $Config{version};
-my $release = substr($],0,3); # Not used presently.
-my $patchlevel = substr($],3,2);
+my $release = substr($perlver,0,3); # Not used presently.
+my $patchlevel = substr($perlver,3,2);
die "Patchlevel of perl ($patchlevel)",
"and patchlevel of config.sh ($Config{'PERL_VERSION'}) don't match\n"
if $patchlevel != $Config{'PERL_VERSION'};
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;
--x 't/TEST' || $Is_W32
+-f 't/ran_tests' || $Is_W32
|| warn "WARNING: You've never run 'make test'!!!",
" (Installing anyway.)\n";
if ($Is_W32 or $Is_Cygwin) {
my $perldll;
-if ($Is_Cygwin) {
- $perldll = $libperl;
- $perldll =~ s/(\..*)?$/.$dlext/;
- if ($Config{useshrplib} eq 'true') {
- # install ld2 and perlld as well
- foreach ('ld2', 'perlld') {
- safe_unlink("$installbin/$_");
- copy("$_", "$installbin/$_");
- chmod(0755, "$installbin/$_");
+ if ($Is_Cygwin) {
+ $perldll = $libperl;
+ $perldll =~ s/(\..*)?$/.$dlext/;
+ if ($Config{useshrplib} eq 'true') {
+ # install ld2 and perlld as well
+ foreach ('ld2', 'perlld') {
+ safe_unlink("$installbin/$_");
+ copy("$_", "$installbin/$_");
+ chmod(0755, "$installbin/$_");
+ };
};
- };
-} else {
- $perldll = 'perl56.' . $dlext;
-}
-
- 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");
+ } else {
+ $perldll = 'perl56.' . $dlext;
+ }
+
+ 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");
} # if ($Is_W32 or $Is_Cygwin)
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 {
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{'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!
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...
# 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");
}
my $mainperl_is_instperl = 0;
-if ($Config{installusrbinperl} eq 'define' &&
+if ($Config{installusrbinperl} && $Config{installusrbinperl} eq 'define' &&
!$versiononly && !$nonono && !$Is_W32 && !$Is_VMS && -t STDIN && -t STDERR
&& -w $mainperldir && ! samepath($mainperldir, $installbin)) {
my($usrbinperl) = "$mainperldir/$perl$exe_ext";
# Install scripts.
-mkpath($installscript, 1, 0777);
+mkpath($installscript, $verbose, 0777);
if (! $versiononly) {
for (@scripts) {
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");
my $pod = $Is_Cygwin ? 'pods' : 'pod';
unless ( $versiononly && !($installprivlib =~ m/\Q$ver/)) {
- mkpath("${installprivlib}/$pod", 1, 0777);
+ mkpath("${installprivlib}/$pod", $verbose, 0777);
# If Perl 5.003's perldiag.pod is there, rename it.
if (open POD, "${installprivlib}/$pod/perldiag.pod") {
# Also skip $mainperl if the user opted to have it be a link to the
# installed perl.
-if (!$versiononly) {
+if (!$versiononly && $otherperls) {
my ($path, @path);
my $dirsep = ($Is_OS2 || $Is_W32) ? ';' : ':' ;
($path = $ENV{"PATH"}) =~ s:\\:/:g ;
if (-x $otherperl && ! -d $otherperl);
}
if (@otherperls) {
- print STDERR "\nWarning: $perl appears in your path in the following " .
+ warn "\nWarning: $perl appears in your path in the following " .
"locations beyond where\nwe just installed it:\n";
for (@otherperls) {
- print STDERR " ", $_, "\n";
+ warn " ", $_, "\n";
}
- print STDERR "\n";
+ warn "\n";
}
}
$packlist->write() unless $nonono;
-print " Installation complete\n";
+print " Installation complete\n" if $verbose;
exit 0;
my($prompt) = @_;
my($answer);
my($default) = $prompt =~ m/\[([yn])\]\s*$/i;
- print $prompt;
+ warn $prompt;
chop($answer = <STDIN>);
$answer = $default if $answer =~ m/^\s*$/;
($answer =~ m/^[yY]/);
foreach my $name (@names) {
next unless -e $name;
chmod 0777, $name if ($Is_OS2 || $Is_W32 || $Is_Cygwin);
- print " unlink $name\n";
+ print " unlink $name\n" if $verbose;
( CORE::unlink($name) and ++$cnt
or warn "Couldn't unlink $name: $!\n" ) unless $nonono;
}
foreach my $name (@names) {
next unless -e $name;
chmod 0777, $name if ($Is_OS2 || $Is_W32);
- print " unlink $name\n";
+ print " unlink $name\n" if $verbose;
next if CORE::unlink($name);
warn "Couldn't unlink $name: $!\n";
if ($! =~ /busy/i) {
- print " mv $name $name.old\n";
+ print " mv $name $name.old\n" if $verbose;
safe_rename($name, "$name.old")
or warn "Couldn't rename $name: $!\n";
}
my($from,$to) = @_;
my($success) = 0;
- print " ln $from $to\n";
+ print $verbose ? " ln $from $to\n" : " $to\n" unless $silent;
eval {
CORE::link($from, $to)
? $success++
};
if ($@) {
warn $@;
- print " cp $from $to\n";
- print " creating new version of $to\n" if $Is_VMS and -e $to;
+ print $verbose ? " cp $from $to\n" : " $to\n" unless $silent;
+ print " creating new version of $to\n"
+ if $Is_VMS and -e $to and !$silent;
File::Copy::copy($from, $to)
? $success++
: warn "Couldn't copy $from to $to: $!\n"
my($mode,$name) = @_;
return if ($^O eq 'dos');
- printf " chmod %o %s\n", $mode, $name;
+ printf " chmod %o %s\n", $mode, $name if $verbose;
CORE::chmod($mode,$name)
|| warn sprintf("Couldn't chmod %o %s: $!\n", $mode, $name)
unless $nonono;
sub copy {
my($from,$to) = @_;
- print " cp $from $to\n";
- print " creating new version of $to\n" if $Is_VMS and -e $to;
+ print $verbose ? " cp $from $to\n" : " $to\n" unless $silent;
+ print " creating new version of $to\n" if $Is_VMS and -e $to and !$silent;
File::Copy::copy($from, $to)
|| warn "Couldn't copy $from to $to: $!\n"
unless $nonono;
$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")
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.
{
my(@args) = @_;
+ return unless $dostrip;
+
my @opts;
while (@args && $args[0] =~ /^(-\w+)$/) {
push @opts, shift @args;
foreach my $file (@args) {
if (-f $file) {
- print " strip $file\n";
+ print " strip $file\n" if $verbose;
system("strip", @opts, $file);
} else {
- print "# file '$file' skipped\n";
+ print "# file '$file' skipped\n" if $verbose;
}
}
}
projects / p5sagit/p5-mst-13.2.git / blobdiff