X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDistar.pm;h=eee818825baa3462e1a97dd79b42c1ffe6ca34ff;hb=3a3f2e10c013b0ec16d9c3164f433a329ed42ca8;hp=eebd340c5b57651129294ca20b27faf3b4cc21cd;hpb=7fec23eda18d67a91201fff45cfde1afcf61ae10;p=p5sagit%2FDistar.git

diff --git a/lib/Distar.pm b/lib/Distar.pm
index eebd340..eee8188 100644
--- a/lib/Distar.pm
+++ b/lib/Distar.pm
@@ -8,7 +8,7 @@ use File::Spec ();
 use File::Basename ();
 
 our $VERSION = '0.003000';
-$VERSION = eval $VERSION;
+$VERSION =~ tr/_//d;
 
 my $MM_VER = eval $ExtUtils::MakeMaker::VERSION;
 
@@ -135,46 +135,26 @@ sub write_manifest_skip {
 
   sub init_dist {
     my $self = shift;
-    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 2>$dn`;
-    if ($version =~ /GNU tar/) {
-      $gtar = 1;
-    }
-    elsif (!$pre_tar && `gtar --version 2>$dn`) {
-      $tar = 'gtar';
-      $gtar = 1;
-    }
+
     my $tarflags = $self->{TARFLAGS};
     if (my ($flags) = $tarflags =~ /^-?([cvhlLf]+)$/) {
       if ($flags =~ s/c// && $flags =~ s/f//) {
         $tarflags = '--format=ustar -c'.$flags.'f';
-        if ($gtar) {
-          $tarflags = '--owner=0 --group=0 '.$tarflags;
-          $set_user = 1;
+        my $me = __FILE__;
+        for my $options ('--owner=0 --group=0', '--uid=0 --gid=0') {
+          my $try = `$tar -c $options "$me" 2>$dn`;
+          if (length $try) {
+            $tarflags = "$options $tarflags";
+            last;
+          }
         }
       }
     }
 
-    if (!$set_user) {
-      my $warn = '';
-      if ($> >= 2**21) {
-        $warn .= "uid ($>)";
-      }
-      if ($) >= 2**21) {
-        $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";
-      }
-    }
-
     $self->{TAR} = $tar;
     $self->{TARFLAGS} = $tarflags;
 
@@ -194,17 +174,8 @@ END_FRAG
   sub dist_test {
     my $self = shift;
 
-    my $include = '';
-    if (open my $fh, '<', 'maint/Makefile.include') {
-      $include = "\n# --- Makefile.include:\n\n" . do { local $/; <$fh> };
-      $include =~ s/\n?\z/\n/;
-    }
-
-    my @bump_targets =
-      grep { $include !~ /^bump$_(?: +\w+)*:/m } ('', 'minor', 'major');
-
     my $distar_lib = File::Basename::dirname(__FILE__);
-    my $helpers = File::Spec->catdir($distar_lib, File::Spec->updir, 'helpers');
+    my $helpers = File::Spec->catdir($distar_lib, 'Distar', 'helpers');
 
     my $licenses = $self->{LICENSE} || $self->{META_ADD}{license} || $self->{META_MERGE}{license};
     my $authors = $self->{AUTHOR};
@@ -232,12 +203,15 @@ END_FRAG
     my $dist_test = $self->SUPER::dist_test(@_);
     $dist_test =~ s/(\bMakefile\.PL\b)/$1 \$(DISTTEST_MAKEFILE_PARAMS)/;
 
-    join('',
-      $dist_test,
-      "\n\n# --- Distar section:\n\n",
-      (map "$_ = $vars{$_}\n", sort keys %vars),
-      <<'END',
+    my $include = '';
+    if (open my $fh, '<', 'maint/Makefile.include') {
+      $include = do { local $/; <$fh> };
+      $include =~ s/\n?\z/\n/;
+    }
+
+    my @out;
 
+    push @out, <<'END';
 preflight: check-version check-manifest check-cpan-upload
 	$(ABSPERLRUN) $(HELPERS)/preflight $(VERSION) --changelog=$(CHANGELOG) --branch=$(BRANCH)
 check-version:
@@ -286,13 +260,31 @@ refresh:
 	$(RM_F) $(FIRST_MAKEFILE)
 	$(REMAKE)
 END
-      map(sprintf(<<'END', "bump$_", ($_ || '$(V)')), @bump_targets),
+    my @bump_targets =
+      grep { $include !~ /^bump$_(?: +\w+)*:/m } ('', 'minor', 'major');
+
+    for my $target (@bump_targets) {
+      push @out, sprintf <<'END', "bump$target", ($target || '$(V)');
 %s:
 	$(ABSPERLRUN) $(HELPERS)/bump-version --git $(VERSION) %s
 	$(RM_F) $(FIRST_MAKEFILE)
 	$(REMAKE)
 END
-      $include,
+    }
+
+    join('',
+      $dist_test,
+      "\n\n# --- Distar section:\n\n",
+      (map "$_ = $vars{$_}\n", sort keys %vars),
+      "\n",
+      @out,
+      ($include ? (
+        "\n",
+        "# --- Makefile.include:\n",
+        "\n",
+        $include,
+        "\n"
+      ) : ()),
       "\n",
     );
   }