X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=installperl;h=f635918796b8b6b18e7ad45cb4508bde3473be75;hb=b16276bb9e16a3b99d6fb450f4e0902e32b01f85;hp=a7c03da5a49483fdb03da7dd3542100df04ef9c3;hpb=86207487601861597b08158d7469c885a14adc49;p=p5sagit%2Fp5-mst-13.2.git diff --git a/installperl b/installperl index a7c03da..f635918 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, @@ -29,6 +54,7 @@ use File::Compare; use File::Copy (); use File::Path (); use ExtUtils::Packlist; +use Cwd; use Config; use subs qw(unlink link chmod); @@ -156,11 +182,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 +275,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,38 +286,8 @@ 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) { @@ -575,7 +569,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); @@ -627,6 +621,7 @@ if (!$versiononly && $otherperls) { # 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}++; @@ -799,23 +794,45 @@ sub installlib { # 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, the instmodsh and xsubpp - # scripts in lib/ExtUtils, and the prove script in lib/Test/Harness + # 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)\z/; + 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; @@ -824,7 +841,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