my @exclude_mods = qw(XSLoader.pm DynaLoader.pm);
#used by t/watchdog_fatnode
-our $INHIBIT_RUN_NODE = 0;
+our $INHIBIT_RUN_NODE = 0;
sub stripspace {
my ($text) = @_;
}
}
-sub filter_not_core {
+my @non_core_non_arch = ( $mods{'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;
+
+#print STDERR "non-core non-arch ", Dumper(\@non_core_non_arch);
+#print STDERR "core non-arch ", Dumper(\@core_non_arch);
+
+#TODO this is the wrong path to go down - fork() will bring
+#the env vars with it and the ssh connector can handle
+#forwarding the env vars
my $env_pass = '';
if (defined($ENV{OBJECT_REMOTE_LOG_LEVEL})) {
my $level = $ENV{OBJECT_REMOTE_LOG_LEVEL};
- return unless $level =~ /^\w+$/;
- $env_pass = '$ENV{OBJECT_REMOTE_LOG_LEVEL} = "' . $level . "\";\n";
+ $env_pass .= '$ENV{OBJECT_REMOTE_LOG_LEVEL} = "' . $level . "\";\n";
+}
+if (defined($ENV{OBJECT_REMOTE_LOG_FORMAT})) {
+ my $format = $ENV{OBJECT_REMOTE_LOG_FORMAT};
+ $env_pass .= '$ENV{OBJECT_REMOTE_LOG_FORMAT} = "' . $format . "\";\n";
+}
+if (defined($ENV{OBJECT_REMOTE_LOG_SELECTIONS})) {
+ my $selections = $ENV{OBJECT_REMOTE_LOG_SELECTIONS};
+ $env_pass .= '$ENV{OBJECT_REMOTE_LOG_SELECTIONS} = "' . $selections . "\";\n";
}
+if (defined($ENV{OBJECT_REMOTE_LOG_FORWARDING})) {
+ my $forwarding = $ENV{OBJECT_REMOTE_LOG_FORWARDING};
+ $env_pass .= '$ENV{OBJECT_REMOTE_LOG_FORWARDING} = "' . $forwarding . "\";\n";
+}
+if (defined($ENV{OBJECT_REMOTE_PERL_BIN})) {
+ my $perl_bin = $ENV{OBJECT_REMOTE_PERL_BIN};
+ $env_pass .= '$ENV{OBJECT_REMOTE_PERL_BIN} = "' . $perl_bin . "\";\n";
+}
+
+
my $start = stripspace <<'END_START';
# This chunk of stuff was generated by Object::Remote::FatNode. To find
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),
);
our $DATA = join "\n", $start, $env_pass, @segments, $end;