X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDistar.pm;h=f6d02d566f0d6936e80f50b5fe18776de2be46f5;hb=c6b7b384edb5edad4f74a1e30a7c6bad569ba2b8;hp=fcdc97d3eaead51286a8934867532eb4b3dfd63a;hpb=f5cc9f5357fd99a338e42f27eaf1e9d252c4d747;p=p5sagit%2FDistar.git

diff --git a/lib/Distar.pm b/lib/Distar.pm
index fcdc97d..f6d02d5 100644
--- a/lib/Distar.pm
+++ b/lib/Distar.pm
@@ -22,7 +22,7 @@ sub import {
     @Distar::MM::ISA = @MM::ISA;
     @MM::ISA = qw(Distar::MM);
   }
-  shift->export_to_level(1,@_);
+  goto &Exporter::import;
 }
 
 sub author {
@@ -215,13 +215,14 @@ END_FRAG
     my %vars = (
       DISTAR => $self->quote_literal($distar),
       HELPERS => $self->quote_literal($helpers),
-      REMAKE => join(' ', '$(PERLRUN)', '-I$(DISTAR)/lib', '-mDistar', 'Makefile.PL', map { $self->quote_literal($_) } @ARGV),
+      REMAKE => join(' ', '$(PERLRUN)', '-I$(DISTAR)/lib', '-MDistar', 'Makefile.PL', map { $self->quote_literal($_) } @ARGV),
       BRANCH => $self->{BRANCH} ||= 'master',
       CHANGELOG => $self->{CHANGELOG} ||= 'Changes',
       DEV_NULL_STDOUT => ($self->{DEV_NULL} ? '>'.File::Spec->devnull : ''),
       DISTTEST_MAKEFILE_PARAMS => '',
       AUTHORS => $self->quote_literal(join(', ', @$authors)),
       LICENSES => join(' ', map $self->quote_literal($_), @$licenses),
+      GET_CHANGELOG => '$(ABSPERLRUN) $(HELPERS)/get-changelog $(VERSION) $(CHANGELOG)',
     );
 
     my $dist_test = $self->SUPER::dist_test(@_);
@@ -245,8 +246,8 @@ releasetest:
 	$(MAKE) disttest RELEASE_TESTING=1 DISTTEST_MAKEFILE_PARAMS="PREREQ_FATAL=1" PASTHRU="$(PASTHRU) TEST_FILES=\"$(TEST_FILES)\""
 release: preflight
 	$(MAKE) releasetest
-	git commit -a -m "Release commit for $(VERSION)"
-	git tag v$(VERSION) -m "release v$(VERSION)"
+	$(GET_CHANGELOG) -p"Release commit for $(VERSION)" | git commit -a -F -
+	$(GET_CHANGELOG) -p"release v$(VERSION)" | git tag -a -F - "v$(VERSION)"
 	$(RM_RF) $(DISTVNAME)
 	$(MAKE) $(DISTVNAME).tar$(SUFFIX)
 	$(NOECHO) $(MAKE) pushrelease FAKE_RELEASE=$(FAKE_RELEASE)
@@ -268,7 +269,6 @@ licensefile: create_distdir
 $(DISTVNAME)/LICENSE: Makefile.PL
 	$(NOECHO) $(MKPATH) $(DISTVNAME)
 	$(ABSPERLRUN) $(HELPERS)/generate-license $(AUTHORS) $(LICENSES) >$(DISTVNAME)/LICENSE
-	$(NOECHO) cd $(DISTVNAME) && $(ABSPERLRUN) $(HELPERS)/add-to-manifest LICENSE
 	$(NOECHO) $(ABSPERLRUN) $(HELPERS)/add-to-manifest -d $(DISTVNAME) LICENSE
 disttest: distmanicheck
 distmanicheck: create_distdir