X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDistar.pm;h=804f684daaa499d9a3603553e7b5569f326a2a21;hb=66a2ecde04b7004b20253b7a777ffbc8997c5504;hp=954f412e423b27d91cfa7f380142787408e10bf9;hpb=e9f66489a0c3385f27be2f22b4718e73c09afafb;p=p5sagit%2FDistar.git

diff --git a/lib/Distar.pm b/lib/Distar.pm
index 954f412..804f684 100644
--- a/lib/Distar.pm
+++ b/lib/Distar.pm
@@ -117,20 +117,30 @@ sub write_manifest_skip {
 
   sub dist_test {
     my $self = shift;
-    my $dist_test = $self->SUPER::dist_test(@_);
 
-    $dist_test .= <<"END";
+    my $include = '';
+    if (open my $fh, '<', 'maint/Makefile.include') {
+      $include = "\n# --- Makefile.include:\n\n" . do { local $/; <$fh> };
+      $include =~ s/\n?\z/\n/;
+    }
 
-# --- Distar section:
+    my @bump_targets =
+      grep { $include !~ /^bump$_(?: +\w+)*:/m } ('', 'minor', 'major');
 
-REMAKE = \$(PERLRUN) Makefile.PL @{[ map { $self->quote_literal($_) } @ARGV ]}
+    my %vars = (
+      REMAKE => join(' ', '$(PERLRUN)', 'Makefile.PL', map { $self->quote_literal($_) } @ARGV),
+    );
+
+    join('',
+      $self->SUPER::dist_test(@_),
+      "\n\n# --- Distar section:\n\n",
+      (map "$_ = $vars{$_}\n", sort keys %vars),
+      <<'END',
 
-END
-    $dist_test .= <<'END';
 preflight:
 	$(ABSPERLRUN) Distar/helpers/preflight $(VERSION)
 releasetest:
-	$(MAKE) disttest RELEASE_TESTING=1 TEST_FILES="$(TEST_FILES)"
+	$(MAKE) disttest RELEASE_TESTING=1 PASTHRU="$(PASTHRU) TEST_FILES=\"$(TEST_FILES)\""
 release: preflight releasetest
 	$(RM_RF) $(DISTVNAME)
 	$(MAKE) $(DISTVNAME).tar$(SUFFIX)
@@ -155,27 +165,15 @@ refresh:
 	$(RM_F) $(FIRST_MAKEFILE)
 	$(REMAKE)
 END
-
-    my $include = '';
-    if (open my $fh, '<', 'maint/Makefile.include') {
-      $include = "\n# --- Makefile.include:\n" . do { local $/; <$fh> };
-    }
-
-    for my $type ('', 'minor', 'major') {
-      if ($include !~ /^bump$type:/m) {
-        my $arg = $type || '$(V)';
-        $dist_test .= <<"END"
-bump$type:
-	\$(ABSPERLRUN) Distar/helpers/bump-version --git \$(VERSION) $arg
-	\$(RM_F) \$(FIRST_MAKEFILE)
-	\$(REMAKE)
+      map(sprintf(<<'END', "bump$_", ($_ || '$(V)')), @bump_targets),
+%s:
+	$(ABSPERLRUN) Distar/helpers/bump-version --git $(VERSION) %s
+	$(RM_F) $(FIRST_MAKEFILE)
+	$(REMAKE)
 END
-      }
-    }
-
-    $dist_test .= $include . "\n";
-
-    return $dist_test;
+      $include,
+      "\n",
+    );
   }
 }