clean up module hiding in tests

[p5sagit/JSON-MaybeXS.git] / Makefile.PL

diff --git a/Makefile.PL b/Makefile.PL
index 57882fd..0b78345 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -1,7 +1,7 @@
 use strict;
 use warnings FATAL => 'all';
 use ExtUtils::MakeMaker;
-(do 'maint/Makefile.PL.include' or die $@) unless -f 'META.yml';
+(do './maint/Makefile.PL.include' or die $@) unless -f 'META.yml';
 
 my %WriteMakefileArgs = (
   NAME => 'JSON::MaybeXS',
@@ -11,10 +11,14 @@ my %WriteMakefileArgs = (
     'meta-spec' => { version => 2 },
     dynamic_config => 1,
     resources => {
-    # r/w: p5sagit@git.shadowcat.co.uk:JSON-MaybeXS.git
+      # GitHub mirrors from Shadowcat. We list it so we can get pull requests.
+      # The canonical repo is:
+      # r/o: git://git.shadowcat.co.uk/p5sagit/JSON-MaybeXS.git
+      # r/w: p5sagit@git.shadowcat.co.uk:JSON-MaybeXS.git
+      # web: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=p5sagit/JSON-MaybeXS.git
       repository => {
-        url => 'git://git.shadowcat.co.uk/p5sagit/JSON-MaybeXS.git',
-        web => 'http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=p5sagit/JSON-MaybeXS.git',
+        url => 'https://github.com/p5sagit/JSON-MaybeXS.git',
+        web => 'https://github.com/p5sagit/JSON-MaybeXS',
         type => 'git',
       },
       bugtracker => {
@@ -30,9 +34,11 @@ my %WriteMakefileArgs = (
       'Kieren Diment <diment@gmail.com>',
       'Matt S Trout <mst@shadowcat.co.uk>',
     ],
+    keywords => [ qw(json serializer serialiser data) ],
   },
 
   META_ADD => {
+    'meta-spec' => { version => 2 },
     prereqs => {
       configure => {
         requires => {
@@ -55,7 +61,6 @@ my %WriteMakefileArgs = (
       },
       test => {
         requires => {
-          'Test::Without::Module' => '0.17',
           'Test::More' => '0.88',
         },
       },
@@ -80,25 +85,18 @@ for (qw(configure build test runtime)) {
 
 my $args = parse_args();
 
-# we require Cpanel::JSON::XS, except if JSON::XS is already installed.
-# (we also always recommend Cpanel::JSON::XS, just to make sure.)
-$WriteMakefileArgs{PREREQ_PM}{'Cpanel::JSON::XS'} = '2.3310'
-    if not $args->{PUREPERL_ONLY}
-        and ((eval { require Cpanel::JSON::XS; 1 } and not eval { Cpanel::JSON::XS->VERSION('2.3310'); 1 })
-            or (not eval { require JSON::XS; 1; } and can_xs()));
-
-# avoid "JSON::XS::Boolean::* redefined" warnings caused by incompatibilities
-# between JSON::XS 2.x and 3.0 --
-# if JSON::XS is installed and < 3.0
-# and Cpanel::JSON::XS is (or is about to be) >= 3.0,
-# then update JSON::XS to eliminate the incompatibility
-$WriteMakefileArgs{PREREQ_PM}{'JSON::XS'} = '3.00'
-    if not $args->{PUREPERL_ONLY}
-        and eval { require JSON::XS; 1 } and not eval { JSON::XS->VERSION('3.0'); 1 }
-        and (eval { require Cpanel::JSON::XS; Cpanel::JSON::XS->VERSION('3.0'); 1 }
-            # we presume here that if we are installing Cpanel::JSON::XS, we
-            # are installing the latest version
-            or exists $WriteMakefileArgs{PREREQ_PM}{'Cpanel::JSON::XS'});
+if (not $args->{PUREPERL_ONLY}) {
+    # we require Cpanel::JSON::XS, except if JSON::XS is already installed.
+    # (we also always recommend Cpanel::JSON::XS, just to make sure.)
+    $WriteMakefileArgs{PREREQ_PM}{'Cpanel::JSON::XS'} = '2.3310'
+        if eval { require Cpanel::JSON::XS; 1 }
+            or (not eval { require JSON::XS; 1; } and can_xs());
+
+    # JSON::XS 3 changed its boolean handling - update it
+    # if JSON::XS is installed and < 3.0
+    $WriteMakefileArgs{PREREQ_PM}{'JSON::XS'} = '3.00'
+        if eval { require JSON::XS; 1 } and not eval { JSON::XS->VERSION('3.0'); 1 };
+}
 
 $WriteMakefileArgs{MIN_PERL_VERSION} = delete $WriteMakefileArgs{PREREQ_PM}{perl} || 0;