X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/5d25492c931e03949e966bf309e602c3fc6aad65..1a959400560e3bbe1b60592fa513f3356e654efa:/installperl diff --git a/installperl b/installperl index 63a8d66..a45c3fd 100755 --- a/installperl +++ b/installperl @@ -2,11 +2,36 @@ BEGIN { require 5.004; - chdir '..' if !-d 'lib' and -d '..\lib'; + chdir '..' if !-d 'lib' and -d '../lib'; @INC = 'lib'; $ENV{PERL5LIB} = 'lib'; } +BEGIN { + use Config; + if ($Config{userelocatableinc}) { + # This might be a considered a hack. Need to get information about the + # configuration from Config.pm *before* Config.pm expands any .../ + # prefixes. + # + # So we set $^X to pretend that we're the already installed perl, so + # Config.pm doesits ... expansion off that location. + + my $location = $Config{initialinstalllocation}; + die <<'OS' unless defined $location; +$Config{initialinstalllocation} is not defined - can't install a relocatable +perl without this. +OS + $^X = "$location/perl"; + # And then remove all trace of ever having loaded Config.pm, so that + # it will reload with the revised $^X + undef %Config::; + delete $INC{"Config.pm"}; + delete $INC{"Config_heavy.pl"}; + # You never saw us. We weren't here. + } +} + use strict; my ($Is_VMS, $Is_W32, $Is_OS2, $Is_Cygwin, $Is_Darwin, $nonono, $dostrip, $versiononly, $silent, $verbose, $force, @@ -103,6 +128,7 @@ Usage $0: [switches] 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; } @@ -128,7 +154,7 @@ close SCRIPTS; if ($scr_ext) { @scripts = map { "$_$scr_ext" } @scripts; } -my @pods = $nopods ? () : (); +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 @@ -155,11 +181,8 @@ find(sub { 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 to optional "/lib", or remove trailing component + $path =~ s{.*/lib\b}{} or $path =~ s{/[^/]*$}{}; # strip any leading / $path =~ s{^/}{}; @@ -251,6 +274,9 @@ else { " some tests failed! (Installing anyway.)\n"; } #if (!$Is_NetWare) +# This will be used to store the packlist +my $packlist = ExtUtils::Packlist->new("$installarchlib/.packlist"); + if (($Is_W32 and ! $Is_NetWare) or $Is_Cygwin) { my $perldll; @@ -265,6 +291,7 @@ if (($Is_W32 and ! $Is_NetWare) or $Is_Cygwin) { safe_unlink("$installbin/$_"); copy("$_", "$installbin/$_"); chmod(0755, "$installbin/$_"); + $packlist->{"$installbin/$_"} = { type => 'file' }; }; open (LD2, ">$installbin/ld2"); print LD2 <{"$installbin/$perldll"} = { type => 'file' }; } # if (($Is_W32 and ! $Is_NetWare) or $Is_Cygwin) -# This will be used to store the packlist -my $packlist = ExtUtils::Packlist->new("$installarchlib/.packlist"); - # First we install the version-numbered executables. if ($Is_VMS) { + 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"); @@ -316,9 +344,12 @@ if ($Is_VMS) { 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/$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') { @@ -397,7 +428,7 @@ if ($Is_VMS) { # We did core file selection during build } 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'; @@ -439,7 +470,7 @@ if (! $versiononly && ! samepath($installbin, '.') && ($^O ne 'dos') && ! $Is_VM link("$installbin/$perl_verbase$ver$exe_ext", "$installbin/$perl$exe_ext"); } - link("$installbin/s$perl_verbase$ver$exe_ext", + link("$installbin/$perl_verbase$ver$exe_ext", "$installbin/suid$perl$exe_ext") if $d_dosuid; } @@ -497,7 +528,7 @@ if ($Config{installusrbinperl} && $Config{installusrbinperl} eq 'define' && } # Make links to ordinary names if installbin directory isn't current directory. -if (!$Is_NetWare) { +if (!$Is_NetWare && $dbg eq '') { if (! samepath($installbin, 'x2p')) { my $base = 'a2p'; $base .= $ver if $versiononly; @@ -568,7 +599,7 @@ if ($versiononly) { # Install pod pages. Where? I guess in $installprivlib/pod # ($installprivlib/pods for cygwin). -my $pod = ($Is_Cygwin || $Is_Darwin) ? 'pods' : 'pod'; +my $pod = ($Is_Cygwin || $Is_Darwin || $Is_VMS || $Is_W32) ? 'pods' : 'pod'; if ( !$versiononly || ($installprivlib =~ m/\Q$ver/)) { mkpath("${installprivlib}/$pod", $verbose, 0777); @@ -720,14 +751,16 @@ sub link { $packlist->{$xto} = { from => $xfrom, type => 'link' }; }; if ($@) { - warn $@; + warn "Replacing link() with File::Copy::copy(): $@"; print $verbose ? " cp $from $xto\n" : " $xto\n" unless $silent; print " creating new version of $xto\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; + unless ($nonono or File::Copy::copy($from, $to) and ++$success) { + # 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) and ++$success; + } $packlist->{$xto} = { type => 'file' }; } $success; @@ -750,9 +783,12 @@ sub copy { $xto =~ s/^\Q$destdir\E// if $destdir; print $verbose ? " cp $from $xto\n" : " $xto\n" unless $silent; print " creating new version of $xto\n" if $Is_VMS and -e $to and !$silent; - File::Copy::copy($from, $to) - || warn "Couldn't copy $from to $to: $!\n" - unless $nonono; + unless ($nonono 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' }; } @@ -780,7 +816,7 @@ sub installlib { my $name = $_; # Ignore version control directories. - if (($name eq 'CVS' or $name eq 'RCS' or $name eq '.svn') and -d $name) { + if ($name =~ /^(?:CVS|RCS|SCCS|\.svn)\z/ and -d $name) { $File::Find::prune = 1; return; } @@ -789,17 +825,32 @@ sub installlib { # .exists files, .PL files, and test files. return if $name =~ m{\.orig$|\.rej$|~$|^#.+#$|,v$|^\.exists|\.PL$|\.plc$|\.t$|^test\.pl$} || $dir =~ m{/t(?:/|$)}; - # ignore the cpan script in lib/CPAN/bin (installed later with other utils) - return if $name eq 'cpan'; + # 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|ptardiff|config_data)\z/; + # ignore the Makefiles + return if $name =~ /^makefile$/i; # ignore the test extensions return if $dir =~ m{ext/XS/(?:APItest|Typemap)/}; + # ignore the demo files + return if $dir =~ /\bdemos?\b/; + + # 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+)?|MANIFEST|META\.yml|INSTALL)$} && $name ne 'README.e2x'; + return if $name =~ m{^(?:TODO|BUGS|CREDITS)$}i; + return if $name =~ m{^change(?:s|log)(?:\.libnet)?$}i; $name = "$dir/$name" if $dir ne ''; my $installlib = $installprivlib; 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 eq 'Config_heavy.pl' ) { $installlib = $installarchlib; return unless $do_installarchlib; @@ -808,7 +859,7 @@ sub installlib { } 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