Pack succesfully on 5.10.1

Pass @inc as PERL5LIB to the inner perl invocation in App::FatPacker::trace().
For some reason my 5.26.1 installation didn't require that, but my 5.10.1
installation does.

Author: Chris White

.gitignore

@@ -51,3 +51,6 @@ inc/
 
 # Capture::Tiny
 DEBUG*
+
+# App::FatPacker
+*.trace

pack.PL

@@ -4,6 +4,9 @@
 
 use strict;
 use warnings;
+use 5.010001;
+
+exit main();
 
 #############################
 # Custom packer that will only pack Text::PerlPP and Getopt::Long.
@@ -16,72 +19,112 @@ use warnings;
 
 use parent 'App::FatPacker';
 
+#sub trace {
+#    my $self = shift;
+#    say STDERR "Entering trace(); \@INC contains:\n", join("\n", @INC);
+#    $self->SUPER::trace(@_);
+#}
+
 sub collect_files {
   my ($self, $dir, $files) = @_;
 
   my %innerfiles;
   $self->SUPER::collect_files($dir, \%innerfiles);
   my @filenames = grep { m{Text/PerlPP} || m{Getopt/Long} } keys %innerfiles;
   @{$files}{@filenames} = @innerfiles{@filenames};
-}
+} #MyPacker::collect_files()
 
 #############################
-# Main routine
 
 package main;
 
-my $packer = MyPacker->new;
-my $packed;
+sub update_environment {
+    # Make sure PERL5LIB has everything in @INC - somehow the lib directory
+    # is getting lost on perl 5.10.1 (perlbrew, cygwin x86).
+    #say STDERR "\@INC contains:\n", join("\n", @INC);
+    #say STDERR "PERL5LIB is ", $ENV{PERL5LIB} // "<<undef>>";
+
+    my $path_sep;
+    my $separ = qx{$^X -V:path_sep};
+    $separ =~ s/^\$?/\$/;
+    eval $separ;    # updates $path_sep
+
+    my $paths = join($path_sep, @INC);
+    unless($ENV{PERL5LIB}) {
+        $ENV{PERL5LIB} = $paths;
+    } else {
+        $ENV{PERL5LIB} =~ s/$path_sep?$/$path_sep$paths/;
+    }
+    #say STDERR "PERL5LIB is now $ENV{PERL5LIB}";
+} #update_environment()
+
+#############################
+# Main routine
 
-do {
-    open my $savedstdout, '>&', STDOUT or die $!;     # save stdout
-    close STDOUT;
+sub main {
+    update_environment;
 
-    open STDOUT, '>>', \$packed;        # capture packed text on stdout
-    $packer->script_command_pack(['bin/perlpp']);
-    close STDOUT;
+    my $packer = MyPacker->new;
+    my $packed;
 
-    open STDOUT, '>&', $savedstdout;                # restore stdout
-};
+    say STDERR "Packing...";
+    do {
+        open my $savedstdout, '>&', STDOUT or die $!;     # save stdout
+        close STDOUT;
 
-# Clean up, and move the Text::PerlPP pod where pod2usage can find it
+        open STDOUT, '>>', \$packed;        # capture packed text on stdout
+        $packer->script_command_pack(['bin/perlpp']);
+        close STDOUT;
 
-my @lines;          # For the source
-my @podlines;       # For the POD we're going to move
+        open STDOUT, '>&', $savedstdout;                # restore stdout
+    };
+    say STDERR "...done";
 
-my ($in_getopt, $in_text, $in_doc);
-open my $iter, '<', \$packed;
+    # Clean up, and move the Text::PerlPP pod where pod2usage can find it
 
-while(<$iter>) {
-    chomp;
-    s/\s+$//;
+    my @lines;          # For the source
+    my @podlines;       # For the POD we're going to move
 
-    $in_getopt = m{fatpacked\S+Getopt/Long} .. m{^GETOPT_LONG};
-    $in_text = m{fatpacked\S+Text/PerlPP} .. m{^TEXT_PERLPP};
-    $in_doc = /^  =head1 NAME/ .. /^  =cut/;
-        # have to test indentation level because the POD for Getopt::Long
-        # includes a quoted POD sample
+    my ($in_getopt, $in_text, $in_doc);
 
-    #print STDERR "$in_getopt\t$in_text\t$in_doc\t$_\n";
+    say STDERR "Cleanup...";
+    open my $iter, '<', \$packed;
 
-    next if $in_getopt && $in_doc;      # no POD for Getopt::Long
-    if($in_text && $in_doc && ($in_text !~ /E0$/)) {
-        s/^  //;
-        push @podlines, $_;
-    } else {
-        push @lines, $_ if $_;
+    while(<$iter>) {
+        chomp;
+        s/\s+$//;
+
+        $in_getopt = m{fatpacked\S+Getopt/Long} .. m{^GETOPT_LONG};
+        $in_text = m{fatpacked\S+Text/PerlPP} .. m{^TEXT_PERLPP};
+        $in_doc = /^  =head1 NAME/ .. /^  =cut/;
+            # have to test indentation level because the POD for Getopt::Long
+            # includes a quoted POD sample
+
+        #print STDERR "$in_getopt\t$in_text\t$in_doc\t$_\n";
+
+        next if $in_getopt && $in_doc;      # no POD for Getopt::Long
+        if($in_text && $in_doc && ($in_text !~ /E0$/)) {
+            s/^  //;
+            push @podlines, $_;
+        } else {
+            push @lines, $_ if $_;
+        }
     }
-}
-close $iter;
-undef $packed;
-
-# Output in the appropriate order
-open my $fh, '>', 'blib/perlpp';
-print $fh "$_\n" for @lines;
-print $fh "__END__\n=pod\n\n";
-print $fh "$_\n" for @podlines;
-close $fh;
-
-print STDERR "Done packing\n";
+    close $iter;
+    undef $packed;
+    say STDERR "...done";
+
+    # Output in the appropriate order
+    say STDERR "Generating blib/perlpp...";
+    open my $fh, '>', 'blib/perlpp';
+    print $fh "$_\n" for @lines;
+    print $fh "__END__\n=pod\n\n";
+    print $fh "$_\n" for @podlines;
+    close $fh;
+
+    print STDERR "Done packing\n";
+
+    return 0;
+} #main()
 
 # vi: set ts=4 sts=4 sw=4 et ai: #

t/06-macro.t

@@ -4,7 +4,6 @@ use strict;
 use warnings;
 use Test::More 'no_plan';
 use IPC::Run3;
-use Text::PerlPP;
 use constant CMD => ($ENV{PERLPP_CMD} || 'perl -Iblib/lib blib/script/perlpp');
 
 (my $whereami = __FILE__) =~ s/06-macro\.t$//;