X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=p5sagit%2Flocal-lib.git;a=blobdiff_plain;f=Makefile.PL;h=6ca54b86e765fd1de3320705fb7011ff066d9594;hp=d0674514261850feac133a7f5bd1bf48043fb1e0;hb=80ee6ea4da9b2050273b3b686682bb58512aec68;hpb=abeb1a03a2179479e2afb2e9010303f1dbc792c9

diff --git a/Makefile.PL b/Makefile.PL
index d067451..6ca54b8 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -6,7 +6,7 @@ use vars qw($bootstrapping $bootstrapping_args $no_manpages);
 use Config;
 
 # Solaris (and possibly other Unices) have a tar in /usr/bin that, among
-# other things, does not understand @LongLink. This can cause 
+# other things, does not understand @LongLink. This can cause
 # extraction to look like it succeeded, but it actually failed (because
 # the error message for the @LongLink failure scrolled offscreen).
 # Therefore, given the fact that GNU tar is the most widespread tar available,
@@ -45,7 +45,8 @@ BEGIN {
   # dashes, it's better to die loudly telling the user exactly what happened
   # so they don't make the same mistake again rather than being the only
   # program in the universe that works with them.
-  if(grep { /−/ } @ARGV) {
+  # the fancy dash is U+2212 or \xE2\x88\x92
+  if(grep { /\xE2\x88\x92/ } @ARGV or grep { /−/ } @ARGV) {
       die <<'DEATH';
 WHOA THERE! It looks like you've got some fancy dashes in your commandline!
 These are *not* the traditional -- dashes that software recognizes. You
@@ -82,7 +83,7 @@ DEATH
     # <mst> we must set PERL_AUTOINSTALL_PREFER_CPAN too
     $ENV{PERL_AUTOINSTALL_PREFER_CPAN} = 1;
 
-    system($^X, '-MExtUtils::MakeMaker 6.31', '-e1');
+    system($^X, '-MExtUtils::MakeMaker 6.74', '-e1');
     my $eumm = $? >> 8;
 
     system($^X, '-MExtUtils::Install 1.43', '-e1');
@@ -106,7 +107,7 @@ DEATH
          }
          return $orig->(@_);
        };
-       # not yet -- apeiron, 2010-03-10 
+       # not yet -- apeiron, 2010-03-10
        #$CPAN::Config->{urllist} = ["http://cpan.shadowcatprojects.net"];
        # <mst> all bootstrapped fine on one DH account
        # <mst> on another, it tries to install man stuff into /usr/local
@@ -158,10 +159,10 @@ DEATH
       system($^X, '-MCPAN', '-e', $cpan_config_command)
         unless $did_cpan_config;
       system($^X, '-MCPAN',
-        '-e', 
+        '-e',
         q[CPAN::HandleConfig->load;],
-        '-e', 
-        q[$CPAN::Config->{makepl_arg}  = ] . 
+        '-e',
+        q[$CPAN::Config->{makepl_arg}  = ] .
           q['INSTALLMAN1DIR=none INSTALLMAN3DIR=none';],
         '-e',
         q[$CPAN::Config->{buildpl_arg} = ] .
@@ -175,32 +176,71 @@ DEATH
   }
 }
 
-use inc::Module::Install;
+require ExtUtils::MakeMaker;
+ExtUtils::MakeMaker->import;
+(do 'maint/Makefile.PL.include' or die $@) unless -f 'META.yml';
+
+my %CONFIGURE_DEPS = ();
+my %BUILD_DEPS = ();
+my %TEST_DEPS = (
+  'Test::More'  => 0,
+);
+my %RUN_DEPS = (
+  'ExtUtils::MakeMaker' => '6.74', # version PERL_MM_OPT is shell parsed
+  'ExtUtils::Install'   => '1.43', # version INSTALL_BASE was added
+  'Module::Build'       => '0.36', # PERL_MB_OPT
+  'CPAN'                => '1.82', # sudo support + CPAN::HandleConfig
+);
 
