distar-ify

diff --git a/.gitignore b/.gitignore
index 0458b96..cf1fc75 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,17 +1,14 @@
-.*
-!.gitignore
-Makefile*
-!Makefile.PL
-*META.*
-blib
-build
-inc
-pm_to_blib
-MANIFEST*
-!MANIFEST.SKIP
+/Makefile
+/Makefile.old
+/MYMETA.*
+/blib
+/build
+/inc
+/pm_to_blib
+/MANIFEST
+/MANIFEST.bak
+/MANIFEST.SKIP
+/Distar
 Debian*
-README
-Devel-GlobalDestruction-*
-*.bs
-*.o
-*.c
+/Devel-GlobalDestruction-*.tar.gz
+/Devel-GlobalDestruction-*/

diff --git a/MANIFEST.SKIP b/MANIFEST.SKIP
deleted file mode 100644 (file)
index bf9442e..0000000
--- a/MANIFEST.SKIP
+++ /dev/null
@@ -1,48 +0,0 @@
-# Avoid version control files.
-\bRCS\b
-\bCVS\b
-\bSCCS\b
-,v$
-\B\.svn\b
-\B\.git\b
-\B\.gitignore\b
-\b_darcs\b
-
-# no mymeta
-\bMYMETA\.
-
-# Avoid Makemaker generated and utility files.
-\bMANIFEST\.bak
-\bMakefile$
-\bblib/
-\bMakeMaker-\d
-\bpm_to_blib\.ts$
-\bpm_to_blib$
-\bblibdirs\.ts$         # 6.18 through 6.25 generated this
-
-# Avoid Module::Build generated and utility files.
-\bBuild$
-\b_build/
-
-# Avoid temp and backup files.
-~$
-\.old$
-\#$
-\b\.#
-\.bak$
-
-# Avoid Devel::Cover files.
-\bcover_db\b
-
-### DEFAULT MANIFEST.SKIP ENDS HERE ####
-
-\.DS_Store$
-\.sw.$
-(\w+-)*(\w+)-\d\.\d+(?:\.tar\.gz)?$
-
-\.t\.log$
-
-\.prove$
-
-# XS shit
-\.(?:bs|c|o)$

diff --git a/Makefile.PL b/Makefile.PL
index 0c1d029..aaf3c41 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -1,7 +1,48 @@
 use strict;
-use warnings;
+use warnings FATAL => 'all';
+use 5.006;
+
+my %META = (
+  name => 'Devel-GlobalDestruction',
+  license => 'perl_5',
+  prereqs => {
+    configure => { requires => {
+      'ExtUtils::MakeMaker'   => 0,
+      'ExtUtils::CBuilder'    => 0.27,
+    } },
+    runtime => {
+      requires => {
+        'Sub::Exporter::Progressive' => '0.001011',
+        'perl'                      => 5.006,
+      },
+    },
+  },
+  resources => {
+    homepage => 'https://metacpan.org/release/Devel-GlobalDestruction',
+    repository => {
+      url => 'git://git.shadowcat.co.uk/p5sagit/Devel-GlobalDestruction.git',
+      web => 'http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=p5sagit/Devel-GlobalDestruction.git',
+      type => 'git',
+    },
+    bugtracker => {
+      web => 'https://rt.cpan.org/Public/Dist/Display.html?Name=Devel-GlobalDestruction',
+      mailto => 'bug-Devel-GlobalDestruction@rt.cpan.org',
+    },
+    license => [ 'http://dev.perl.org/licenses/' ],
+  },
+  no_index => {
+    directory => [ 't', 'xt' ]
+  },
+);
 
