use File::Path qw(mkpath rmtree);
use B qw(perlstring);
-our $VERSION = '0.010000'; # 0.10.0
+our $VERSION = '0.010_006'; # 0.10.6
$VERSION = eval $VERSION;
my $output = $opts{output};
my $trace_opts = join ',', $output||'>&STDOUT', @{$opts{use}||[]};
- local $ENV{PERL5OPT} = '-MApp::FatPacker::Trace='.$trace_opts;
+ local $ENV{PERL5OPT} = join ' ',
+ ($ENV{PERL5OPT}||()), '-MApp::FatPacker::Trace='.$trace_opts;
my @args = @{$opts{args}||[]};
sub packlists_containing {
my ($self, $targets) = @_;
- my @targets = @$targets;
- foreach my $t (@targets) {
- require $t;
+ my @targets;
+ {
+ local @INC = ('lib', @INC);
+ foreach my $t (@$targets) {
+ unless (eval { require $t; 1}) {
+ warn "Failed to load ${t}: $@\n"
+ ."Make sure you're not missing a packlist as a result\n";
+ next;
+ }
+ push @targets, $t;
+ }
}
my @search = grep -d $_, map catdir($_, 'auto'), @INC;
my %pack_rev;
my $pack_base;
PART: foreach my $p (0 .. $#dir_parts) {
if ($dir_parts[$p] eq 'auto') {
- # $p-2 since it's <wanted path>/$Config{archname}/auto
- $pack_base = catpath $vol, catdir @dir_parts[0..$p-2];
+ # $p-2 normally since it's <wanted path>/$Config{archname}/auto but
+ # if the last bit is a number it's $Config{archname}/$version/auto
+ # so use $p-3 in that case
+ my $version_lib = 0+!!($dir_parts[$p-1] =~ /^[0-9.]+$/);
+ $pack_base = catpath $vol, catdir @dir_parts[0..$p-(2+$version_lib)];
last PART;
}
}
if ($] < 5.008) {
*{"${class}::INC"} = sub {
- if (my $fat = $_[0]{$_[1]}) {
- return sub {
- return 0 unless length $fat;
- $fat =~ s/^([^\n]*\n?)//;
- $_ = $1;
- return 1;
- };
- }
- return;
+ if (my $fat = $_[0]{$_[1]}) {
+ my $pos = 0;
+ my $last = length $fat;
+ return (sub {
+ return 0 if $pos == $last;
+ my $next = (1 + index $fat, "\n", $pos) || $last;
+ $_ .= substr $fat, $pos, $next - $pos;
+ $pos = $next;
+ return 1;
+ });
+ }
};
}
=head1 SUPPORT
-Your current best avenue is to come annoy annoy mst on #toolchain on
-irc.perl.org. There should be a non-IRC means of support by 1.0.
+Bugs may be submitted through L<the RT bug tracker|https://rt.cpan.org/Public/Dist/Display.html?Name=App-FatPacker>
+(or L<bug-App-FatPacker@rt.cpan.org|mailto:bug-App-FatPacker@rt.cpan.org>).
+
+You can normally also obtain assistance on irc, in #toolchain on irc.perl.org.
=head1 AUTHOR