my %mods = reverse @inc;
-my @non_core_non_arch = grep +(
+my @non_core = grep +(
not (
/^\Q$Config{privlibexp}/ or /^\Q$Config{archlibexp}/
- or /^\Q$Config{vendorarchexp}/ or /^\Q$Config{sitearchexp}/
)
-), grep !/\Q$Config{archname}/, grep !/\Q$Config{myarchname}/, keys %mods;
+), keys %mods;
+
+#my @core_non_arch = grep +(
+# /^\Q$Config{privlibexp}/
+#), grep !/\Q$Config{archname}/, grep !/\Q$Config{myarchname}/, keys %mods;
+my @core_non_arch;
my $start = stripspace <<'END_START';
# This chunk of stuff was generated by Object::Remote::FatNode. To find
# the original file's code, look for the end of this BEGIN block or the
# string 'FATPACK'
BEGIN {
- my %fatpacked;
+ my (%fatpacked,%fatpacked_extra);
END_START
my $end = stripspace <<'END_END';
- s/^ //mg for values %fatpacked;
+ s/^ //mg for values %fatpacked, values %fatpacked_extra;
- unshift @INC, sub {
- if (my $fat = $fatpacked{$_[1]}) {
+ sub load_from_hash {
+ if (my $fat = $_[0]->{$_[1]}) {
open my $fh, '<', \$fat;
return $fh;
}
#Uncomment this to find brokenness
#warn "Missing $_[1]";
return
- };
+ }
+
+ unshift @INC, sub { load_from_hash(\%fatpacked, $_[1]) };
+ push @INC, sub { load_from_hash(\%fatpacked_extra, $_[1]) };
} # END OF FATPACK CODE
END_END
my %files = map +($mods{$_} => scalar do { local (@ARGV, $/) = ($_); <> }),
- @non_core_non_arch;
+ @non_core, @core_non_arch;
-my @segments = map {
- (my $stub = $_) =~ s/\.pm$//;
+sub generate_fatpack_hash {
+ my ($hash_name, $orig) = @_;
+ (my $stub = $orig) =~ s/\.pm$//;
my $name = uc join '_', split '/', $stub;
- my $data = $files{$_}; $data =~ s/^/ /mg;
- '$fatpacked{'.perlstring($_).qq!} = <<'${name}';\n!
+ my $data = $files{$orig} or die $orig; $data =~ s/^/ /mg;
+ return '$'.$hash_name.'{'.perlstring($orig).qq!} = <<'${name}';\n!
.qq!${data}${name}\n!;
-} sort keys %files;
+}
+
+use Data::Dumper;
+warn "Dumping list of shipped modules";
+print STDERR "Core non-arch: ", Dumper(\@core_non_arch);
+print STDERR "Non-core: ", Dumper(\@non_core);
+
+my @segments = (
+ map(generate_fatpack_hash('fatpacked', $_), sort map $mods{$_}, @non_core),
+ map(generate_fatpack_hash('fatpacked_extra', $_), sort map $mods{$_}, @core_non_arch),
+);
our $DATA = join "\n", $start, @segments, $end;