X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/ce64b29247b866db41660d85a539aa3482208631..2d11a7e9678a8894622d2af2943f9976d913f4c9:/installperl diff --git a/installperl b/installperl index 5d86a93..ac1c770 100755 --- a/installperl +++ b/installperl @@ -15,9 +15,6 @@ 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 { if ($Is_VMS) { eval 'use VMS::Filespec;' } @@ -32,6 +29,8 @@ use File::Path (); use ExtUtils::Packlist; use Cwd; +require './Porting/pod_lib.pl'; + if ($Is_NetWare) { $Is_W32 = 0; $scr_ext = '.pl'; @@ -129,8 +128,6 @@ close SCRIPTS; if ($scr_ext) { @scripts = map { "$_$scr_ext" } @scripts; } -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.) @@ -302,16 +299,6 @@ if ($Is_VMS) { 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"); @@ -352,7 +339,7 @@ mkpath($installsitelib, $opts{verbose}, 0777) if ($installsitelib); mkpath($installsitearch, $opts{verbose}, 0777) if ($installsitearch); if (-d 'lib') { - find(\&installlib, 'lib') + find({no_chdir => 1, wanted => \&installlib}, 'lib') if $do_installarchlib || $do_installprivlib; } else { @@ -392,18 +379,13 @@ elsif ($Is_Cygwin) { # On Cygwin symlink it to CORE to make Makefile happy # 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'); - } } 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)$/; + strip("-S", "$installarchlib/CORE/$file") if $^O eq 'darwin'; chmod(0555, "$installarchlib/CORE/$file"); } else { chmod(0444, "$installarchlib/CORE/$file"); @@ -416,11 +398,7 @@ foreach my $file (@corefiles) { 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"); @@ -435,11 +413,7 @@ if (! $versiononly && ! samepath($installbin, '.') && ($^O ne 'dos') && ! $Is_VM 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"); - } 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"); @@ -553,15 +527,15 @@ if ($versiononly) { # Install pod pages. Where? I guess in $installprivlib/pod # ($installprivlib/pods for cygwin). - -my $pod = ($Is_Cygwin || $Is_Darwin || $Is_VMS || $Is_W32) ? 'pods' : 'pod'; -if ( !$versiononly || ($installprivlib =~ m/\Q$vershort/)) { +if (!$nopods && (!$versiononly || ($installprivlib =~ m/\Q$vershort/))) { + my $pod = ($Is_Cygwin || $Is_Darwin || $Is_VMS || $Is_W32) ? 'pods' : 'pod'; mkpath("${installprivlib}/$pod", $opts{verbose}, 0777); - 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}"); } } @@ -682,9 +656,24 @@ sub copy { sub installlib { my $dir = $File::Find::dir; $dir =~ s!\Alib/?!!; - local($depth) = $File::Find::dir . '/'; - my $name = $_; + m!([^/]+)\z!; + my $name = $1; + + # 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) { @@ -702,7 +691,7 @@ sub installlib { # lib/Archive/Tar/bin, the config_data script in lib/Module/Build/scripts # 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|ptargrep|config_data|zipdetails)\z/; + return if $name =~ /^(?:cpan|instmodsh|prove|corelist|ptar|ptardiff|ptargrep|config_data|zipdetails)\z/; # ignore the Makefiles return if $name =~ /^makefile$/i; # ignore the test extensions @@ -716,7 +705,7 @@ sub installlib { if ( $dir =~ /^unicore/ ) { if ( $name =~ /\.txt\z/ ) { # We can ignore most, but not all .txt files - return unless $name =~ /\A(?:Blocks|CaseFolding|SpecialCasing|NamedSequences)\.txt\z/; + return unless $name =~ /\A(?:Blocks|SpecialCasing|NamedSequences)\.txt\z/; } else { # TestProp only needed during testing @@ -744,6 +733,9 @@ sub installlib { $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; my $installlib = $installprivlib; @@ -785,7 +777,7 @@ sub installlib { # on dynamically-loaded libraries. if (copy_if_diff($_, "$installlib/$name")) { strip("-S", "$installlib/$name") - if $^O =~ /^(rhapsody|darwin)$/ and /\.(?:so|$dlext|a)$/; + if $^O eq 'darwin' and /\.(?:so|$dlext|a)$/; chmod(/\.(so|$dlext)$/ ? 0555 : 0444, "$installlib/$name"); } } @@ -822,9 +814,6 @@ sub copy_if_diff { $packlist->{$xto} = { type => 'file' }; if ($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"; }