X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FObject%2FRemote%2FFatNode.pm;h=a1e7691a3db69fd646e12fa6ce8046e0118e18f5;hb=61c6bba76865f7126c3028655f966cb7f32fa52d;hp=845c12b54055472a91449d91803a42516f587324;hpb=1ef3d225bfb434c7ae608946827419478c40a59e;p=scpubgit%2FObject-Remote.git

diff --git a/lib/Object/Remote/FatNode.pm b/lib/Object/Remote/FatNode.pm
index 845c12b..a1e7691 100644
--- a/lib/Object/Remote/FatNode.pm
+++ b/lib/Object/Remote/FatNode.pm
@@ -40,18 +40,17 @@ chomp(my @inc = qx($command));
 
 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;
-
-my @core_non_arch = grep +(
-  /^\Q$Config{privlibexp}/
-  and not(/^\Q$Config{archlibexp}/ or /\Q$Config{archname}/ or /\Q$Config{myarchname}/)
 ), 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
@@ -63,10 +62,16 @@ my $end = stripspace <<'END_END';
   s/^  //mg for values %fatpacked, values %fatpacked_extra;
 
   sub load_from_hash {
+    if ($_[1] eq 'XSLoader.pm' || $_[1] eq 'DynaLoader.pm') {
+      warn "Will not pre-load '$_[1]'";
+      return undef; 
+    }
+
     if (my $fat = $_[0]->{$_[1]}) {
       open my $fh, '<', \$fat;
       return $fh;
     }
+    
     #Uncomment this to find brokenness
     #warn "Missing $_[1]";
     return
@@ -83,7 +88,7 @@ my $end = stripspace <<'END_END';
 END_END
 
 my %files = map +($mods{$_} => scalar do { local (@ARGV, $/) = ($_); <> }),
-              @non_core_non_arch, @core_non_arch;
+              @non_core, @core_non_arch;
 
 sub generate_fatpack_hash {
   my ($hash_name, $orig) = @_;
@@ -94,9 +99,14 @@ sub generate_fatpack_hash {
   .qq!${data}${name}\n!;
 }
 
+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_non_arch),
-    map(generate_fatpack_hash('fatpacked_extra', $_), sort map $mods{$_}, @core_non_arch),
+  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;