From 19f383cb544d837d6b6dc5325fa43b610751b4aa Mon Sep 17 00:00:00 2001 From: "Andreas J. Koenig" Date: Sun, 19 Oct 2008 15:14:29 +0200 Subject: [PATCH] ready to release --- MANIFEST | 6 ++++-- MANIFEST.SKIP | 13 ++++++------- Makefile.PL | 48 ++++++++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 56 insertions(+), 11 deletions(-) diff --git a/MANIFEST b/MANIFEST index 7fe266d..ce6f609 100644 --- a/MANIFEST +++ b/MANIFEST @@ -1,11 +1,13 @@ +.releaserc Changes lib/Acme/Study/Perl.pm +Makefile.PL MANIFEST MANIFEST.SKIP +META.yml Module meta-data (added by MakeMaker) README +SIGNATURE Public-key signature (added by MakeMaker) t/00-load.t t/pod-coverage.t t/pod.t t/studyperl.t -META.yml Module meta-data (added by MakeMaker) -SIGNATURE Public-key signature (added by MakeMaker) diff --git a/MANIFEST.SKIP b/MANIFEST.SKIP index a3d399a..89fe642 100644 --- a/MANIFEST.SKIP +++ b/MANIFEST.SKIP @@ -1,14 +1,13 @@ git-daemon-export-ok -blib/ -Makefile -Makefile.old -Build +^blib/ +^Makefile$ +^Makefile.old$ ^_build ^pm_to_blib.* .*.tar.gz$ -\.lwpcookies +^\.lwpcookies ^Acme-Study-Perl- -cover_db +^cover_db ^.git ~$ -MANIFEST.bak +^MANIFEST.bak diff --git a/Makefile.PL b/Makefile.PL index 210f7e7..01ad2f4 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -3,6 +3,41 @@ use warnings; use ExtUtils::MakeMaker; $ExtUtils::MakeMaker::VERSION =~ s/_//g; my @sign = (MM->can("signature_target") ? (SIGN => 1) : ()); +my $version_diff = 0; # we'll have to die if this becomes true +my $version_from = 'lib/Acme/Study/Perl.pm'; +my $version; +{ + open my $fh, "<", $version_from or die "Could not open $version_from: $!"; + my @version = grep /VERSION\s*=\s*qv/, <$fh>; + our $VERSION; + eval $version[0]; + $version = $VERSION; +} +if ($ARGV[0] && $ARGV[0] eq "--setversion") { + die "Your perl is a bit dated[$]].\nDo not make a release with it\n" if $] < 5.008; + warn "Your MakeMaker is a bit dated[$ExtUtils::MakeMaker::VERSION].\nYou should get a new one\n" + if $ExtUtils::MakeMaker::VERSION < 6.4502; + eval { require $version_from; }; die $@ if $@; + my $makefile = "Makefile"; + unless (-f $makefile) { + $makefile = "Makefile.old"; + } + unless (-f $makefile) { + die "no Makefile and no Makefile.old found"; + } + open my $fh, "make the-release-name|" or die "Could not fork: $!"; + local $/; + my ($have_version) = <$fh> =~ /^version\s+([\d\._]+)/m; + close $fh or die "Could not close: $!"; + my ($namespace) = $version_from; + $namespace =~ s|^lib/(.+)\.pm$|$1|; + $namespace =~ s|/|::|g; + eval qq{ if (\$$namespace\::VERSION != \$have_version) { + warn "Not equal: CPAN::Testers::ParseReport::VERSION[\$$namespace\::VERSION] Makefile version[\$have_version]"; + \$version_diff = 1; + }}; +} + WriteMakefile ( @@ -15,7 +50,16 @@ WriteMakefile 'Data::Dumper' => 0, 'Test::More' => 0, }, - dist => { COMPRESS => 'gzip -9f', SUFFIX => '.gz', }, + dist => { + DIST_DEFAULT => join(" ", # note: order matters! + "Makefile", + "META.yml", + "setversion", + "all", + "tardist", + ), + COMPRESS => 'gzip -9', + }, ($ExtUtils::MakeMaker::VERSION >= 6.4502 ? (META_ADD => { # write: git push git+ssh://repo.or.cz/srv/git/acme-study-perl.git master @@ -28,7 +72,7 @@ package MY; sub postamble { my @m; push @m, q{ -Makefile: MANIFEST +Makefile: META.yml: metafile $(CP) $(DISTVNAME)/META.yml ./META.yml -- 2.11.4.GIT