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

diff --git a/lib/Distar.pm b/lib/Distar.pm
index f6d02d5..2efc6d2 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,16 +138,17 @@ 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`;
-    if ($version =~ /GNU tar/) {
-      $gtar = 1;
-    }
-    elsif (!$pre_tar && `gtar --version`) {
-      $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]+)$/) {
@@ -168,8 +170,23 @@ sub write_manifest_skip {
         $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;
+        }
       }
     }
 
@@ -201,11 +218,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,9 +227,9 @@ 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 : ''),
@@ -223,6 +237,11 @@ END_FRAG
       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(@_);
@@ -244,6 +263,8 @@ check-cpan-upload:
 	$(NOECHO) cpan-upload -h $(DEV_NULL_STDOUT)
 releasetest:
 	$(MAKE) disttest RELEASE_TESTING=1 DISTTEST_MAKEFILE_PARAMS="PREREQ_FATAL=1" PASTHRU="$(PASTHRU) TEST_FILES=\"$(TEST_FILES)\""
+	$(NOECHO) $(TEST_F) $(DISTVNAME)/LICENSE || $(ECHO) "Failed to generate $(DISTVNAME)/LICENSE!" >&2
+	$(NOECHO) $(TEST_F) $(DISTVNAME)/LICENSE
 release: preflight
 	$(MAKE) releasetest
 	$(GET_CHANGELOG) -p"Release commit for $(VERSION)" | git commit -a -F -
@@ -265,10 +286,10 @@ $(DISTVNAME)/README: $(VERSION_FROM)
 	$(NOECHO) $(ABSPERLRUN) $(HELPERS)/add-to-manifest -d $(DISTVNAME) README
 distsignature: readmefile licensefile
 licensefile: create_distdir
-	$(NOECHO) $(TEST_F) $(DISTVNAME)/LICENSE || $(MAKE) $(DISTVNAME)/LICENSE
+	$(NOECHO) $(TEST_F) $(DISTVNAME)/LICENSE || $(MAKE) $(DISTVNAME)/LICENSE || $(TRUE)
 $(DISTVNAME)/LICENSE: Makefile.PL
 	$(NOECHO) $(MKPATH) $(DISTVNAME)
-	$(ABSPERLRUN) $(HELPERS)/generate-license $(AUTHORS) $(LICENSES) >$(DISTVNAME)/LICENSE
+	$(ABSPERLRUN) $(HELPERS)/generate-license -o $(DISTVNAME)/LICENSE $(AUTHORS) $(LICENSES)
 	$(NOECHO) $(ABSPERLRUN) $(HELPERS)/add-to-manifest -d $(DISTVNAME) LICENSE
 disttest: distmanicheck
 distmanicheck: create_distdir
@@ -276,7 +297,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