X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FObject%2FRemote%2FFatNode.pm;h=819d657b1e80d75cc5d35c3fb34174d0ff4ba051;hb=aaa31f6ef3e6bb283f0175ba4b0efda9e5223486;hp=bed81712b355f4159cefdd058739d895f3530da3;hpb=cc62b744f9483c55d0e5c5297525d2d30171e62c;p=scpubgit%2FObject-Remote.git

diff --git a/lib/Object/Remote/FatNode.pm b/lib/Object/Remote/FatNode.pm
index bed8171..819d657 100644
--- a/lib/Object/Remote/FatNode.pm
+++ b/lib/Object/Remote/FatNode.pm
@@ -5,6 +5,8 @@ use Config;
 use B qw(perlstring);
 
 my @exclude_mods = qw(XSLoader.pm DynaLoader.pm);
+#used by t/watchdog_fatnode 
+our $INHIBIT_RUN_NODE = 0;
 
 sub stripspace {
   my ($text) = @_;
@@ -42,22 +44,30 @@ chomp(my @inc = qx($command));
 
 my %exclude = map { $_ => 1 } @exclude_mods; 
 my %mods = reverse @inc;
+my %file_names = @inc;
 
 foreach(keys(%mods)) {
   if ($exclude{ $mods{$_} }) {
-    delete($mods{$_});    
+    delete($mods{$_});
   }
 }
 
-sub filter_not_core {
+my @non_core_non_arch = ( $file_names{'Devel/GlobalDestruction.pm'} );
+push @non_core_non_arch, grep +(
   not (
-    /^\Q$Config{privlibexp}/ or /^\Q$Config{archlibexp}/
-  )        
-}
-
-my @file_names = keys %mods;
-my @before_inc = grep { filter_not_core() } @file_names;
-my @after_inc;
+    #some of the config variables can be empty which will eval as a matching regex
+    $Config{privlibexp} ne '' && /^\Q$Config{privlibexp}/
+      or $Config{archlibexp} ne '' && /^\Q$Config{archlibexp}/
+      or $Config{vendorarchexp} ne '' && /^\Q$Config{vendorarchexp}/
+      or $Config{sitearchexp} ne '' && /^\Q$Config{sitearchexp}/
+  )
+), grep !/\Q$Config{archname}/, grep !/\Q$Config{myarchname}/, keys %mods;
+
+my @core_non_arch = grep +(
+  $Config{privlibexp} ne '' && /^\Q$Config{privlibexp}/
+  and not($Config{archlibexp} ne '' && /^\Q$Config{archlibexp}/
+    or /\Q$Config{archname}/ or /\Q$Config{myarchname}/)
+), keys %mods;
 
 my $start = stripspace <<'END_START';
   # This chunk of stuff was generated by Object::Remote::FatNode. To find
@@ -76,14 +86,14 @@ my $end = stripspace <<'END_END';
     if (my $fat = $_[0]->{$_[1]}) {
       if ($exclude{$_[1]}) {
         warn "Will not pre-load '$_[1]'";
-        return undef; 
+        return undef;
       }
- 
+
       #warn "Handling $_[1]";
       open my $fh, '<', \$fat;
       return $fh;
     }
-    
+
     #Uncomment this to find brokenness
     #warn "Missing $_[1]";
     return;
@@ -96,26 +106,34 @@ my $end = stripspace <<'END_END';
 
   use strictures 1;
   use Object::Remote::Node;
-  Object::Remote::Node->run;
+
+  unless ($Object::Remote::FatNode::INHIBIT_RUN_NODE) {
+    Object::Remote::Node->run(watchdog_timeout => $WATCHDOG_TIMEOUT);
+  }
+
 END_END
 
 my %files = map +($mods{$_} => scalar do { local (@ARGV, $/) = ($_); <> }),
-              @before_inc, @after_inc;
+              @non_core_non_arch, @core_non_arch;
 
 sub generate_fatpack_hash {
   my ($hash_name, $orig) = @_;
   (my $stub = $orig) =~ s/\.pm$//;
   my $name = uc join '_', split '/', $stub;
   my $data = $files{$orig} or die $orig; $data =~ s/^/  /mg;
-  return '$'.$hash_name.'{'.perlstring($orig).qq!} = <<'${name}';\n!
-  .qq!${data}${name}\n!;
+  $data .= "\n" unless $data =~ m/\n$/;
+  my $ret = '$'.$hash_name.'{'.perlstring($orig).qq!} = <<'${name}';\n!
+    .qq!${data}${name}\n!;
+#  warn $ret;
+  return $ret;
 }
 
 my @segments = (
-  map(generate_fatpack_hash('fatpacked', $_), sort map $mods{$_}, @before_inc),
-  map(generate_fatpack_hash('fatpacked_extra', $_), sort map $mods{$_}, @after_inc),
+  map(generate_fatpack_hash('fatpacked', $_), sort map $mods{$_}, @non_core_non_arch),
+  map(generate_fatpack_hash('fatpacked_extra', $_), sort map $mods{$_}, @core_non_arch),
 );
 
+#print STDERR Dumper(\@segments);
 our $DATA = join "\n", $start, @segments, $end;
 
 1;