X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDistar.pm;h=510e3e7c8b288de8da3aae22541cabcf9f138370;hb=a69e85aab1581b3acfe74224afa816431ed63e22;hp=0c2124aa7464471230bf6a208c2161c52d069d8f;hpb=81d518f6f2a71347e8b665abd7254e28dac7d3f3;p=p5sagit%2FDistar.git diff --git a/lib/Distar.pm b/lib/Distar.pm index 0c2124a..510e3e7 100644 --- a/lib/Distar.pm +++ b/lib/Distar.pm @@ -6,10 +6,7 @@ use base qw(Exporter); use ExtUtils::MakeMaker (); use ExtUtils::MM (); -use Config; -use File::Spec; - -our $VERSION = '0.001000'; +our $VERSION = '0.002000'; $VERSION = eval $VERSION; my $MM_VER = eval $ExtUtils::MakeMaker::VERSION; @@ -38,7 +35,7 @@ our @Manifest = ( 'xt' => '.t', 'xt/lib' => '.pm', '' => qr{[^/]*\.PL}, - '' => qr{Changes|MANIFEST|README|META\.yml}, + '' => qr{Changes|MANIFEST|README|LICENSE|META\.yml}, 'maint' => qr{[^.].*}, ); @@ -46,12 +43,8 @@ sub manifest_include { push @Manifest, @_; } -my $readme_generator = <<'README'; - pod2text $(VERSION_FROM) >$(DISTVNAME)/README - $(NOECHO) cd $(DISTVNAME) && $(ABSPERLRUN) ../Distar/helpers/add-readme-to-manifest -README sub readme_generator { - $readme_generator = shift; + die "readme_generator unsupported" if @_ && $_[0]; } sub write_manifest_skip { @@ -124,9 +117,11 @@ release: preflight cpan-upload $(DISTVNAME).tar$(SUFFIX) git push origin v$(VERSION) HEAD distdir: readmefile -readmefile: create_distdir -END - . $readme_generator . <<'END'; +readmefile: create_distdir $(DISTVNAME)/README + $(NOECHO) cd $(DISTVNAME) && $(ABSPERLRUN) ../Distar/helpers/add-to-manifest README +$(DISTVNAME)/README: $(VERSION_FROM) + $(NOECHO) $(MKPATH) $(DISTVNAME) + pod2text $(VERSION_FROM) >$(DISTVNAME)/README disttest: distmanicheck distmanicheck: create_distdir cd $(DISTVNAME) && $(ABSPERLRUN) "-MExtUtils::Manifest=manicheck" -e "exit manicheck"