X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/5629c67553f30a19f4842982925a3d994d46684c..7081fd3ae75a515a118f954c6d19efed750836aa:/installperl diff --git a/installperl b/installperl index b7df66f..74856aa 100755 --- a/installperl +++ b/installperl @@ -1,22 +1,25 @@ -#!./perl +#!./perl -w BEGIN { require 5.004; - chdir '..' if !-d 'lib' and -d '..\lib'; + chdir '..' if !-d 'lib' and -d '../lib'; @INC = 'lib'; $ENV{PERL5LIB} = 'lib'; + + # This needs to be at BEGIN time, before any use of Config + require './install_lib.pl'; } use strict; -my ($Is_VMS, $Is_W32, $Is_OS2, $Is_Cygwin, $nonono, $dostrip, - $versiononly, $silent, $verbose, $otherperls, $archname,$Is_NetWare, $nwinstall); +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/; BEGIN { - $Is_VMS = $^O eq 'VMS'; - $Is_W32 = $^O eq 'MSWin32'; - $Is_OS2 = $^O eq 'os2'; - $Is_Cygwin = $^O eq 'cygwin'; if ($Is_VMS) { eval 'use VMS::Filespec;' } } @@ -27,28 +30,22 @@ use File::Compare; use File::Copy (); use File::Path (); use ExtUtils::Packlist; -use Config; -use subs qw(unlink link chmod); - -if ($Config{d_umask}) { - umask(022); # umasks like 077 aren't that useful for installations -} +use Cwd; -$Is_NetWare = $Config{osname} eq 'NetWare'; if ($Is_NetWare) { - $Is_W32 = 0; - $scr_ext = '.pl'; + $Is_W32 = 0; + $scr_ext = '.pl'; } # override the ones in the rest of the script sub mkpath { - File::Path::mkpath(@_) unless $nonono; + File::Path::mkpath(@_) unless $opts{notify}; } my $mainperldir = "/usr/bin"; my $exe_ext = $Config{exe_ext}; -# Allow ``make install PERLNAME=something_besides_perl'': +# Allow "make install PERLNAME=something_besides_perl": my $perl = defined($ENV{PERLNAME}) ? $ENV{PERLNAME} : 'perl'; # This is the base used for versioned names, like "perl5.6.0". @@ -58,18 +55,59 @@ my $perl = defined($ENV{PERLNAME}) ? $ENV{PERLNAME} : 'perl'; my $perl_verbase = defined($ENV{PERLNAME_VERBASE}) ? $ENV{PERLNAME_VERBASE} : $perl; +my $dbg = ''; +my $ndbg = ''; +if ( $Is_VMS ) { + if ( defined $Config{usevmsdebug} ) { + if ( $Config{usevmsdebug} eq 'define' ) { + $dbg = 'dbg'; + $ndbg = 'ndbg'; + } + } +} $otherperls = 1; +# 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} = ''; +# Consider refactoring this to use Getopt::Long once Getopt::Long's planned +# feature is implemented, to distinguish + and - options. while (@ARGV) { - $nonono = 1 if $ARGV[0] eq '-n'; + $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'; - $silent = 1 if $ARGV[0] eq '-S'; + $opts{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'; + $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'; + $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"; +Usage $0: [switches] + -n Don't actually run any commands; just print them. + -s Run strip on installed binaries. + -v Only install perl as a binary with the version number in the name. + (Override whatever config.sh says) + +v Install perl as "perl" and as a binary with the version number in + the name. (Override whatever config.sh says) + -S Silent mode. + -f Force installation (don't check if same version is there) + -o Skip checking for other copies of perl in your PATH. + -V Verbose mode. + -A Also install perl with the architecture's name in the perl binary's + name. + -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. +EOT + exit; + } shift; } @@ -78,30 +116,32 @@ my (@scripts, @tolink); open SCRIPTS, "utils.lst" or die "Can't open utils.lst: $!"; while () { next if /^#/; - next if /#\s*pod\s*=/; # Binary programs need separate treatment + 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; - push @tolink, [$1, $2]; + push @scripts, $1; + push @tolink, [$1, $2]; } else { - push @scripts, $_; + push @scripts, $_; } } close SCRIPTS; if ($scr_ext) { @scripts = map { "$_$scr_ext" } @scripts; } -my @pods = (); +my @pods = $nopods ? () : (, 'x2p/a2p.pod'); # Specify here any .pm files that are actually architecture-dependent. # (Those included with XS extensions under ext/ are automatically # added later.) # Now that the default privlib has the full perl version number included, -# we no longer have to play the trick of sticking version-specific .pm +# we no longer have to play the trick of sticking version-specific .pm # files under the archlib directory. my %archpms = ( - Config => 1, - lib => 1, + Config => 1, + lib => 1, + Cwd => 1, ); if ($^O eq 'dos') { @@ -109,20 +149,28 @@ if ($^O eq 'dos') { $archpms{config} = $archpms{filehand} = 1; } -if ((-e "testcompile") && (defined($ENV{'COMPILE'}))) -{ - push(@scripts, map("$_.exe", @scripts)); +if ((-e "testcompile") && (defined($ENV{'COMPILE'}))) { + push(@scripts, map("$_.exe", @scripts)); } -find(sub { - if ("$File::Find::dir/$_" =~ m{^ext\b(.*)/([^/]+)\.pm$}) { +# Exclude nonxs extensions that are not architecture dependent +my @nonxs = grep(!/^Errno$/, split(' ', $Config{'nonxs_ext'})); + +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 trailing component first - $path =~ s{/[^/]*$}{}; + # Change hyphenated name like Filter-Util-Call to nested + # directory name Filter/Util/Call + $path =~ s{-}{/}g; - # strip optional "/lib"; - $path =~ s{/lib\b}{}; + # strip to optional "/lib", or remove trailing component + $path =~ s{.*/lib\b}{} or $path =~ s{/[^/]*$}{}; # strip any leading / $path =~ s{^/}{}; @@ -133,7 +181,8 @@ find(sub { # remember it $archpms{$modname} = 1; } - }, 'ext'); + }, $ext_dir); +} # print "[$_]\n" for sort keys %archpms; @@ -145,13 +194,13 @@ die "Patchlevel of perl ($patchlevel)", if $patchlevel != $Config{'PERL_VERSION'}; # Fetch some frequently-used items from %Config -my $installbin = $Config{installbin}; -my $installscript = $Config{installscript}; -my $installprivlib = $Config{installprivlib}; -my $installarchlib = $Config{installarchlib}; -my $installsitelib = $Config{installsitelib}; -my $installsitearch = $Config{installsitearch}; -my $installman1dir = $Config{installman1dir}; +my $installbin = "$opts{destdir}$Config{installbin}"; +my $installscript = "$opts{destdir}$Config{installscript}"; +my $installprivlib = "$opts{destdir}$Config{installprivlib}"; +my $installarchlib = "$opts{destdir}$Config{installarchlib}"; +my $installsitelib = "$opts{destdir}$Config{installsitelib}"; +my $installsitearch = "$opts{destdir}$Config{installsitearch}"; +my $installman1dir = "$opts{destdir}$Config{installman1dir}"; my $man1ext = $Config{man1ext}; my $libperl = $Config{libperl}; # Shared library and dynamic loading suffixes. @@ -164,89 +213,95 @@ if ($^O eq 'os390') { 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`; + `./$^X -pibak -e 's{$pwd\/libperl.x}{$archlibexp/CORE/libperl.x}' lib/Config.pm`; } } if ($nwinstall) { - # This is required only if we are installing on a NetWare server - $installscript = $Config{installnwscripts}; - $installprivlib = $Config{installnwlib}; - $installarchlib = $Config{installnwlib}; - $installsitelib = $Config{installnwlib}; + # This is required only if we are installing on a NetWare server + $installscript = $Config{installnwscripts}; + $installprivlib = $Config{installnwlib}; + $installarchlib = $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 foreach ( \$installbin, \$installscript, \$installprivlib, - \$installarchlib, \$installsitelib, \$installsitearch, - \$installman1dir ) { - $$_ = unixify($$_); $$_ =~ s:/$::; + \$installarchlib, \$installsitelib, \$installsitearch, + \$installman1dir ) { + $$_ = unixify($$_); $$_ =~ s:/$::; } } # Do some quick sanity checks. -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, $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; +-d $installbin || mkpath($installbin, $opts{verbose}, 0777); +-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}; if (!$Is_NetWare) { +if (!$Is_VMS) { -x 'perl' . $exe_ext || die "perl isn't executable!\n"; --x 'suidperl' . $exe_ext|| die "suidperl isn't executable!\n" if $d_dosuid; +} +else { +-x $ndbg . 'perl' . $exe_ext || die "${ndbg}perl$exe_ext isn't executable!\n"; + if ($dbg) { + -x $dbg . 'perl' . $exe_ext || die "${dbg}perl$exe_ext isn't executable!\n"; + } +} -f 't/rantests' || $Is_W32 - || warn "WARNING: You've never run 'make test' or", - " some tests failed! (Installing anyway.)\n"; + || warn "WARNING: You've never run 'make test' or", + " some tests failed! (Installing anyway.)\n"; } #if (!$Is_NetWare) -if (($Is_W32 and ! $Is_NetWare) 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/$_"); - }; - }; - } else { - $perldll = 'perl57.' . $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 and ! $Is_NetWare) or $Is_Cygwin) - # This will be used to store the packlist -my $packlist = ExtUtils::Packlist->new("$installarchlib/.packlist"); +$packlist = ExtUtils::Packlist->new("$installarchlib/.packlist"); + +if (($Is_W32 and ! $Is_NetWare) or $Is_Cygwin) { + my $perldll; + + if ($Is_Cygwin) { + $perldll = $libperl; + } else { + $perldll = 'perl5'.$Config{patchlevel}.'.'.$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"); + $packlist->{"$installbin/$perldll"} = { type => 'file' }; +} # if (($Is_W32 and ! $Is_NetWare) or $Is_Cygwin) # First we install the version-numbered executables. if ($Is_VMS) { - safe_unlink("$installbin/$perl$exe_ext"); - copy("perl$exe_ext", "$installbin/$perl$exe_ext"); - chmod(0755, "$installbin/$perl$exe_ext"); - safe_unlink("$installbin/${perl}shr$exe_ext"); - copy("perlshr$exe_ext", "$installbin/${perl}shr$exe_ext"); - chmod(0755, "$installbin/${perl}shr$exe_ext"); + safe_unlink("$installbin/perl_setup.com"); + copy("perl_setup.com", "$installbin/perl_setup.com"); + chmod(0755, "$installbin/perl_setup.com"); + safe_unlink("$installbin/$dbg$perl$exe_ext"); + copy("$dbg$perl$exe_ext", "$installbin/$dbg$perl$exe_ext"); + chmod(0755, "$installbin/$dbg$perl$exe_ext"); + safe_unlink("$installbin/$dbg${perl}shr$exe_ext"); + copy("$dbg${perl}shr$exe_ext", "$installbin/$dbg${perl}shr$exe_ext"); + chmod(0755, "$installbin/$dbg${perl}shr$exe_ext"); + if ($ndbg) { + 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 @@ -259,51 +314,46 @@ elsif ($^O eq 'mpeix') { 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"); - chmod(0755, "$installbin/$perl_verbase$ver$exe_ext"); + 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"); + 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); + 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); + copy("lib\\auto\\cgi2perl\\cgi2perl.nlm", $Config{installnwlcgi}); } - 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); - 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); - copy("lib\\auto\\cgi2perl\\cgi2perl.nlm", $Config{installnwlcgi}); - } - } #if (!$Is_NetWare) + } #if (!$Is_NetWare) } else { safe_unlink("$installbin/$perl.exe"); 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); - -mkpath($installprivlib, $verbose, 0777); -mkpath($installarchlib, $verbose, 0777); -mkpath($installsitelib, $verbose, 0777) if ($installsitelib); -mkpath($installsitearch, $verbose, 0777) if ($installsitearch); +my $vershort = ($Is_Cygwin and !$Config{usedevel}) ? substr($ver,0,-2) : $ver; + +mkpath($installprivlib, $opts{verbose}, 0777); +mkpath($installarchlib, $opts{verbose}, 0777); +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$ver/); + $do_installprivlib = 0 if $versiononly && !($installprivlib =~ m/\Q$vershort/); if ($do_installarchlib || $do_installprivlib) { find(\&installlib, '.'); @@ -315,23 +365,42 @@ else { } # Install header files and libraries. -mkpath("$installarchlib/CORE", $verbose, 0777); +mkpath("$installarchlib/CORE", $opts{verbose}, 0777); my @corefiles; if ($Is_VMS) { # We did core file selection during build my $coredir = "lib/$Config{archname}/$ver/CORE"; $coredir =~ tr/./_/; map { s|^$coredir/||i; } @corefiles = <$coredir/*.*>; } -else { +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"; + safe_unlink($coredll); + ( $Config{'d_link'} eq 'define' && + eval { + CORE::link("$installbin/$libperl", $coredll); + $packlist->{$coredll} = { from => "$installbin/$libperl", + type => 'link' }; + } + ) || + eval { + symlink("$installbin/$libperl", $coredll); + $packlist->{$coredll} = { from => "$installbin/$libperl", + type => 'link' }; + } || + ( copy("$installbin/$libperl", $coredll) && + push(@corefiles, $coredll) + ) +} else { # [als] hard-coded 'libperl' name... not good! - @corefiles = <*.h libperl*.*>; + @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", $verbose, 0777); - push(@corefiles,'mpeix/mpeixish.h'); + # 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'; @@ -341,8 +410,8 @@ foreach my $file (@corefiles) { # 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)$/) { - chmod(0555, "$installarchlib/CORE/$file"); strip("-S", "$installarchlib/CORE/$file") if $^O =~ /^(rhapsody|darwin)$/; + chmod(0555, "$installarchlib/CORE/$file"); } else { chmod(0444, "$installarchlib/CORE/$file"); } @@ -357,14 +426,15 @@ if (! $versiononly && ! samepath($installbin, '.') && ($^O ne 'dos') && ! $Is_VM 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"); + symlink($Config{perlpath}, "$installbin/perl$exe_ext"); + } elsif ($^O eq 'vos') { + # VOS doesn't support hard links, so use a symlink. + symlink("$installbin/$perl_verbase$ver$exe_ext", + "$installbin/$perl$exe_ext"); } else { link("$installbin/$perl_verbase$ver$exe_ext", "$installbin/$perl$exe_ext"); } - link("$installbin/s$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 @@ -375,10 +445,13 @@ if ($archname && ! samepath($installbin, '.') && ($^O ne 'dos') && ! $Is_VMS) { 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", + symlink($Config{perlpath}, "$installbin/$archperl"); + } elsif ($^O eq 'vos') { + # VOS doesn't support hard links, so use a symlink. + symlink("$installbin/$perl_verbase$ver$exe_ext", "$installbin/$archperl"); + } else { + link("$installbin/$perl_verbase$ver$exe_ext", "$installbin/$archperl"); } } @@ -387,7 +460,7 @@ if ($archname && ! samepath($installbin, '.') && ($^O ne 'dos') && ! $Is_VMS) { my $mainperl_is_instperl = 0; if ($Config{installusrbinperl} && $Config{installusrbinperl} eq 'define' && - !$versiononly && !$nonono && !$Is_W32 && !$Is_NetWare && !$Is_VMS && -t STDIN && -t STDERR + !$versiononly && !$opts{notify} && !$Is_W32 && !$Is_NetWare && !$Is_VMS && -t STDIN && -t STDERR && -w $mainperldir && ! samepath($mainperldir, $installbin)) { my($usrbinperl) = "$mainperldir/$perl$exe_ext"; my($instperl) = "$installbin/$perl$exe_ext"; @@ -405,11 +478,7 @@ if ($Config{installusrbinperl} && $Config{installusrbinperl} eq 'define' && (-l $usrbinperl) && ((readlink $usrbinperl) eq $expinstperl)); } - if ((! $mainperl_is_instperl) && - (yn("Many scripts expect perl to be installed as $usrbinperl.\n" . - "Do you wish to have $usrbinperl be the same as\n" . - "$expinstperl? [y] "))) - { + if (! $mainperl_is_instperl) { unlink($usrbinperl); ( $Config{'d_link'} eq 'define' && eval { CORE::link $instperl, $usrbinperl } ) || @@ -421,12 +490,15 @@ if ($Config{installusrbinperl} && $Config{installusrbinperl} eq 'define' && } # Make links to ordinary names if installbin directory isn't current directory. -if (!$Is_NetWare) { - if (!$versiononly && ! samepath($installbin, 'x2p')) { - safe_unlink("$installbin/a2p$exe_ext"); - copy("x2p/a2p$exe_ext", "$installbin/a2p$exe_ext"); - chmod(0755, "$installbin/a2p$exe_ext"); - } +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 @@ -445,7 +517,10 @@ sub script_alias { 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"); + "$installscript/$alias$scr_ext"); + } elsif ($^O eq 'vos') { + symlink("$installscript/$orig$scr_ext", + "$installscript/$alias$scr_ext"); } else { link("$installscript/$orig$scr_ext", "$installscript/$alias$scr_ext"); @@ -453,7 +528,7 @@ sub script_alias { } # Install scripts. -mkpath($installscript, $verbose, 0777); +mkpath($installscript, $opts{verbose}, 0777); if ($versiononly) { for (@scripts) { (my $base = $_) =~ s#.*/##; @@ -462,11 +537,11 @@ if ($versiononly) { chmod(0755, "$installscript/$base"); } - for (@tolink) { - my ($from, $to) = map { "$_$ver" } @$_; - (my $frbase = $from) =~ s#.*/##; - (my $tobase = $to) =~ s#.*/##; - script_alias($installscript, $frbase, $tobase, $scr_ext); + 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) { @@ -475,39 +550,24 @@ if ($versiononly) { chmod(0755, "$installscript/$base"); } - for (@tolink) { - my ($from, $to) = @$_; - (my $frbase = $from) =~ s#.*/##; - (my $tobase = $to) =~ s#.*/##; - script_alias($installscript, $frbase, $tobase, $scr_ext); + for (@tolink) { + my ($from, $to) = @$_; + (my $frbase = $from) =~ s#.*/##; + (my $tobase = $to) =~ s#.*/##; + script_alias($installscript, $frbase, $tobase, $scr_ext); } } # Install pod pages. Where? I guess in $installprivlib/pod # ($installprivlib/pods for cygwin). -my $pod = $Is_Cygwin ? 'pods' : 'pod'; -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") { - 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 $nonono; - } - } +my $pod = ($Is_Cygwin || $Is_Darwin || $Is_VMS || $Is_W32) ? 'pods' : 'pod'; +if ( !$versiononly || ($installprivlib =~ m/\Q$vershort/)) { + mkpath("${installprivlib}/$pod", $opts{verbose}, 0777); for (@pods) { # $_ is a name like pod/perl.pod - (my $base = $_) =~ s#.*/##; + (my $base = $_) =~ s#.*/##; copy_if_diff($_, "${installprivlib}/$pod/${base}"); } @@ -525,11 +585,11 @@ if (!$versiononly && $otherperls) { ($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 $i = 0; + while (exists $ENV{'DCL$PATH' . $i}) { + my $dir = unixpath($ENV{'DCL$PATH' . $i}); $dir =~ s-/$--; + push(@path,$dir); + } } my @otherperls; my %otherperls; @@ -537,9 +597,11 @@ if (!$versiononly && $otherperls) { next unless m,^/,; # Use &samepath here because some systems have other dirs linked # to $mainperldir (like SunOS) + next unless -d; next if samepath($_, $binexp); + next if samepath($_, cwd()); next if ($mainperl_is_instperl && samepath($_, $mainperldir)); - my $otherperl = "$_/$perl$exe_ext"; + my $otherperl = "$_/$perl$exe_ext"; next if $otherperls{$otherperl}++; push(@otherperls, $otherperl) if (-x $otherperl && ! -d $otherperl); @@ -555,13 +617,16 @@ if (!$versiononly && $otherperls) { } -$packlist->write() unless $nonono; -print " Installation complete\n" if $verbose; +$packlist->write() unless $opts{notify}; +print " Installation complete\n" if $opts{verbose}; exit 0; ############################################################################### +# If these are needed elsewhere, move them into install_lib.pl rather than +# copying them. + sub yn { my($prompt) = @_; my($answer); @@ -572,33 +637,17 @@ sub yn { ($answer =~ m/^[yY]/); } -sub unlink { - my(@names) = @_; - my($cnt) = 0; - - return scalar(@names) if $Is_VMS; - - foreach my $name (@names) { - next unless -e $name; - chmod 0777, $name if ($Is_OS2 || $Is_W32 || $Is_Cygwin || $Is_NetWare); - print " unlink $name\n" if $verbose; - ( CORE::unlink($name) and ++$cnt - or warn "Couldn't unlink $name: $!\n" ) unless $nonono; - } - return $cnt; -} - sub safe_unlink { - return if $nonono or $Is_VMS; + return if $opts{notify} or $Is_VMS; my @names = @_; foreach my $name (@names) { next unless -e $name; chmod 0777, $name if ($Is_OS2 || $Is_W32 || $Is_NetWare); - print " unlink $name\n" if $verbose; + print " unlink $name\n" if $opts{verbose}; next if CORE::unlink($name); warn "Couldn't unlink $name: $!\n"; if ($! =~ /busy/i) { - print " mv $name $name.old\n" if $verbose; + print " mv $name $name.old\n" if $opts{verbose}; safe_rename($name, "$name.old") or warn "Couldn't rename $name: $!\n"; } @@ -612,76 +661,29 @@ sub safe_rename { for ($i = 1; $i < 50; $i++) { last if rename($to, "$to.$i"); } - warn("Cannot rename to `$to.$i': $!"), return 0 + warn("Cannot rename to `$to.$i': $!"), return 0 if $i >= 50; # Give up! } link($from,$to) || return 0; unlink($from); } -sub link { - my($from,$to) = @_; - my($success) = 0; - - print $verbose ? " ln $from $to\n" : " $to\n" unless $silent; - eval { - CORE::link($from, $to) - ? $success++ - : ($from =~ m#^/afs/# || $to =~ m#^/afs/#) - ? die "AFS" # okay inside eval {} - : die "Couldn't link $from to $to: $!\n" - unless $nonono; - $packlist->{$to} = { from => $from, type => 'link' }; - }; - if ($@) { - warn $@; - 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" - unless $nonono; - $packlist->{$to} = { type => 'file' }; - } - $success; -} - -sub chmod { - my($mode,$name) = @_; - - return if ($^O eq 'dos'); - 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 $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->{$to} = { type => 'file' }; -} - -sub samepath { - my($p1, $p2) = @_; - - return (lc($p1) eq lc($p2)) if ($Is_W32 || $Is_NetWare); - - if ($p1 ne $p2) { - my($dev1, $ino1, $dev2, $ino2); - ($dev1, $ino1) = stat($p1); - ($dev2, $ino2) = stat($p2); - ($dev1 == $dev2 && $ino1 == $ino2); - } - else { - 1; + my $xto = $to; + $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" + if $Is_VMS and -e $to and !$opts{silent}; + unless ($opts{notify} or File::Copy::copy($from, $to)) { + # Might have been that F::C::c can't overwrite the target + warn "Couldn't copy $from to $to: $!\n" + unless -f $to and (chmod(0666, $to), unlink $to) + and File::Copy::copy($from, $to); } + $packlist->{$xto} = { type => 'file' }; } sub installlib { @@ -691,31 +693,77 @@ sub installlib { my $name = $_; - # Ignore RCS and CVS directories. - if (($name eq 'CVS' or $name eq 'RCS') and -d $name) { + # Ignore version control directories. + if ($name =~ /^(?:CVS|RCS|SCCS|\.svn)\z/ and -d $name) { $File::Find::prune = 1; return; } - + # ignore patch backups, RCS files, emacs backup & temp files and the - # .exists files, .PL files, and .t files. - return if $name =~ m{\.orig$|~$|^#.+#$|,v$|^\.exists|\.PL$|\.t$}; + # .exists files, .PL files, and test files. + 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 + # (they're installed later with other utils) + return if $name =~ /^(?:cpan|instmodsh|prove|corelist|ptar|cpan2dist|cpanp|cpanp-run-perl|ptardiff|ptargrep|config_data)\z/; + # ignore the Makefiles + return if $name =~ /^makefile$/i; + # ignore the test extensions + return if $dir =~ m{\bXS/(?:APItest|Typemap)\b}; + return if $name =~ m{\b(?:APItest|Typemap)\.pm$}; + # 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(?:UnicodeData|Blocks|Scripts|CompositionExclusions|CaseFolding|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+\.pl)\z/; + } + } + + # ignore READMEs, MANIFESTs, INSTALL docs, META.ymls and change logs. + # Changes.e2x and README.e2x are needed by enc2xs. + return if $name =~ m{^(?:README(?:\.\w+)?)$} && $name ne 'README.e2x'; + return if $name =~ m{^(?:MANIFEST|META\.yml)$}; + return if $name =~ m{^(?:INSTALL|TODO|BUGS|CREDITS)$}i; + return if $name =~ m{^change(?:s|log)(?:\.libnet)?$}i; + return if $name =~ m{^(?:SIGNATURE|PAUSE200\d\.pub)$}; # CPAN files + return if $name =~ m{^(?:NOTES|PATCHING)$}; # ExtUtils files + + # if using a shared perl library then ignore: + # - static library files [of statically linked extensions]; + # - import library files and export library files (only present on Win32 + # anyway?) and empty bootstrap files [of dynamically linked extensions]. + return if $Config{useshrplib} eq 'true' and + ($name =~ /$Config{_a}$/ or $name =~ /\.exp$/ or ($name =~ /\.bs$/ and -z $name)); $name = "$dir/$name" if $dir ne ''; + return if $name eq 'ExtUtils/XSSymSet.pm' and !$Is_VMS; + my $installlib = $installprivlib; - if ($dir =~ /^auto/ || + if ($dir =~ /^auto\// || ($name =~ /^(.*)\.(?:pm|pod)$/ && $archpms{$1}) || - ($name =~ /^(.*)\.(?:h|lib)$/i && ($Is_W32 || $Is_NetWare)) + ($name =~ /^(.*)\.(?:h|lib)$/i && ($Is_W32 || $Is_NetWare)) || + $name=~/^Config_(heavy|git)\.pl\z/ ) { - $installlib = $installarchlib; + $installlib = $installarchlib; return unless $do_installarchlib; } else { return unless $do_installprivlib; } if (-f $_) { - if (/\.(?:al|ix)$/ && !($dir =~ m[^auto/(.*)$] && $archpms{$1})) { + 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 @@ -723,27 +771,36 @@ sub installlib { #This might not work because $archname might have changed. unlink("$installarchlib/$name"); } - $packlist->{"$installlib/$name"} = { type => 'file' }; - if (compare($_, "$installlib/$name") || $nonono) { + my $xname = "$installlib/$name"; + $xname =~ s/^\Q$opts{destdir}\E//; + $packlist->{$xname} = { type => 'file' }; + if ($force || compare($_, "$installlib/$name") || $opts{notify}) { unlink("$installlib/$name"); - mkpath("$installlib/$dir", $verbose, 0777); + mkpath("$installlib/$dir", $opts{verbose}, 0777); # 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 { - copy_if_diff($_, "$installlib/$name") + 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"); - } #if ($Is_NetWare) + "$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) } } } @@ -761,16 +818,32 @@ sub installlib { sub copy_if_diff { my($from,$to)=@_; return 1 if (($^O eq 'VMS') && (-d $from)); - -f $from || warn "$0: $from not found"; - $packlist->{$to} = { type => 'file' }; - if (compare($from, $to) || $nonono) { + my $xto = $to; + $xto =~ s/^\Q$opts{destdir}\E//; + my $perlpodbadsymlink; + if ($from =~ m!^pod/perl[\w-]+\.pod$! && + -l $from && + ! -e $from) { + # Some Linux implementations have problems traversing over + # multiple symlinks (when going over NFS?) and fail to read + # the symlink target. Combine this with the fact that some + # of the pod files (the perl$OS.pod) are symlinks (to ../README.$OS), + # and you end up with those pods not getting installed. + $perlpodbadsymlink = 1; + } + -f $from || $perlpodbadsymlink || warn "$0: $from not found"; + $packlist->{$xto} = { type => 'file' }; + if ($force || compare($from, $to) || $opts{notify}) { safe_unlink($to); # In case we don't have write permissions. - if ($nonono) { - $from = $depth . "/" . $from if $depth; - } + if ($opts{notify}) { + $from = $depth . "/" . $from if $depth; + } + if ($perlpodbadsymlink && $from =~ m!^pod/perl(.+)\.pod$!) { + $from = "README.$1"; + } copy($from, $to); # Restore timestamps if it's a .a library or for OS/2. - if (!$nonono && ($Is_OS2 || $to =~ /\.a$/)) { + if (!$opts{notify} && ($Is_OS2 || $to =~ /\.a$/)) { my ($atime, $mtime) = (stat $from)[8,9]; utime $atime, $mtime, $to; } @@ -786,16 +859,19 @@ sub strip my @opts; while (@args && $args[0] =~ /^(-\w+)$/) { - push @opts, shift @args; + push @opts, shift @args; } foreach my $file (@args) { - if (-f $file) { - print " strip $file\n" if $verbose; - system("strip", @opts, $file); - } else { - print "# file '$file' skipped\n" if $verbose; - } + if (-f $file) { + if ($opts{verbose}) { + print " strip " . join(' ', @opts); + print " " if (@opts); + print "$file\n"; + } + system("strip", @opts, $file); + } else { + print "# file '$file' skipped\n" if $opts{verbose}; + } } } -