distar-ify

diff --git a/.gitignore b/.gitignore
index d386237..8473605 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,12 +1,16 @@
-META.yml
-Makefile
-Makefile.old
+/META.*
+/MYMETA.*
+/Makefile
+/Makefile.old
+/MANIFEST
+/MANIFEST.bak
+/blib/
+/pm_to_blib
+/.build
 cover_db
-blib
-inc
-pm_to_blib
-MANIFEST*
-!MANIFEST.SKIP
-*~
+nytprof*
+/inc/
 README
-*.tar.gz
+/MANIFEST.SKIP
+/Distar
+/Config-Any-*

diff --git a/MANIFEST.SKIP b/MANIFEST.SKIP
deleted file mode 100644 (file)
index 2a83a8e..0000000
--- a/MANIFEST.SKIP
+++ /dev/null
@@ -1,32 +0,0 @@
-# Avoid version control files.
-\bRCS\b
-\bCVS\b
-,v$
-\B\.svn\b
-\B\.git\b
-\.gitignore
-
-# Avoid Makemaker generated and utility files.
-\bMakefile$
-\bblib
-\bMakeMaker-\d
-\bpm_to_blib$
-\bblibdirs$
-^MANIFEST\.SKIP$
-^MYMETA
-
-# Avoid Module::Build generated and utility files.
-\bBuild$
-\b_build
-
-# Avoid temp and backup files.
-~$
-\.tmp$
-\.old$
-\.bak$
-\#$
-\b\.#
-\.DS_Store$
-
-# No tarballs!
-\.gz$

diff --git a/Makefile.PL b/Makefile.PL
index 839ff87..325a131 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -1,30 +1,81 @@
-use inc::Module::Install 1.00;
+use strict;
+use warnings FATAL => 'all';
+use 5.006;
 
-if ( -e 'MANIFEST.SKIP' ) {
-    system( 'pod2text lib/Config/Any.pm > README' );
-}
-
-perl_version '5.006';
-name 'Config-Any';
+my %META = (
+  name => 'Config-Any',
+  license => 'perl_5',
+  prereqs => {
+    test => { requires => {
+      'Test::More'  => 0,
+    } },
+    runtime => { requires => {
+      'Module::Pluggable::Object' => '3.6',
+    } },
+  },
+  resources => {
+    repository => {
+      url => 'git://git.shadowcat.co.uk/p5sagit/Config-Any.git',
+      web => 'http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=p5sagit/Config-Any.git;a=summary',
+      type => 'git',
+    },
+    bugtracker => {
+      web => 'https://rt.cpan.org/Public/Dist/Display.html?Name=Config-Any',
+      mailto => 'bug-Config-Any@rt.cpan.org',
+    },
+    license => [ 'http://dev.perl.org/licenses/' ],
+  },
+  no_index => {
+    directory => [ 't', 'xt' ]
+  },
+  x_authority => 'cpan:RATAXIS',
+);
 
-all_from 'lib/Config/Any.pm';
+my %MM_ARGS = (
+  PREREQ_PM => {
+    (eval { require Config::General } ? ('Config::General' => '2.47') : ()),
+  },
+);
 
-requires 'Module::Pluggable::Object' => '3.6';
+## BOILERPLATE ###############################################################
+require ExtUtils::MakeMaker;
+(do './maint/Makefile.PL.include' or die $@) unless -f 'META.yml';
 
-# Upgrade Config::General is necessary
-if ( can_use( 'Config::General' ) && !can_use( 'Config::General', '2.47' ) ) {
-    requires 'Config::General' => '2.47';
-}
+# 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;
 
-test_requires 'Test::More';
+($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';
 
-# Scrub requires() for META output
-if ( $Module::Install::AUTHOR ) {
-    Meta->{ values }{ requires } = [ grep { $_->[ 0 ] ne 'Config::General' }
-            @{ Meta->{ values }{ requires } } ];
+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;
 }
 
-resources repository =>
-    'git://git.shadowcat.co.uk/p5sagit/Config-Any.git';
+$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;
 
-WriteAll;
+ExtUtils::MakeMaker::WriteMakefile(%MM_ARGS);
+## END BOILERPLATE ###########################################################

diff --git a/maint/Makefile.PL.include b/maint/Makefile.PL.include
new file mode 100644 (file)
index 0000000..9c38ea5
--- /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;
+
+author 'Joel Bernstein <rataxis@cpan.org>';