probably improve the release stuff

[p5sagit/Distar.git] / lib / Distar.pm

diff --git a/lib/Distar.pm b/lib/Distar.pm
index e10fcb5..93b7d11 100644 (file)
--- a/lib/Distar.pm
+++ b/lib/Distar.pm
@@ -14,13 +14,15 @@ sub import {
 
 sub author { our $Author = shift }
 
+our $Ran_Preflight;
+
 our @Manifest = (
   'lib' => '.pm',
   't' => '.t',
   't/lib' => '.pm',
   'xt' => '.t',
   'xt/lib' => '.pm',
-  '' => '.PL',
+  '' => qr{[^/]*\.PL},
   '' => qr{Changes|MANIFEST|README|META\.yml},
   'maint' => qr{[^.].*},
 );
@@ -50,9 +52,16 @@ sub write_manifest_skip {
 }
 
 sub run_preflight {
+  $Ran_Preflight = 1;
+
   system("git fetch");
 
+  for (scalar `make manifest 2>&1 >/dev/null`) {
+    $_ && die "make manifest changed:\n$_ Go check it and retry";
+  }
+
   for (scalar `git status`) {
+    /^# On branch master/ || die "Not on master. EEEK";
     /Your branch is (behind|ahead of)/ && die "Not synced with upstream";
   }
 
@@ -72,13 +81,14 @@ sub run_preflight {
 sub MY::postamble { <<'END'; }
 preflight:
        perl -IDistar/lib -MDistar -erun_preflight $(VERSION)
-upload: preflight $(DISTVNAME).tar$(SUFFIX)
+release: preflight disttest
+       rm -rf $(DISTVNAME)
+       $(MAKE) $(DISTVNAME).tar$(SUFFIX)
        cpan-upload $(DISTVNAME).tar$(SUFFIX)
-release: upload
        git commit -a -m "Release commit for $(VERSION)"
-       git tag release_$(VERSION)
-       git push
+       git tag v$(VERSION) -m "release v$(VERSION)"
        git push --tags
+       git push
 distdir: readmefile
 readmefile: create_distdir
        pod2text $(VERSION_FROM) >$(DISTVNAME)/README
@@ -93,13 +103,13 @@ END
     ExtUtils::MakeMaker::WriteMakefile(
       LICENSE => 'perl',
       @_, AUTHOR => our $Author, ABSTRACT_FROM => $args{VERSION_FROM},
-      test => { TESTS => ($args{test}{TESTS}||'').' xt/*.t' },
+      test => { TESTS => ($args{test}{TESTS}||'t/*.t').' xt/*.t' },
     );
   }
 }
 
 END {
-  write_manifest_skip()
+  write_manifest_skip() unless $Ran_Preflight
 }
 
 1;