Skip to content

Commit

Permalink
Exclude bin/man in MANIFEST.SKIP instead.
Browse files Browse the repository at this point in the history
This makes the MANIFEST, so everything I did before is worthless.
  • Loading branch information
briandfoy committed Sep 14, 2020
1 parent 1c31ccb commit 511c165
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 23 deletions.
6 changes: 0 additions & 6 deletions MANIFEST
Expand Up @@ -55,11 +55,6 @@ bin/look
bin/ls
bin/mail
bin/make
# bin/man doesn't actually work and is heavily tied to unix utilities
# that we don't provide or no longer exist in standard setups. I'm
# temporarily kicking this out of PerlPowerTools until someone
# complains about it.
# bin/man
bin/maze
bin/mimedecode
bin/mkdir
Expand Down Expand Up @@ -145,5 +140,4 @@ t/pod.t
t/rot13.t
t/sort.t
t/true.t
TODO
xt/changes.t
6 changes: 6 additions & 0 deletions MANIFEST.SKIP
Expand Up @@ -72,3 +72,9 @@ MANIFEST\s
Changes\s
Makefile\s
MYMETA\s
\B\.github/
\bTODO\b

# This program isn't working and has Perl 4 dependencies
# https://github.com/briandfoy/PerlPowerTools/issues/92
bin/man
16 changes: 15 additions & 1 deletion Makefile.PL
Expand Up @@ -77,8 +77,22 @@ HERE
push @ARGV, "INSTALL_BASE=$path";
}

my @exe_files = glob "bin/*";

open my $manifest_fh, '<:utf8', 'MANIFEST'
or die "Could not open MANIFEST: $!";

my @exe_files;
while( <$manifest_fh> ) {
chomp;
next if /\A\s*#/;
s/\s*#.*$//;
next unless m|\Abin/|;
push @exe_files, $_;
}

print "EXE_FILES [@exe_files]\n";

close $manifest_fh;

my $module = __PACKAGE__;
( my $dist = $module ) =~ s/::/-/g;
Expand Down
17 changes: 1 addition & 16 deletions t/compile.t
Expand Up @@ -8,22 +8,7 @@ diag(
$ENV{PERL5LIB} = join $Config{path_sep}, @INC;
diag( "PERL5LIB: $ENV{PERL5LIB}" ) if $ENV{DEBUG};

# Even programs not in MANIFEST, but they are in the repo and CI
# still catches it
open my $manifest_fh, '<:utf8', 'MANIFEST'
or die "Could not open MANIFEST: $!";

my @programs;
while( <$manifest_fh> ) {
chomp;
next if /\A\s*#/;
s/\s*#.*//;
next unless m|\Abin/|;
s{bin/}{blib/script/};
push @programs, $_;
}

close $manifest_fh;
my @programs = glob( 'blib/script/*' );

my %NeedsExternalModule = map { ( "blib/script/$_" => 1 ) } qw(awk make mimedecode);

Expand Down

0 comments on commit 511c165

Please sign in to comment.