X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDistar.pm;h=a3197e8ff5e018df6e207c4993c2ef879cf4ff8f;hb=87c14395b8b86c3ede74d1cef96ed1889ab9d901;hp=f94a76287b36a1124d222809b582c95e4680dc9f;hpb=a5b3931e8604b68af4895d3de0b094bfa14ebf24;p=p5sagit%2FDistar.git

diff --git a/lib/Distar.pm b/lib/Distar.pm
index f94a762..a3197e8 100644
--- a/lib/Distar.pm
+++ b/lib/Distar.pm
@@ -5,6 +5,7 @@ use base qw(Exporter);
 use ExtUtils::MakeMaker ();
 use ExtUtils::MM ();
 use File::Spec ();
+use File::Basename ();
 
 our $VERSION = '0.003000';
 $VERSION = eval $VERSION;
@@ -137,14 +138,15 @@ sub write_manifest_skip {
     my $pre_tar = $self->{TAR};
     my $out = $self->SUPER::init_dist(@_);
 
+    my $dn = File::Spec->devnull;
     my $tar = $self->{TAR};
     my $gtar;
     my $set_user;
-    my $version = `$tar --version`;
+    my $version = `$tar --version 2>$dn`;
     if ($version =~ /GNU tar/) {
       $gtar = 1;
     }
-    elsif (!$pre_tar && `gtar --version`) {
+    elsif (!$pre_tar && `gtar --version 2>$dn`) {
       $tar = 'gtar';
       $gtar = 1;
     }
@@ -201,11 +203,8 @@ END_FRAG
     my @bump_targets =
       grep { $include !~ /^bump$_(?: +\w+)*:/m } ('', 'minor', 'major');
 
-    my $distar = File::Spec->catdir(
-      File::Spec->catpath((File::Spec->splitpath(__FILE__))[0,1], ''),
-      File::Spec->updir,
-    );
-    my $helpers = File::Spec->catdir($distar, 'helpers');
+    my $distar_lib = File::Basename::dirname(__FILE__);
+    my $helpers = File::Spec->catdir($distar_lib, File::Spec->updir, 'helpers');
 
     my $licenses = $self->{LICENSE} || $self->{META_ADD}{license} || $self->{META_MERGE}{license};
     my $authors = $self->{AUTHOR};
@@ -213,15 +212,21 @@ END_FRAG
       for $licenses, $authors;
 
     my %vars = (
-      DISTAR => $self->quote_literal($distar),
+      DISTAR_LIB => $self->quote_literal($distar_lib),
       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)',
+      UPDATE_DISTAR => (
+        -e File::Spec->catdir($distar_lib, File::Spec->updir, '.git')
+          ? 'git -C $(DISTAR_LIB) pull'
+          : '$(ECHO) "Distar code is not in a git repo, unable to update!"'
+      ),
     );
 
     my $dist_test = $self->SUPER::dist_test(@_);
@@ -245,8 +250,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 +273,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
@@ -276,7 +280,7 @@ distmanicheck: create_distdir
 nextrelease:
 	$(ABSPERLRUN) $(HELPERS)/add-changelog-heading --git $(VERSION) $(CHANGELOG)
 refresh:
-	cd $(DISTAR) && git pull || $(TRUE)
+	$(UPDATE_DISTAR)
 	$(RM_F) $(FIRST_MAKEFILE)
 	$(REMAKE)
 END