-name 'local-lib';
-all_from 'lib/local/lib.pm';
+my %extra_info = (
+  'meta-spec' => { version => 2 },
+  resources => {
+    repository => {
+      url => 'git://github.com/Perl-Toolchain-Gang/local-lib',
+      web => 'https://github.com/Perl-Toolchain-Gang/local-lib',
+      type => 'git',
+    },
+    x_IRC => 'irc://irc.perl.org/#local-lib',
+    bugtracker => {
+      web => 'https://rt.cpan.org/Public/Dist/Display.html?Name=local-lib',
+      mailto => 'bug-local-lib@rt.cpan.org',
+    },
+    license => [ 'http://dev.perl.org/licenses/' ],
+  },
+  prereqs => {
+    runtime   => { requires => { perl => '5.6.0' } },
+  },
+);
 
-requires 'ExtUtils::MakeMaker' => '6.31'; # version INSTALL_BASE was added
-requires 'ExtUtils::Install' => '1.43'; # ditto
-requires 'Module::Build' => '0.36'; # PERL_MB_OPT
-my $required_CPAN = '1.82';
-requires 'CPAN' => $required_CPAN; # sudo support + CPAN::HandleConfig
+if ($bootstrapping) {
+  no warnings 'once';
+*MY::postamble = sub {
+  <<"END";
+PERL     += $bootstrapping_args
+FULLPERL += $bootstrapping_args
+END
+  }
+}
 
