From: Karen Etheridge Date: Tue, 11 Aug 2015 21:09:57 +0000 (-0700) Subject: use Distar X-Git-Tag: v0.09~6 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Plugin-Email.git;a=commitdiff_plain;h=c3297ae88619fcf222946f746f98eee8bce8435d;hp=cf76467b860a4960ae23ca2c7a83bd313af6db68 use Distar --- diff --git a/.gitignore b/.gitignore index 2af97ff..cd82aa1 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ !/.gitignore /Catalyst-Plugin-Email-*/ /Catalyst-Plugin-Email-*.tar.gz +/Distar/ diff --git a/Makefile.PL b/Makefile.PL index ff280dc..062303c 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -3,13 +3,12 @@ use warnings; use ExtUtils::MakeMaker; -my $developer = -f '.gitignore'; -ExtUtils::MakeMaker->VERSION('7.00') if $developer; +ExtUtils::MakeMaker->VERSION('7.00') unless -f 'META.yml'; +(do 'maint/Makefile.PL.include' or die $@) unless -f 'META.yml'; my %WriteMakefileArgs = ( NAME => 'Catalyst::Plugin::Email', VERSION_FROM => 'lib/Catalyst/Plugin/Email.pm', - ABSTRACT => 'Send emails with Catalyst', AUTHOR => 'Sebastian Riedel ', LICENSE => 'perl_5', MIN_PERL_VERSION => 5.008, # catalyst minimum @@ -46,7 +45,7 @@ my %WriteMakefileArgs = ( ); die 'need to do a merge with CPAN::Meta::Requirements!!' - if $developer && exists $WriteMakefileArgs{BUILD_REQUIRES}; + if !-f 'META.yml' && exists $WriteMakefileArgs{BUILD_REQUIRES}; if (!eval { ExtUtils::MakeMaker->VERSION('6.6303') }) { $WriteMakefileArgs{BUILD_REQUIRES} = $WriteMakefileArgs{TEST_REQUIRES}; @@ -68,7 +67,7 @@ my %mm_req = ( ); for (keys %mm_req) { unless (eval { ExtUtils::MakeMaker->VERSION($mm_req{$_}) }) { - warn "$_ $@" if $developer; + warn "$_ $@" if not -f 'Makefile.PL'; delete $WriteMakefileArgs{$_}; } } diff --git a/maint/Makefile.PL.include b/maint/Makefile.PL.include new file mode 100644 index 0000000..806efe7 --- /dev/null +++ b/maint/Makefile.PL.include @@ -0,0 +1,5 @@ +BEGIN { -e 'Distar' or system("git clone git://git.shadowcat.co.uk/p5sagit/Distar.git") } +use lib 'Distar/lib'; +use Distar; + +1;