#!./perl -w
BEGIN {
- require 5.004;
chdir '..' if !-d 'lib' and -d '../lib';
@INC = 'lib';
$ENV{PERL5LIB} = 'lib';
# This needs to be at BEGIN time, before any use of Config
+ # install_lib itself loads and imports Config into main::
require './install_lib.pl';
}
use strict;
-use vars qw($Is_VMS $Is_W32 $Is_OS2 $Is_Cygwin $Is_Darwin $Is_NetWare
- %opts $packlist);
-my ($dostrip, $versiononly, $force,
- $otherperls, $archname, $nwinstall, $nopods);
-# Not sure how easy it would be to refactor to remove the need for local $depth
-# below
-use vars qw /$depth/;
+our ($Is_VMS, $Is_W32, $Is_OS2, $Is_Cygwin, $Is_Darwin, $Is_NetWare, $Is_AmigaOS,
+ %opts, $packlist);
+my $versiononly;
BEGIN {
if ($Is_VMS) { eval 'use VMS::Filespec;' }
}
+# HP-UX (at least) needs to maintain execute permissions
+# on dynamically-loadable libraries. So we do it for all.
+#
+# In AmigaOS, the 0777 means 'rwed' (e = execute, d = delete),
+# (not 'rwx') and having the 'd' makes updates more convenient.
+my $SO_MODE = $Is_AmigaOS ? 0777 : 0555;
+my $NON_SO_MODE = $Is_AmigaOS ? 0666 : 0444;
+
my $scr_ext = ($Is_VMS ? '.Com' : $Is_W32 ? '.bat' : '');
use File::Find;
use File::Compare;
use File::Copy ();
-use File::Path ();
use ExtUtils::Packlist;
use Cwd;
+# nogetopt_compat to disable treating +v as meaning -v
+use Getopt::Long qw(:config nogetopt_compat no_auto_abbrev noignorecase);
+
+require './Porting/pod_lib.pl';
if ($Is_NetWare) {
$Is_W32 = 0;
$scr_ext = '.pl';
}
-# override the ones in the rest of the script
-sub mkpath {
- File::Path::mkpath(@_) unless $opts{notify};
-}
-
my $mainperldir = "/usr/bin";
my $exe_ext = $Config{exe_ext};
}
}
-$otherperls = 1;
-# Consider refactoring this to use Getopt::Long once Getopt::Long's planned
-# feature is implemented, to distinguish + and - options.
-while (@ARGV) {
- $opts{notify} = 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';
- $opts{silent} = 1 if $ARGV[0] eq '-S';
- $otherperls = 0 if $ARGV[0] eq '-o';
- $force = 1 if $ARGV[0] eq '-f';
- $opts{verbose} = 1 if $ARGV[0] eq '-V' || $ARGV [0] eq '-n';
- $archname = 1 if $ARGV[0] eq '-A';
- $nwinstall = 1 if $ARGV[0] eq '-netware';
- $nopods = 1 if $ARGV[0] eq '-p';
- $opts{destdir} = $1 if $ARGV[0] =~ /^-?-destdir=(.*)$/;
- if ($ARGV[0] eq '-?' or $ARGV[0] =~ /^-?-h/) {
- print <<"EOT";
+# This little hack simplifies making the code after the comment "Fetch some
+# frequently-used items from %Config" warning free. With $opts{destdir} always
+# defined, it's also possible to make the s/\Q$opts{destdir}\E unconditional.
+
+$opts{destdir} = '';
+{
+ my $usage = 0;
+ if (!GetOptions(\%opts, 'notify|n', 'strip|s', 'silent|S',
+ 'skip-otherperls|o', 'force|f', 'verbose|V', 'archname|A',
+ 'netware', 'nopods|p', 'destdir:s', 'help|h|?',
+ 'versiononly|v' => \$versiononly, '<>' => sub {
+ if ($_[0] eq '+v') {
+ $versiononly = 0;
+ } else {
+ # Any other unknown argument is going to be an error
+ $usage = 1;
+ }
+ },
+ )) {
+ $usage = 1;
+ }
+ $opts{verbose} ||= $opts{notify};
+
+ if ($usage || $opts{help}) {
+ print <<"EOT";
Usage $0: [switches]
-n Don't actually run any commands; just print them.
-s Run strip on installed binaries.
-p Don't install the pod files. [This will break use diagnostics;]
-netware Install correctly on a Netware server.
-destdir Prefix installation directories by this string.
+ -h Display this help message.
EOT
- exit;
+ exit $usage;
}
- shift;
}
$versiononly = 1 if $Config{versiononly} && !defined $versiononly;
open SCRIPTS, "utils.lst" or die "Can't open utils.lst: $!";
while (<SCRIPTS>) {
next if /^#/;
- s/\s*#\s*pod\s*=.*//; # install script regardless of pod location
- next if /a2p/; # a2p is binary, to be installed separately
chomp;
if (/(\S*)\s*#\s*link\s*=\s*(\S*)/) {
push @scripts, $1;
if ($scr_ext) { @scripts = map { "$_$scr_ext" } @scripts; }
-my @pods = $nopods ? () : (<pod/*.pod>, 'x2p/a2p.pod');
-
# Specify here any .pm files that are actually architecture-dependent.
# (Those included with XS extensions under ext/ are automatically
# added later.)
my %archpms = (
Config => 1,
lib => 1,
- Cwd => 1,
);
if ($^O eq 'dos') {
push(@scripts, map("$_.exe", @scripts));
}
-find(sub {
- if ("$File::Find::dir/$_" =~ m{^ext\b(.*)/([^/]+)\.pm$}) {
- my($path, $modname) = ($1,$2);
+# Exclude nonxs extensions that are not architecture dependent
+my @nonxs = grep(!/^Errno$/, split(' ', $Config{'nonxs_ext'}));
- # strip to optional "/lib", or remove trailing component
- $path =~ s{.*/lib\b}{} or $path =~ s{/[^/]*$}{};
+my @ext_dirs = qw(cpan dist ext);
+foreach my $ext_dir (@ext_dirs) {
+ find(sub {
+ if (($File::Find::name =~ m{^$ext_dir\b(.*)/([^/]+)\.pm$}) &&
+ ! grep { (my $dir = $_) =~ s/\//-/g;
+ $File::Find::name =~ /^$ext_dir\/$dir\// } @nonxs)
+ {
+ my($path, $modname) = ($1,$2);
- # strip any leading /
- $path =~ s{^/}{};
+ # Change hyphenated name like Filter-Util-Call to nested
+ # directory name Filter/Util/Call
+ $path =~ s{-}{/}g;
- # reconstitute canonical module name
- $modname = "$path/$modname" if length $path;
+ # strip to optional "/lib", or remove trailing component
+ $path =~ s{.*/lib\b}{} or $path =~ s{/[^/]*$}{};
- # remember it
- $archpms{$modname} = 1;
- }
-}, 'ext');
+ # strip any leading /
+ $path =~ s{^/}{};
+
+ # reconstitute canonical module name
+ $modname = "$path/$modname" if length $path;
+
+ # remember it
+ $archpms{$modname} = 1;
+ }
+ }, $ext_dir);
+}
# print "[$_]\n" for sort keys %archpms;
}
}
-if ($nwinstall) {
+if ($opts{netware}) {
# This is required only if we are installing on a NetWare server
$installscript = $Config{installnwscripts};
$installprivlib = $Config{installnwlib};
$installsitelib = $Config{installnwlib};
}
-my $d_dosuid = $Config{d_dosuid};
my $binexp = $Config{binexp};
if ($Is_VMS) { # Hang in there until File::Spec hits the big time
# Do some quick sanity checks.
-if (!$opts{notify} && $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, $opts{verbose}, 0777);
+-d $installbin || mkpath($installbin);
-d $installbin || $opts{notify} || die "$installbin is not a directory\n";
-w $installbin || $opts{notify} || die "$installbin is not writable by you\n"
unless $installbin =~ m#^/afs/# || $opts{notify};
-x $dbg . 'perl' . $exe_ext || die "${dbg}perl$exe_ext isn't executable!\n";
}
}
--x 'suidperl' . $exe_ext|| die "suidperl isn't executable!\n" if $d_dosuid;
-f 't/rantests' || $Is_W32
|| warn "WARNING: You've never run 'make test' or",
if ($Is_Cygwin) {
$perldll = $libperl;
} else {
- $perldll = 'perl5'.$Config{patchlevel}.'.'.$dlext;
+ $perldll = 'perl5'.$Config{patchlevel}.'.'.$so;
}
if ($dlsrc ne "dl_none.xs") {
safe_unlink("$installbin/$perldll");
copy("$perldll", "$installbin/$perldll");
chmod(0755, "$installbin/$perldll");
- $packlist->{"$installbin/$perldll"} = { type => 'file' };
+ $packlist->{"$Config{installbin}/$perldll"} = { type => 'file' };
} # if (($Is_W32 and ! $Is_NetWare) or $Is_Cygwin)
# First we install the version-numbered executables.
safe_unlink("$installbin/$ndbg$perl$exe_ext");
copy("$ndbg$perl$exe_ext", "$installbin/$ndbg$perl$exe_ext");
chmod(0755, "$installbin/$ndbg$perl$exe_ext");
- safe_unlink("$installbin/${dbg}a2p$exe_ext");
- copy("x2p/${dbg}a2p$exe_ext", "$installbin/${dbg}a2p$exe_ext");
- chmod(0755, "$installbin/${dbg}a2p$exe_ext");
}
}
-elsif ($^O eq 'mpeix') {
- # MPE lacks hard links and requires that executables with special
- # capabilities reside in the MPE namespace.
- safe_unlink("$installbin/perl$ver$exe_ext", $Config{perlpath});
- # Install the primary executable into the MPE namespace as perlpath.
- copy("perl$exe_ext", $Config{perlpath});
- chmod(0755, $Config{perlpath});
- # Create a backup copy with the version number.
- link($Config{perlpath}, "$installbin/perl$ver$exe_ext");
-}
elsif ($^O ne 'dos') {
if (!$Is_NetWare) {
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");
+ fix_dep_names("$installbin/$perl_verbase$ver$exe_ext");
chmod(0755, "$installbin/$perl_verbase$ver$exe_ext");
}
else {
# If installing onto a NetWare server
- if ($nwinstall) {
- # Copy perl.nlm, echo.nlm, type.nlm, a2p.nlm & cgi2perl.nlm
- mkpath($Config{installnwsystem}, 1, 0777);
+ if ($opts{netware}) {
+ # Copy perl.nlm, echo.nlm, type.nlm & cgi2perl.nlm
+ mkpath($Config{installnwsystem});
copy("netware\\".$ENV{'MAKE_TYPE'}."\\perl.nlm", $Config{installnwsystem});
copy("netware\\testnlm\\echo\\echo.nlm", $Config{installnwsystem});
copy("netware\\testnlm\\type\\type.nlm", $Config{installnwsystem});
- copy("x2p\\a2p.nlm", $Config{installnwsystem});
chmod(0755, "$Config{installnwsystem}\\perl.nlm");
- mkpath($Config{installnwlcgi}, 1, 0777);
+ mkpath($Config{installnwlcgi});
copy("lib\\auto\\cgi2perl\\cgi2perl.nlm", $Config{installnwlcgi});
}
} #if (!$Is_NetWare)
copy("perl.exe", "$installbin/$perl.exe");
}
-safe_unlink("$installbin/s$perl_verbase$ver$exe_ext");
-if ($d_dosuid) {
- copy("suidperl$exe_ext", "$installbin/s$perl_verbase$ver$exe_ext");
- chmod(04711, "$installbin/s$perl_verbase$ver$exe_ext");
-}
-
# Install library files.
-my ($do_installarchlib, $do_installprivlib) = (0, 0);
+my $do_installarchlib = !samepath($installarchlib, 'lib');
+my $do_installprivlib = !samepath($installprivlib, 'lib');
my $vershort = ($Is_Cygwin and !$Config{usedevel}) ? substr($ver,0,-2) : $ver;
+$do_installprivlib = 0 if $versiononly && !($installprivlib =~ m/\Q$vershort/);
-mkpath($installprivlib, $opts{verbose}, 0777);
-mkpath($installarchlib, $opts{verbose}, 0777);
+mkpath($installprivlib);
+mkpath($installarchlib);
mkpath($installsitelib, $opts{verbose}, 0777) if ($installsitelib);
mkpath($installsitearch, $opts{verbose}, 0777) if ($installsitearch);
-if (chdir "lib") {
- $do_installarchlib = ! samepath($installarchlib, '.');
- $do_installprivlib = ! samepath($installprivlib, '.');
- $do_installprivlib = 0 if $versiononly && !($installprivlib =~ m/\Q$vershort/);
-
- if ($do_installarchlib || $do_installprivlib) {
- find(\&installlib, '.');
- }
- chdir ".." || die "Can't cd back to source directory: $!\n";
+if (-d 'lib') {
+ find({no_chdir => 1, wanted => \&installlib}, 'lib')
+ if $do_installarchlib || $do_installprivlib;
}
else {
- warn "Can't cd to lib to install lib files: $!\n";
+ warn "Can't install lib files - 'lib/' does not exist";
}
# Install header files and libraries.
-mkpath("$installarchlib/CORE", $opts{verbose}, 0777);
+mkpath("$installarchlib/CORE");
my @corefiles;
if ($Is_VMS) { # We did core file selection during build
my $coredir = "lib/$Config{archname}/$ver/CORE";
map { s|^$coredir/||i; } @corefiles = <$coredir/*.*>;
}
elsif ($Is_Cygwin) { # On Cygwin symlink it to CORE to make Makefile happy
+ @corefiles = <*.h libperl*.* perl*$Config{lib_ext}>;
my $coredll = "$installarchlib/CORE/$libperl";
+ my $instcoredll = "$Config{installarchlib}/CORE/$libperl";
+ safe_unlink($coredll);
( $Config{'d_link'} eq 'define' &&
- eval { CORE::link "$installbin/$libperl", $coredll } ) ||
- eval { symlink "$installbin/$libperl", $coredll } ||
- copy("$installbin/$libperl", $coredll);
- @corefiles = <*.h libperl*.* perl*$Config{lib_ext}>;
+ eval {
+ CORE::link("$installbin/$libperl", $coredll);
+ $packlist->{$instcoredll} = { from => "$Config{installbin}/$libperl",
+ type => 'link' };
+ }
+ ) ||
+ eval {
+ symlink("$installbin/$libperl", $coredll);
+ $packlist->{$instcoredll} = { from => "$Config{installbin}/$libperl",
+ type => 'link' };
+ } ||
+ ( copy("$installbin/$libperl", $coredll) &&
+ push(@corefiles, $instcoredll)
+ )
+} elsif ($Is_W32) {
+ @corefiles = <*.h>;
} else {
# [als] hard-coded 'libperl' name... not good!
@corefiles = <*.h libperl*.* perl*$Config{lib_ext}>;
# AIX needs perl.exp installed as well.
push(@corefiles,'perl.exp') if $^O eq 'aix';
- if ($^O eq 'mpeix') {
- # MPE needs mpeixish.h installed as well.
- mkpath("$installarchlib/CORE/mpeix", $opts{verbose}, 0777);
- push(@corefiles,'mpeix/mpeixish.h');
- }
- # If they have built sperl.o...
- push(@corefiles,'sperl.o') if -f 'sperl.o';
}
+
+
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 =~ /\.(\Q$so\E|\Q$dlext\E)$/) {
- strip("-S", "$installarchlib/CORE/$file") if $^O =~ /^(rhapsody|darwin)$/;
- chmod(0555, "$installarchlib/CORE/$file");
+ strip("-S", "$installarchlib/CORE/$file") if $^O eq 'darwin';
+ fix_dep_names("$installarchlib/CORE/$file");
+ chmod($SO_MODE, "$installarchlib/CORE/$file");
} else {
- chmod(0444, "$installarchlib/CORE/$file");
+ chmod($NON_SO_MODE, "$installarchlib/CORE/$file");
}
}
}
+if ($Is_W32) { #linking lib isn't made in root but in CORE on Win32
+ @corefiles = <lib/CORE/libperl*.* lib/CORE/perl*$Config{lib_ext}>;
+ my $dest;
+ copy_if_diff($_,($dest = $installarchlib.substr($_,3))) &&
+ chmod($NON_SO_MODE, $dest) foreach @corefiles;
+}
+
# Install main perl executables
# Make links to ordinary names if installbin directory isn't current directory.
if (! $versiononly && ! samepath($installbin, '.') && ($^O ne 'dos') && ! $Is_VMS && ! $Is_NetWare) {
safe_unlink("$installbin/$perl$exe_ext", "$installbin/suid$perl$exe_ext");
- 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/perl$exe_ext");
- } elsif ($^O eq 'vos') {
+ if ($^O eq 'vos') {
# VOS doesn't support hard links, so use a symlink.
symlink("$installbin/$perl_verbase$ver$exe_ext",
"$installbin/$perl$exe_ext");
link("$installbin/$perl_verbase$ver$exe_ext",
"$installbin/$perl$exe_ext");
}
- link("$installbin/$perl_verbase$ver$exe_ext",
- "$installbin/suid$perl$exe_ext")
- 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) {
+if ($opts{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");
- } elsif ($^O eq 'vos') {
+ if ($^O eq 'vos') {
# VOS doesn't support hard links, so use a symlink.
symlink("$installbin/$perl_verbase$ver$exe_ext",
"$installbin/$archperl");
}
}
-# Make links to ordinary names if installbin directory isn't current directory.
-if (!$Is_NetWare && $dbg eq '') {
- if (! samepath($installbin, 'x2p')) {
- my $base = 'a2p';
- $base .= $ver if $versiononly;
- safe_unlink("$installbin/$base$exe_ext");
- copy("x2p/a2p$exe_ext", "$installbin/$base$exe_ext");
- strip("$installbin/$base$exe_ext");
- chmod(0755, "$installbin/$base$exe_ext");
- }
-}
-
# cppstdin is just a script, but it is architecture-dependent, so
# it can't safely be shared. Place it in $installbin.
# Note that Configure doesn't build cppstin if it isn't needed, so
}
# Install scripts.
-mkpath($installscript, $opts{verbose}, 0777);
+mkpath($installscript);
if ($versiononly) {
for (@scripts) {
(my $base = $_) =~ s#.*/##;
(my $base = $_) =~ s#.*/##;
copy($_, "$installscript/$base");
chmod(0755, "$installscript/$base");
+ if ($Is_AmigaOS) {
+ my $amigapath = unixtoamiga("$installscript/$base");
+ amigaprotect($amigapath,"+s");
+ }
}
for (@tolink) {
# Install pod pages. Where? I guess in $installprivlib/pod
# ($installprivlib/pods for cygwin).
+if (!$opts{nopods} && (!$versiononly || ($installprivlib =~ m/\Q$vershort/))) {
+ my $pod = ($Is_Cygwin || $Is_Darwin || $Is_VMS || $Is_W32) ? 'pods' : 'pod';
+ mkpath("${installprivlib}/$pod");
-my $pod = ($Is_Cygwin || $Is_Darwin || $Is_VMS || $Is_W32) ? 'pods' : 'pod';
-if ( !$versiononly || ($installprivlib =~ m/\Q$vershort/)) {
- mkpath("${installprivlib}/$pod", $opts{verbose}, 0777);
-
- # If Perl 5.003's perldiag.pod is there, rename it.
- 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 " rename $from $to";
- rename($from, $to)
- or warn "Couldn't rename $from to $to: $!\n"
- unless $opts{notify};
- }
- }
-
- for (@pods) {
+ for (map {$_->[1]} @{get_pod_metadata()->{master}}) {
# $_ is a name like pod/perl.pod
(my $base = $_) =~ s#.*/##;
copy_if_diff($_, "${installprivlib}/$pod/${base}");
+ chmod(0644, "${installprivlib}/$pod/${base}");
}
}
-# Check to make sure there aren't other perls around in installer's
-# path. This is probably UNIX-specific. Check all absolute directories
-# in the path except for where public executables are supposed to live.
-# Also skip $mainperl if the user opted to have it be a link to the
-# installed perl.
-
-if (!$versiononly && $otherperls) {
- my ($path, @path);
- my $dirsep = ($Is_OS2 || $Is_W32 || $Is_NetWare) ? ';' : ':' ;
- ($path = $ENV{"PATH"}) =~ s:\\:/:g ;
- @path = split(/$dirsep/, $path);
- if ($Is_VMS) {
- my $i = 0;
- while (exists $ENV{'DCL$PATH' . $i}) {
- my $dir = unixpath($ENV{'DCL$PATH' . $i}); $dir =~ s-/$--;
- push(@path,$dir);
- }
- }
- 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 samepath($_, cwd());
- next if ($mainperl_is_instperl && samepath($_, $mainperldir));
- my $otherperl = "$_/$perl$exe_ext";
- next if $otherperls{$otherperl}++;
- push(@otherperls, $otherperl)
- if (-x $otherperl && ! -d $otherperl);
- }
- if (@otherperls) {
- warn "\nWarning: $perl appears in your path in the following " .
- "locations beyond where\nwe just installed it:\n";
- for (@otherperls) {
- warn " ", $_, "\n";
- }
- warn "\n";
- }
-
-}
$packlist->write() unless $opts{notify};
print " Installation complete\n" if $opts{verbose};
}
}
-sub safe_rename {
- my($from,$to) = @_;
- if (-f $to and not unlink($to)) {
- my($i);
- for ($i = 1; $i < 50; $i++) {
- last if rename($to, "$to.$i");
- }
- warn("Cannot rename to `$to.$i': $!"), return 0
- if $i >= 50; # Give up!
- }
- link($from,$to) || return 0;
- unlink($from);
-}
-
sub copy {
my($from,$to) = @_;
my $xto = $to;
- $xto =~ s/^\Q$opts{destdir}\E// if $opts{destdir};
+ $xto =~ s/^\Q$opts{destdir}\E//;
print $opts{verbose} ? " cp $from $xto\n" : " $xto\n"
unless $opts{silent};
print " creating new version of $xto\n"
sub installlib {
my $dir = $File::Find::dir;
- $dir =~ s#^\.(?![^/])/?##;
- local($depth) = $dir ? "lib/$dir" : "lib";
+ $dir =~ s!\Alib/?!!;
+
+ m!([^/]+)\z!;
+ my $name = $1;
- my $name = $_;
+ # This remains ugly, and in need of refactoring.
+
+ # $name always starts as the leafname
+ # $dir is the directory *within* lib
+ # $name later has $dir pre-pended, to give the relative path in lib/
+ # which is used to create the path in the target directory.
+
+ # $_ was always the filename to use on disk. Adding no_chdir doesn't change
+ # this, as $_ becomes a pathname, and so still works. However, it's not
+ # obvious that $_ is needed later, and hence $_ must not be modified.
+
+ # Also, many of the regex exclusion tests below are now superfluous, as the
+ # files in question are either no longer in blead, or now in ext/, dist/ or
+ # cpan/ and not copied into lib/
# Ignore version control directories.
if ($name =~ /^(?:CVS|RCS|SCCS|\.svn)\z/ and -d $name) {
# ignore patch backups, RCS files, emacs backup & temp files and the
# .exists files, .PL files, and test files.
- return if $name =~ m{\.orig$|\.rej$|~$|^#.+#$|,v$|^\.exists|\.PL$|\.plc$|\.t$|^test\.pl$|^dbm_filter_util.pl$} ||
+ return if $name =~ m{\.orig$|\.rej$|~$|^#.+#$|,v$|^\.exists|\.PL$|\.plc$|\.t$|^test\.pl$|^dbm_filter_util\.pl$|^filter-util\.pl$|^uupacktool\.pl$|^\.gitignore$} ||
$dir =~ m{/t(?:/|$)};
# ignore the cpan script in lib/CPAN/bin, the instmodsh and xsubpp
# scripts in lib/ExtUtils, the prove script in lib/Test/Harness,
# the corelist script from lib/Module/CoreList/bin and ptar* in
- # lib/Archive/Tar/bin, the config_data script in lib/Module/Build/scripts
+ # lib/Archive/Tar/bin and zipdetails in cpan/IO-Compress/bin
# (they're installed later with other utils)
- return if $name =~ /^(?:cpan|instmodsh|prove|corelist|ptar|cpan2dist|cpanp|cpanp-run-perl|ptardiff|config_data)\z/;
+ return if $name =~ /^(?:cpan|instmodsh|prove|corelist|ptar|ptardiff|ptargrep|zipdetails)\z/;
# ignore the Makefiles
return if $name =~ /^makefile$/i;
- # ignore the test extensions
- return if $dir =~ m{\bXS/(?:APItest|Typemap)\b};
+ # ignore the test extensions, dont install PPPort.so/.dll
+ return if $dir =~ m{\b(?:XS/(?:APItest|Typemap)|Devel/PPPort)\b};
return if $name =~ m{\b(?:APItest|Typemap)\.pm$};
+ # ignore the build support code
+ return if $name =~ /\bbuildcustomize\.pl$/;
# ignore the demo files
return if $dir =~ /\b(?:demos?|eg)\b/;
+ # ignore unneeded unicore files
+ if ( $dir =~ /^unicore/ ) {
+ if ( $name =~ /\.txt\z/ ) {
+ # We can ignore most, but not all .txt files
+ return unless $name =~ /\A(?:Blocks|SpecialCasing|NamedSequences)\.txt\z/;
+ }
+ else {
+ # TestProp only needed during testing
+ return if $name =~ /\ATestProp.pl\z/;
+ # we need version and *.pl files and can skip the rest
+ return unless $name =~ /\A(?:version|\w+\.p[lm])\z/;
+ }
+ }
# ignore READMEs, MANIFESTs, INSTALL docs, META.ymls and change logs.
# Changes.e2x and README.e2x are needed by enc2xs.
$name = "$dir/$name" if $dir ne '';
+ # ignore pods that are stand alone documentation from dual life modules.
+ return if /\.pod\z/ && is_duplicate_pod($_);
+
+ return if $name eq 'ExtUtils/XSSymSet.pm' and !$Is_VMS;
+
+ #blead comes with version, blead isn't 5.8/5.6
+ return if $name eq 'ExtUtils/MakeMaker/version/regex.pm';
+
my $installlib = $installprivlib;
- if ($dir =~ /^auto/ ||
+ if ($dir =~ /^auto\// ||
($name =~ /^(.*)\.(?:pm|pod)$/ && $archpms{$1}) ||
($name =~ /^(.*)\.(?:h|lib)$/i && ($Is_W32 || $Is_NetWare)) ||
- $name eq 'Config_heavy.pl'
+ $name=~/^Config_(heavy|git)\.pl\z/
) {
$installlib = $installarchlib;
return unless $do_installarchlib;
return unless $do_installprivlib;
}
+ if ($Is_NetWare && !$opts{netware} && /\.(?:nlp|nlm|bs)$/) {
+ # Don't copy .nlp,.nlm files, doesn't make sense on Windows and also
+ # if copied will give problems when building new extensions.
+ # Has to be copied if we are installing on a NetWare server and
+ # hence the check !$opts{netware}
+ return;
+ }
+
if (-f $_) {
- if (/\.(?:al|ix)$/ && !($dir =~ m[^auto/(.*)$])) {
- $installlib = $installprivlib;
- #We're installing *.al and *.ix files into $installprivlib,
- #but we have to delete old *.al and *.ix files from the 5.000
- #distribution:
- #This might not work because $archname might have changed.
- unlink("$installarchlib/$name");
- }
my $xname = "$installlib/$name";
- $xname =~ s/^\Q$opts{destdir}\E// if $opts{destdir};
+ $xname =~ s/^\Q$opts{destdir}\E//;
$packlist->{$xname} = { type => 'file' };
- if ($force || compare($_, "$installlib/$name") || $opts{notify}) {
+ if ($opts{force} || compare($_, "$installlib/$name") || $opts{notify}) {
unlink("$installlib/$name");
- mkpath("$installlib/$dir", $opts{verbose}, 0777);
+ mkpath("$installlib/$dir");
# HP-UX (at least) needs to maintain execute permissions
# on dynamically-loaded libraries.
- if ($Is_NetWare && !$nwinstall) {
- # Don't copy .nlp,.nlm files, doesn't make sense on Windows and also
- # if copied will give problems when building new extensions.
- # Has to be copied if we are installing on a NetWare server and hence
- # the check !$nwinstall
- if (!(/\.(?:nlp|nlm|bs)$/)) {
- copy_if_diff($_, "$installlib/$name")
- and chmod($name =~ /\.(so|$dlext)$/o ? 0555 : 0444,
- "$installlib/$name");
- }
- } else {
- if (copy_if_diff($_, "$installlib/$name")) {
- if ($name =~ /\.(so|$dlext)$/o) {
- strip("-S", "$installlib/$name") if $^O =~ /^(rhapsody|darwin)$/;
- chmod(0555, "$installlib/$name");
- } else {
- strip("-S", "$installlib/$name")
- if ($name =~ /\.a$/o and $^O =~ /^(rhapsody|darwin)$/);
- chmod(0444, "$installlib/$name");
- }
- }
- } #if ($Is_NetWare)
+ if (copy_if_diff($_, "$installlib/$name")) {
+ strip("-S", "$installlib/$name")
+ if $^O eq 'darwin' and /\.(?:so|$dlext|a)$/;
+ chmod(/\.(so|$dlext)$/ ? $SO_MODE : $NON_SO_MODE,
+ "$installlib/$name");
+ }
}
}
}
my($from,$to)=@_;
return 1 if (($^O eq 'VMS') && (-d $from));
my $xto = $to;
- $xto =~ s/^\Q$opts{destdir}\E// if $opts{destdir};
+ $xto =~ s/^\Q$opts{destdir}\E//;
my $perlpodbadsymlink;
if ($from =~ m!^pod/perl[\w-]+\.pod$! &&
-l $from &&
}
-f $from || $perlpodbadsymlink || warn "$0: $from not found";
$packlist->{$xto} = { type => 'file' };
- if ($force || compare($from, $to) || $opts{notify}) {
+ if ($opts{force} || compare($from, $to) || $opts{notify}) {
safe_unlink($to); # In case we don't have write permissions.
- if ($opts{notify}) {
- $from = $depth . "/" . $from if $depth;
- }
if ($perlpodbadsymlink && $from =~ m!^pod/perl(.+)\.pod$!) {
$from = "README.$1";
}
{
my(@args) = @_;
- return unless $dostrip;
+ return unless $opts{strip};
my @opts;
while (@args && $args[0] =~ /^(-\w+)$/) {
}
}
}
+
+sub fix_dep_names {
+ my $file = shift;
+
+ $^O eq "darwin" && $Config{osvers} =~ /^(1[5-9]|[2-9])/
+ && $Config{useshrplib}
+ or return;
+
+ my @opts;
+ my $so = $Config{so};
+ my $libperl = "$Config{archlibexp}/CORE/libperl.$Config{so}";
+ if ($file =~ /\blibperl.\Q$Config{so}\E$/a) {
+ push @opts, -id => $libperl;
+ }
+ else {
+ push @opts, -change => getcwd . "/libperl.$so", $libperl;
+ }
+ push @opts, $file;
+
+ $opts{verbose} and print " install_name_tool @opts\n";
+ system "install_name_tool", @opts
+ and die "Cannot update $file dependency paths\n";
+}
+
+# ex: set ts=8 sts=4 sw=4 et:
https://perl5.git.perl.org / perl5.git / blobdiff