my $tar = $self->{TAR};
my $gtar;
my $set_user;
- my $version = `$tar --version 2>$dn`;
- if ($version =~ /GNU tar/) {
- $gtar = 1;
- }
- elsif (!$pre_tar && `gtar --version 2>$dn`) {
- $tar = 'gtar';
- $gtar = 1;
+ for my $maybe_tar ($tar, qw(gtar gnutar)) {
+ my $version = `$maybe_tar --version 2>$dn`;
+ if ($version =~ /GNU tar/) {
+ $tar = $maybe_tar;
+ $gtar = 1;
+ last;
+ }
}
my $tarflags = $self->{TARFLAGS};
if (my ($flags) = $tarflags =~ /^-?([cvhlLf]+)$/) {
$warn .= ($warn ? ' and ' : '').'gid('.(0+$)).')';
}
if ($warn) {
- warn "$warn too large! Max is ".(2**21-1).".\n"
- ."Dist creation will likely fail. Install GNU tar to work around.\n";
+ warn "Current $warn too large to create portable dist archives! Max is ".(2**21-1).".\n"
+ ."Dist creation will most likely fail. Install GNU tar and re-run Makefile.PL to fix this issue.\n";
+ my @try;
+ my $brew = `which brew 2>$dn`;
+ chomp $brew;
+ if (-x $brew) {
+ push @try, 'brew install gnu-tar';
+ }
+ my $ports = `which ports 2>$dn`;
+ chomp $ports;
+ if (-x $ports) {
+ push @try, 'sudo ports install gnutar';
+ }
+ if (@try) {
+ warn "Try" . (@try > 1 ? ' one of' : '') . ":\n"
+ . join '', map " $_\n", @try;
+ }
}
}
sub dist_test {
my $self = shift;
- my $include = '';
- if (open my $fh, '<', 'maint/Makefile.include') {
- $include = "\n# --- Makefile.include:\n\n" . do { local $/; <$fh> };
- $include =~ s/\n?\z/\n/;
- }
-
- my @bump_targets =
- grep { $include !~ /^bump$_(?: +\w+)*:/m } ('', 'minor', 'major');
-
my $distar_lib = File::Basename::dirname(__FILE__);
my $helpers = File::Spec->catdir($distar_lib, File::Spec->updir, 'helpers');
my $dist_test = $self->SUPER::dist_test(@_);
$dist_test =~ s/(\bMakefile\.PL\b)/$1 \$(DISTTEST_MAKEFILE_PARAMS)/;
- join('',
- $dist_test,
- "\n\n# --- Distar section:\n\n",
- (map "$_ = $vars{$_}\n", sort keys %vars),
- <<'END',
+ my $include = '';
+ if (open my $fh, '<', 'maint/Makefile.include') {
+ $include = do { local $/; <$fh> };
+ $include =~ s/\n?\z/\n/;
+ }
+ my @out;
+
+ push @out, <<'END';
preflight: check-version check-manifest check-cpan-upload
$(ABSPERLRUN) $(HELPERS)/preflight $(VERSION) --changelog=$(CHANGELOG) --branch=$(BRANCH)
check-version:
$(RM_F) $(FIRST_MAKEFILE)
$(REMAKE)
END
- map(sprintf(<<'END', "bump$_", ($_ || '$(V)')), @bump_targets),
+ my @bump_targets =
+ grep { $include !~ /^bump$_(?: +\w+)*:/m } ('', 'minor', 'major');
+
+ for my $target (@bump_targets) {
+ push @out, sprintf <<'END', "bump$target", ($target || '$(V)');
%s:
$(ABSPERLRUN) $(HELPERS)/bump-version --git $(VERSION) %s
$(RM_F) $(FIRST_MAKEFILE)
$(REMAKE)
END
- $include,
+ }
+
+ join('',
+ $dist_test,
+ "\n\n# --- Distar section:\n\n",
+ (map "$_ = $vars{$_}\n", sort keys %vars),
+ "\n",
+ @out,
+ ($include ? (
+ "\n",
+ "# --- Makefile.include:\n",
+ "\n",
+ $include,
+ "\n"
+ ) : ()),
"\n",
);
}