X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=installperl;h=e9d2b59b12ad3059e82b56762c24b84af0340eb6;hb=5b36ee8399419493970b295dd8460c19a625ac89;hp=58c81f54fc61269b002489ecb5a8dd080b4182e5;hpb=70eaf669f8c2c2eadbd10ffbbd168124d20b8745;p=p5sagit%2Fp5-mst-13.2.git diff --git a/installperl b/installperl index 58c81f5..e9d2b59 100755 --- a/installperl +++ b/installperl @@ -7,6 +7,31 @@ BEGIN { $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, @@ -129,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 @@ -156,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{^/}{}; @@ -252,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; @@ -260,36 +285,6 @@ if (($Is_W32 and ! $Is_NetWare) or $Is_Cygwin) { my $v_e_r_s = $ver; $v_e_r_s =~ tr/./_/; $perldll =~ s/(\..*)?$/$v_e_r_s.$dlext/; $perldll =~ s/^lib/cyg/; - if ($Config{useshrplib} eq 'true') { - # install ld2 and perlld as well - foreach ('ld2', 'perlld') { - safe_unlink("$installbin/$_"); - copy("$_", "$installbin/$_"); - chmod(0755, "$installbin/$_"); - }; - 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) { @@ -404,7 +397,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'; @@ -446,7 +439,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; } @@ -575,7 +568,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); @@ -727,14 +720,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; @@ -757,9 +752,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' }; } @@ -787,28 +785,52 @@ 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; } # 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$} || + return if $name =~ m{\.orig$|\.rej$|~$|^#.+#$|,v$|^\.exists|\.PL$|\.plc$|\.t$|^test\.pl$|^dbm_filter_util.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|cpan2dist|cpanp|cpanp-run-perl|ptardiff|config_data)\z/; # ignore the Makefiles return if $name =~ /^makefile$/i; # ignore the test extensions - return if $dir =~ m{ext/XS/(?:APItest|Typemap)/}; + 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 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 ''; 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; @@ -817,7 +839,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