From: Graham Knop <haarg@haarg.org>
Date: Mon, 18 Aug 2014 20:58:30 +0000 (-0400)
Subject: update Makefile.PL boilerplate
X-Git-Tag: v0.28~7
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=e63446b02db5858b406b2fab78304fa76588d160;p=gitmo%2FClass-C3.git

update Makefile.PL boilerplate
---

diff --git a/Makefile.PL b/Makefile.PL
index 5f53c66..7ca6203 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -62,47 +62,6 @@ my %MM_ARGS = (
   },
 );
 
-##############################################################################
-require ExtUtils::MakeMaker;
-(do 'maint/Makefile.PL.include' or die $@) unless -f 'META.yml';
-
-# have to do this since old EUMM dev releases miss the eval $VERSION line
-my $eumm_version  = eval $ExtUtils::MakeMaker::VERSION;
-my $mymeta        = $eumm_version >= 6.57_02;
-my $mymeta_broken = $mymeta && $eumm_version < 6.57_07;
-
-($MM_ARGS{NAME} = $META{name}) =~ s/-/::/g;
-($MM_ARGS{VERSION_FROM} = "lib/$MM_ARGS{NAME}.pm") =~ s{::}{/}g;
-$MM_ARGS{LICENSE} = $META{license}
-  if $eumm_version >= 6.30;
-$MM_ARGS{NO_MYMETA} = 1
-  if $mymeta_broken;
-$MM_ARGS{META_ADD} = { 'meta-spec' => { version => 2 }, %META }
-  unless -f 'META.yml';
-
-for (qw(configure build test runtime)) {
-  my $key = $_ eq 'runtime' ? 'PREREQ_PM' : uc $_.'_REQUIRES';
-  my $r = $MM_ARGS{$key} = {
-    %{$META{prereqs}{$_}{requires} || {}},
-    %{delete $MM_ARGS{$key} || {}},
-  };
-  defined $r->{$_} or delete $r->{$_} for keys %$r;
-}
-
-$MM_ARGS{MIN_PERL_VERSION} = delete $MM_ARGS{PREREQ_PM}{perl} || 0;
-
-delete $MM_ARGS{MIN_PERL_VERSION}
-  if $eumm_version < 6.47_01;
-$MM_ARGS{BUILD_REQUIRES} = {%{$MM_ARGS{BUILD_REQUIRES}}, %{delete $MM_ARGS{TEST_REQUIRES}}}
-  if $eumm_version < 6.63_03;
-$MM_ARGS{PREREQ_PM} = {%{$MM_ARGS{PREREQ_PM}}, %{delete $MM_ARGS{BUILD_REQUIRES}}}
-  if $eumm_version < 6.55_01;
-delete $MM_ARGS{CONFIGURE_REQUIRES}
-  if $eumm_version < 6.51_03;
-
-ExtUtils::MakeMaker::WriteMakefile(%MM_ARGS);
-##############################################################################
-
 # Secondary compile testing via ExtUtils::CBuilder
 sub can_xs {
   # Do we have the configure_requires checker?
@@ -151,3 +110,46 @@ sub can_run {
 sub is_smoker {
   return ( $ENV{AUTOMATED_TESTING} && ! $ENV{PERL5_CPANM_IS_RUNNING} && ! $ENV{RELEASE_TESTING} )
 }
+
+## BOILERPLATE ###############################################################
+require ExtUtils::MakeMaker;
+(do 'maint/Makefile.PL.include' or die $@) unless -f 'META.yml';
+
+# have to do this since old EUMM dev releases miss the eval $VERSION line
+my $eumm_version  = eval $ExtUtils::MakeMaker::VERSION;
+my $mymeta        = $eumm_version >= 6.57_02;
+my $mymeta_broken = $mymeta && $eumm_version < 6.57_07;
+
+($MM_ARGS{NAME} = $META{name}) =~ s/-/::/g;
+($MM_ARGS{VERSION_FROM} = "lib/$MM_ARGS{NAME}.pm") =~ s{::}{/}g;
+$META{license} = [ $META{license} ]
+  if $META{license} && !ref $META{license};
+$MM_ARGS{LICENSE} = $META{license}[0]
+  if $META{license} && $eumm_version >= 6.30;
+$MM_ARGS{NO_MYMETA} = 1
+  if $mymeta_broken;
+$MM_ARGS{META_ADD} = { 'meta-spec' => { version => 2 }, %META }
+  unless -f 'META.yml';
+
+for (qw(configure build test runtime)) {
+  my $key = $_ eq 'runtime' ? 'PREREQ_PM' : uc $_.'_REQUIRES';
+  my $r = $MM_ARGS{$key} = {
+    %{$META{prereqs}{$_}{requires} || {}},
+    %{delete $MM_ARGS{$key} || {}},
+  };
+  defined $r->{$_} or delete $r->{$_} for keys %$r;
+}
+
+$MM_ARGS{MIN_PERL_VERSION} = delete $MM_ARGS{PREREQ_PM}{perl} || 0;
+
+delete $MM_ARGS{MIN_PERL_VERSION}
+  if $eumm_version < 6.47_01;
+$MM_ARGS{BUILD_REQUIRES} = {%{$MM_ARGS{BUILD_REQUIRES}}, %{delete $MM_ARGS{TEST_REQUIRES}}}
+  if $eumm_version < 6.63_03;
+$MM_ARGS{PREREQ_PM} = {%{$MM_ARGS{PREREQ_PM}}, %{delete $MM_ARGS{BUILD_REQUIRES}}}
+  if $eumm_version < 6.55_01;
+delete $MM_ARGS{CONFIGURE_REQUIRES}
+  if $eumm_version < 6.51_03;
+
+ExtUtils::MakeMaker::WriteMakefile(%MM_ARGS);
+## END BOILERPLATE ###########################################################