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) = @_;
$text =~ /^(\s+)/ && $text =~ s/^$1//mg;
$text;
}
-my %maybe_libs = map +($_ => 1), grep defined, (values %Config, '.');
-
-my @extra_libs = grep not(ref($_) or $maybe_libs{$_}), @INC;
+chomp(my @base_libs = `"$^X" -le"print for grep defined and !ref, \@INC"`);
+my %base_libs = map +($_ => 1), @base_libs;
-my $extra_libs = join '', map " -I$_\n", @extra_libs;
+my @extra_libs = grep not(ref($_) or $base_libs{$_}), @INC;
+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
-mObject::Remote::Node
-mMethod::Generate::BuildAll
-mMethod::Generate::DemolishAll
+ -mMoo::HandleMoose::_TypeMap
-mJSON::PP
- -e 'print join "\\n", reverse \%INC'
+ -e 'print join "\\n", \%INC'
);
$command =~ s/\n/ /g;
-chomp(my %mods = qx($command));
+chomp(my @inc = qx($command));
+
+my %exclude = map { $_ => 1 } @exclude_mods;
-my @non_core_non_arch = grep +(
- not (/^\Q$Config{privlibexp}/ or /^\Q$Config{archlibexp}/)
-), grep !/\Q$Config{archname}/, grep !/\W$Config{myarchname}/, keys %mods;
+my %file_names = @inc;
+
+# only include mods that match the filename,
+# ie ones that will succeed with a require $module
+# https://rt.cpan.org/Ticket/Display.html?id=100478
+my %mods =
+ map { $file_names{$_} => $_ }
+ grep { $file_names{$_} =~ /\Q$_\E$/ } keys %file_names;
+
+foreach(keys(%mods)) {
+ if ($exclude{ $mods{$_} }) {
+ delete($mods{$_});
+ }
+}
+
+my %mod_libdir = map {
+ (my $lib_dir = $_) =~ s/[\\\/]$mods{$_}\z//;
+ $_ => $lib_dir;
+} keys %mods;
+
+my @non_core_non_arch = ( $file_names{'Devel/GlobalDestruction.pm'} );
+
+push @non_core_non_arch, grep {
+ local $_ = $mod_libdir{$_};
+ not (
+ /[\\\/]\Q$Config{archname}\E\z/
+ or /[\\\/]\Q$Config{myarchname}\E\z/
+ #some of the config variables can be empty which will eval as a matching regex
+ or $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}/
+ )
+} keys %mods;
+
+my @core_non_arch = grep {
+ local $_ = $mod_libdir{$_};
+ $Config{privlibexp} ne '' && /^\Q$Config{privlibexp}/
+ and not($Config{archlibexp} ne '' && /^\Q$Config{archlibexp}/
+ or /[\\\/]\Q$Config{archname}\E\z/ or /[\\\/]\Q$Config{myarchname}\E\z/)
+} keys %mods;
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
+
+$start .= 'my %exclude = map { $_ => 1 } (\'' . join("','", @exclude_mods) . "');\n";
+
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]}) {
+ if ($exclude{$_[1]}) {
+ warn "Will not pre-load '$_[1]'";
+ return undef;
+ }
+
+ #warn "Handling $_[1]";
open my $fh, '<', \$fat;
return $fh;
}
+
#Uncomment this to find brokenness
#warn "Missing $_[1]";
- return
- };
+ return;
+ }
+
+ unshift @INC, sub { load_from_hash(\%fatpacked, $_[1]) };
+ push @INC, sub { load_from_hash(\%fatpacked_extra, $_[1]) };
} # END OF FATPACK CODE
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, $/) = ($_); <> }),
- @non_core_non_arch;
+ @non_core_non_arch, @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!
- .qq!${data}${name}\n!;
-} sort keys %files;
+ my $data = $files{$orig} or die $orig; $data =~ s/^/ /mg;
+ $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{$_}, @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;