-require 5.006;
+my %MM_ARGS = (
+  PREREQ_PM => {
+    ( (defined ${^GLOBAL_PHASE} or parse_args()->{PUREPERL_ONLY} or !can_xs() )
+      ? ()
+      : ('Devel::GlobalDestruction::XS' => 0)
+    ),
+  },
+);
 
 use ExtUtils::MakeMaker;
 BEGIN { if ( $^O eq 'cygwin' ) {
@@ -31,52 +72,6 @@ sub parse_args {
   return $tmp->{ARGS} || {};
 }
 
-my $mymeta_works = eval { ExtUtils::MakeMaker->VERSION('6.5707'); 1 };
-my $mymeta = $mymeta_works || eval { ExtUtils::MakeMaker->VERSION('6.5702'); 1 };
-
-my %META_BITS = (
-);
-my %RUN_DEPS = (
-  'Sub::Exporter::Progressive' => '0.001011',
-  ( (defined ${^GLOBAL_PHASE} or parse_args()->{PUREPERL_ONLY} or !can_xs() )
-    ? ()
-    : ('Devel::GlobalDestruction::XS' => 0)
-  ),
-);
-
-my %WriteMakefileArgs = (
-  NAME                => 'Devel::GlobalDestruction',
-  VERSION_FROM        => 'lib/Devel/GlobalDestruction.pm',
-  LICENSE             => 'perl',
-  INSTALLDIRS         => 'site',
-  PL_FILES            => { },
-  MIN_PERL_VERSION    => '5.006',
-  PREREQ_PM           => \%RUN_DEPS,
-  CONFIGURE_REQUIRES  => { 'ExtUtils::CBuilder' => 0.27 },
-  META_ADD => {
-    resources => {
-      homepage => 'http://search.cpan.org/dist/Devel-GlobalDestruction',
-      repository => 'git://git.shadowcat.co.uk/p5sagit/Devel-GlobalDestruction.git',
-      bugtracker => 'http://rt.cpan.org/Public/Dist/Display.html?Name=Devel-GlobalDestruction',
-    },
-    requires => \%RUN_DEPS,
-  },
-  ($mymeta and !$mymeta_works) ? ( 'NO_MYMETA' => 1 ) : (),
-);
-
-unless ( eval { ExtUtils::MakeMaker->VERSION('6.56') } ) {
-  my $br = delete $WriteMakefileArgs{BUILD_REQUIRES};
-  my $pp = $WriteMakefileArgs{PREREQ_PM};
-  for my $mod ( keys %$br ) {
-    if ( exists $pp->{$mod} ) {
-      $pp->{$mod} = $br->{$mod} if $br->{$mod} > $pp->{$mod};
-    }
-    else {
-      $pp->{$mod} = $br->{$mod};
-    }
-  }
-}
-
 if (eval { require Devel::GlobalDestruction }
     && Devel::GlobalDestruction->VERSION < 0.10) {
   package MY;
@@ -92,11 +87,6 @@ pure_site_install ::
   };
 }
 
-delete $WriteMakefileArgs{CONFIGURE_REQUIRES}
-  unless eval { ExtUtils::MakeMaker->VERSION('6.52') };
-
-WriteMakefile(%WriteMakefileArgs);
-
 # can we locate a (the) C compiler
 sub can_cc {
   my @chunks = split(/ /, $Config::Config{cc}) or return;
@@ -195,3 +185,43 @@ END_C
 
   return $result;
 }
+
+##############################################################################
+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);

diff --git a/maint/Makefile.PL.include b/maint/Makefile.PL.include
new file mode 100644 (file)
index 0000000..63f296a
--- /dev/null
+++ b/maint/Makefile.PL.include
@@ -0,0 +1,17 @@
+BEGIN { -e 'Distar' or system("git clone git://git.shadowcat.co.uk/p5sagit/Distar.git") }
+use lib 'Distar/lib';
+use Distar 0.001;
+
+use ExtUtils::MakeMaker 6.57_10 ();
+
+author [
+  'Yuval Kogman <nothingmuch@woobling.org>',
+  'Florian Ragwitz <rafl@debian.org>',
+  'Jesse Luehrs <doy@tozt.net>',
+  'Peter Rabbitson <ribasushi@cpan.org>',
+  'Arthur Axel \'fREW\' Schmidt <frioux@gmail.com>',
+  'Elizabeth Mattijsen <liz@dijkmat.nl>',
+  'Greham Knop <haarg@haarg.org>',
+];
+
+1;