X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDistar.pm;h=72b8c2ddbbb7c26257fbec4617ecc94d2c657dbf;hb=9af7ff2e588277fe294352d7acae45a35b2a6698;hp=549f084750b23d84dfbe87e680f4a583e0e1b3db;hpb=576656c4cd7b8c137e84b2a15d43d2d35bbd5173;p=p5sagit%2FDistar.git diff --git a/lib/Distar.pm b/lib/Distar.pm index 549f084..72b8c2d 100644 --- a/lib/Distar.pm +++ b/lib/Distar.pm @@ -122,15 +122,15 @@ sub run_preflight { { package Distar::MM; - our @ISA = @ExtUtils::MM::ISA; - @ExtUtils::MM::ISA = (__PACKAGE__); + our @ISA = @MM::ISA; + @MM::ISA = (__PACKAGE__); sub new { my ($class, $args) = @_; return $class->SUPER::new({ LICENSE => 'perl_5', MIN_PERL_VERSION => '5.006', - AUTHOR => ($MM_VER >= 6.5702 ? $Distar::Author : $Distar::Author->[0]), + AUTHOR => ($MM_VER >= 6.5702 ? $Distar::Author : join(', ', @$Distar::Author)), %$args, ABSTRACT_FROM => $args->{VERSION_FROM}, test => { TESTS => ($args->{test}{TESTS}||'t/*.t').' xt/*.t xt/*/*.t' }, @@ -156,6 +156,7 @@ sub run_preflight { $include = "\n# --- Makefile.include:\n" . do { local $/; <$fh> }; } + $dist_test .= "REMAKE = \$(PERLRUN) Makefile.PL @{[ map { $self->quote_literal($_) } @ARGV ]}"; $dist_test .= <<'END' # --- Distar section: @@ -179,6 +180,10 @@ distmanicheck: create_distdir nextrelease: $(ABSPERLRUN) Distar/helpers/add-changelog-heading $(VERSION) Changes git add -p Changes +refresh: + cd Distar && git pull + rm Makefile + $(REMAKE) END for my $type ('', 'minor', 'major') { @@ -186,8 +191,9 @@ END my $arg = $type || '$(V)'; $dist_test .= <<"END" bump$type: - Distar/helpers/bump-version \$(VERSION) $arg + Distar/helpers/bump-version --git \$(VERSION) $arg rm Makefile + \$(REMAKE) END } }