-# No, really. See
-# https://rt.cpan.org/Public/Bug/Display.html?id=23735
-# for why CPAN now sets the CPANPLUS env var.
-# trouble is this means we can't auto_install(_now) CPAN itself
-# without this beautiful hack
+# don't bother fixing CPAN.pm if bootstrapped from cpanminus
+if ($ENV{PERL5_CPANM_IS_RUNNING}) {
+    delete $RUN_DEPS{CPAN};
+}
+else {
+    # No, really. See
+    # https://rt.cpan.org/Public/Bug/Display.html?id=23735
+    # for why CPAN now sets the CPANPLUS env var.
+    # trouble is this means we can't auto_install(_now) CPAN itself
+    # without this beautiful hack
 
-my $no_cpanplus_env = !exists $ENV{PERL5_CPANPLUS_IS_RUNNING};
-my $no_cpan_env = !exists $ENV{PERL5_CPAN_IS_RUNNING};
-require CPAN;
-delete $ENV{PERL5_CPANPLUS_IS_RUNNING} if $no_cpanplus_env;
-delete $ENV{PERL5_CPAN_IS_RUNNING} if $no_cpan_env;
+    my $no_cpanplus_env = !exists $ENV{PERL5_CPANPLUS_IS_RUNNING};
+    my $no_cpan_env = !exists $ENV{PERL5_CPAN_IS_RUNNING};
+    require CPAN;
+    delete $ENV{PERL5_CPANPLUS_IS_RUNNING} if $no_cpanplus_env;
+    delete $ENV{PERL5_CPAN_IS_RUNNING} if $no_cpan_env;
 
-# and make sure that the user doesn't have any existing CPAN config that'll
-# cause us problems for the next few steps.
-{
+    # and make sure that the user doesn't have any existing CPAN config that'll
+    # cause us problems for the next few steps.
     local $@;
     eval { require CPAN::HandleConfig; };
     # Need newish CPAN.pm for this, ergo skip it if that version of CPAN isn't
@@ -211,22 +251,19 @@ delete $ENV{PERL5_CPAN_IS_RUNNING} if $no_cpan_env;
     if (!$@ ) {
         CPAN::HandleConfig->require_myconfig_or_config;
         if ( $CPAN::Config ) {
-            for my $eumm_setting ( qw/makepl_arg make_install_arg/ ) {
-                if ($CPAN::Config->{$eumm_setting} =~ /(?:PREFIX|INSTALL_BASE)/) {
+            for my $setting (qw(
+              makepl_arg make_install_arg
+              mbuild_arg mbuild_install_arg mbuildpl_arg
+            )) {
+                my $value = $CPAN::Config->{$setting} or next;
+                if ($setting =~ /^make/
+                  ? $value =~ /(?:PREFIX|INSTALL_BASE)/
+                  : $value =~ /(?:--prefix|--install_base)/
+                ) {
                     die <<"DEATH";
-WHOA THERE! It looks like you've got $CPAN::Config->{$eumm_setting} set. This is
-known to cause problems with local::lib. Please either remove this setting or
-clear out your .cpan directory.
-DEATH
-                }
-            }
-
-            for my $mb_setting (qw/mbuild_arg mbuild_install_arg mbuildpl_arg/) {
-                if ($CPAN::Config->{$mb_setting} =~ /(?:--prefix|--install_base)/) {
-                    die <<"DEATH";
-WHOA THERE! It looks like you've got $CPAN::Config->{$mb_setting} set. This is
-known to cause problems with local::lib. Please either remove this setting or
-clear out your .cpan directory.
+WHOA THERE! It looks like you've got $CPAN::Config->{$setting} set in
+your CPAN config. This is known to cause problems with local::lib. Please
+either remove this setting or clear out your .cpan directory.
 DEATH
                 }
             }
@@ -237,24 +274,48 @@ DEATH
         require CPAN;
         # Explode if it looks like requiring CPAN::HandleConfig should
         # have worked, but didn't.
-        die($error) if $CPAN::VERSION >= $required_CPAN;
+        die($error) if $CPAN::VERSION >= $RUN_DEPS{CPAN};
     }
 }
+chdir($cwd);
 
-if ($bootstrapping) {
-  auto_install_now;
-  postamble <<"END";
-PERL     += $bootstrapping_args
-FULLPERL += $bootstrapping_args
-END
-} else {
-  auto_install;
+@{$extra_info{prereqs}{runtime}{requires}}{keys %RUN_DEPS} = values %RUN_DEPS;
+
+# have to do this since old EUMM dev releases miss the eval $VERSION line
+my $eumm_version = eval $ExtUtils::MakeMaker::VERSION;
+my $mymeta_works = $eumm_version >= 6.57_07;
+my $mymeta = $eumm_version >= 6.57_02;
+
+my $has_test_requires = $eumm_version >= 6.63_03;
+
+my $has_meta_v2 = $eumm_version >= 6.57_10;
+if (! $has_meta_v2) {
+  %extra_info = ();
 }
-chdir($cwd);
-resources(
-  # r/w: p5sagit@git.shadowcat.co.uk:local-lib.git
-  repository => 'git://git.shadowcat.co.uk/p5sagit/local-lib.git',
-  homepage => 'http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=p5sagit/local-lib.git',
-  bugtracker => 'http://rt.cpan.org/Public/Dist/Display.html?Name=local-lib',
+if (not $has_test_requires) {
+  %BUILD_DEPS = (%BUILD_DEPS, %TEST_DEPS);
+  %TEST_DEPS = ();
+}
+if (not $mymeta_works) {
+  %RUN_DEPS = (%RUN_DEPS, %BUILD_DEPS);
+  %BUILD_DEPS = ();
+}
+
+WriteMakefile(
+  NAME => 'local::lib',
+  VERSION_FROM => 'lib/local/lib.pm',
+  CONFIGURE_REQUIRES => \%CONFIGURE_DEPS,
+  PREREQ_PM => {
+    %RUN_DEPS,
+  },
+  BUILD_REQUIRES => \%BUILD_DEPS,
+  TEST_REQUIRES => \%TEST_DEPS,
+  META_ADD => \%extra_info,
+  META_MERGE => {
+    no_index => {
+      directory => [ 'xt' ]
+    },
+  },
+  ($mymeta && !$mymeta_works ? (NO_MYMETA => 1) : ()),
+  LICENSE => 'perl',
 );
-WriteAll;