X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=scpubgit%2FObject-Remote.git;a=blobdiff_plain;f=lib%2FObject%2FRemote%2FFatNode.pm;h=fe07f29f94d46dacb51bfe2e13075925291a2fa0;hp=c840cf29e0bb95bb3432c3f2af9980a213a9a31a;hb=dd6e1327e96d5488e34f7519d9d3290627c9bbe8;hpb=90f5193d831554f3a3640b8ef3aade021e4d5136

diff --git a/lib/Object/Remote/FatNode.pm b/lib/Object/Remote/FatNode.pm
index c840cf2..fe07f29 100644
--- a/lib/Object/Remote/FatNode.pm
+++ b/lib/Object/Remote/FatNode.pm
@@ -5,7 +5,7 @@ use Config;
 use B qw(perlstring);
 
 my @exclude_mods = qw(XSLoader.pm DynaLoader.pm);
-#used by t/watchdog_fatnode 
+#used by t/watchdog_fatnode
 our $INHIBIT_RUN_NODE = 0;
 
 sub stripspace {
@@ -17,15 +17,18 @@ sub stripspace {
 my %maybe_libs = map +($_ => 1), grep defined, (values %Config, '.');
 
 my @extra_libs = grep not(ref($_) or $maybe_libs{$_}), @INC;
-
-my $extra_libs = join '', map "  -I$_\n", @extra_libs;
+my $extra_libs = join '', map {
+    my $lib = $_;
+    $lib =~ s{'}{'\\''}g;
+    "  -I'$lib'\n";
+} @extra_libs;
 
 my $command = qq(
   $^X
   $extra_libs
   -mObject::Remote
   -mObject::Remote::Connector::STDIO
-  -mCPS::Future
+  -mFuture
   -mMRO::Compat
   -mClass::C3
   -mClass::C3::next
@@ -34,6 +37,7 @@ my $command = qq(
   -mObject::Remote::Node
   -mMethod::Generate::BuildAll
   -mMethod::Generate::DemolishAll
+  -mMoo::HandleMoose::_TypeMap
   -mJSON::PP
   -e 'print join "\\n", \%INC'
 );
@@ -42,20 +46,21 @@ $command =~ s/\n/ /g;
 
 chomp(my @inc = qx($command));
 
-my %exclude = map { $_ => 1 } @exclude_mods; 
+my %exclude = map { $_ => 1 } @exclude_mods;
 my %mods = reverse @inc;
+my %file_names = @inc;
 
 foreach(keys(%mods)) {
   if ($exclude{ $mods{$_} }) {
-    delete($mods{$_});    
+    delete($mods{$_});
   }
 }
 
-my @non_core_non_arch = ( $mods{'Devel/GlobalDestruction.pm'} );
+my @non_core_non_arch = ( $file_names{'Devel/GlobalDestruction.pm'} );
 push @non_core_non_arch, grep +(
   not (
     #some of the config variables can be empty which will eval as a matching regex
-    $Config{privlibexp} ne '' && /^\Q$Config{privlibexp}/ 
+    $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}/
@@ -85,14 +90,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;
@@ -105,11 +110,11 @@ my $end = stripspace <<'END_END';
 
   use strictures 1;
   use Object::Remote::Node;
-  
+
   unless ($Object::Remote::FatNode::INHIBIT_RUN_NODE) {
-    Object::Remote::Node->run(watchdog_timeout => $WATCHDOG_TIMEOUT);    
+    Object::Remote::Node->run(watchdog_timeout => $WATCHDOG_TIMEOUT);
   }
-  
+
 END_END
 
 my %files = map +($mods{$_} => scalar do { local (@ARGV, $/) = ($_); <> }),