X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Makefile.PL;h=189d86808effb74c182259a8fb0024bf2797536d;hb=f48920c11c806b2a1fd60be145ff2cdf79750878;hp=e6a0c6724796c2ed2defc65266686d2393acdc74;hpb=df6dd016657118a06b408d21767dbc9b4ca476b9;p=gitmo%2FMouse.git

diff --git a/Makefile.PL b/Makefile.PL
index e6a0c67..189d868 100755
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -14,14 +14,23 @@ tests 't/*.t t/*/*.t';
 # > Fixed looks_like_number(undef) to return false for perl >= 5.009002
 requires 'Scalar::Util' => 1.14;
 
+configure_requires 'ExtUtils::CBuilder';
+
 test_requires 'Test::More'      => 0.88;
 test_requires 'Test::Exception' => 0.27;
 # test_requires 'Test::Output'    => 0.16; # too many dependencies!
 
-include 'Test::Exception'; # work around 0.27_0x (its use of diehook might be wrong)
+include_deps 'Test::Exception'; # work around 0.27_0x (its use of diehook might be wrong)
 
 recommends 'MRO::Compat' if $] < 5.010;
 
+require 'lib/Mouse/Spec.pm'; # for the version
+
+if(Mouse::Spec->MouseVersion =~ /_/){ # DEVEL RELEASE
+    require Carp::Always; Carp::Always->import();
+    include_deps 'Carp::Always';
+}
+
 my $use_xs;
 
 for (@ARGV) {
@@ -29,32 +38,39 @@ for (@ARGV) {
     /^--xs$/ and $use_xs = 1;
 }
 
+if($] < 5.008_001){
+    $use_xs = 0;
+}
+
 if(!defined $use_xs){
-    configure_requires 'ExtUtils::CBuilder';
-    require ExtUtils::CBuilder;
-    $use_xs = ExtUtils::CBuilder->new(quiet => 1)->have_compiler();
+    $use_xs = eval {
+        require ExtUtils::CBuilder;
+        ExtUtils::CBuilder->new(quiet => 1)->have_compiler();
+    };
 }
 
 if($use_xs){
+    print "Mouse configured with XS.\n",
+          "NOTE: You can try --pp option to configure Mouse with Pure Perl.\n";
+    ;
+
     require Module::Install::XSUtil;
+    Module::Install::XSUtil->VERSION(0.15); # for co-developpers
+
     use_ppport(3.19);
     cc_warnings();
     cc_src_paths('xs-src');
-
-    print "Mouse configured in XS (--xs)\n";
 }
 else{
-    print "Mouse configured in Pure Perl (--pp)\n";
+    print "Mouse configured with Pure Perl.\n";
 }
 
-if ($Module::Install::AUTHOR) {
-    local @INC = ('lib', @INC);
-    require 'lib/Mouse/Spec.pm';
+if (author_context()) {
     my $require_version = Mouse::Spec->MooseVersion;
 
     if (eval{ require Moose; Moose->VERSION($require_version) }) {
         if (eval 'use Module::Install::AuthorTests; 1') {
-            create_moose_compatibility_test();
+            do 'author/create-moose-compatibility-tests.pl';
             recursive_author_tests('xt');
         } else {
             print "you don't have a M::I::AuthorTests.\n";
@@ -62,85 +78,20 @@ if ($Module::Install::AUTHOR) {
     } else {
         print "you don't have Moose $require_version. skipping moose compatibility test\n";
     }
-}
 
-clean_files 'lib/Mouse/Tiny.pm';
-
-WriteAll check_nmake => 0;
+    if($use_xs){
+        # repeat testing
+        # see also ExtUtils::MM_Any::test_via_harness()
+        my $test_via_harness =  q{$(FULLPERLRUN) -MExtUtils::Command::MM -e}
+                               .q{ "do 'author/force-pp.pl'; test_harness($(TEST_VERBOSE), '$(INST_LIB)', '$(INST_ARCHLIB)')"}
+                               .q{ $(TEST_FILES)} . "\n";
 
-sub create_moose_compatibility_test {
-    require File::Path;
-    require File::Spec;
-    require File::Basename;
-
-    print "Creating compatibility tests in xt/compatibility/* ...\n";
-
-    File::Path::rmtree(File::Spec->catfile('xt', 'compatibility'));
-
-    # some test does not pass... currently skip it.
-    my %SKIP_TEST = (
-        '016-trigger.t'    => "trigger's argument is incompatble :(",
-        '810-isa-or.t'     => "Mouse has a [BUG]",
-
-        '052-undefined-type-in-union.t' => "Mouse accepts undefined type as a member of union types",
-        '054-anon-leak.t'     => 'Moose has memory leaks',
-
-        '600-tiny-tiny.t'     => "Moose doesn't support ::Tiny",
-        '601-tiny-mouse.t'    => "Moose doesn't support ::Tiny",
-        '602-mouse-tiny.t'    => "Moose doesn't support ::Tiny",
-
-        '031_roles_applied_in_create.t' => 't/lib/* classes are not Moose classes/roles',
-    );
-
-    my @compat_tests;
-
-    File::Find::find(
-        {
-            wanted => sub {
-                return unless -f $_;
-
-                return if /failing/; # skip tests in failing/ directories which  are Moose specific
-
-                return if /with_moose/; # tests with Moose
-                return if /100_bugs/;   # some tests require Mouse specific files
-                return if /deprecated/;
-
-                my $basename = File::Basename::basename($_);
-                return if $basename =~ /^\./;
-
-                if(exists $SKIP_TEST{$basename}){
-                    print "# skip $basename because: $SKIP_TEST{$basename}\n";
-                    return;
-                }
-
-                my $dirname = File::Basename::dirname($_);
-
-                my $tmpdir = File::Spec->catfile('xt', 'compatibility', $dirname);
-                File::Path::mkpath($tmpdir);
-
-                my $tmpfile = File::Spec->catfile($tmpdir, $basename);
-                open my $wfh, '>', $tmpfile or die $!;
-                print $wfh do {
-                    my $src = do {
-                        open my $rfh, '<', $_ or die $!;
-                        my $s = do { local $/; <$rfh> };
-                        close $rfh;
-                        $s;
-                    };
-                    $src =~ s/Mouse::(?:Util::)?is_class_loaded/Class::MOP::is_class_loaded/g;
-                    $src =~ s/Mouse::(?:Util::)?load_class/Class::MOP::load_class/g;
-                    $src =~ s/Mouse/Moose/g;
-                    $src;
-                };
-                close $wfh;
-                push @compat_tests, $tmpfile;
-            },
-            no_chdir => 1
-        },
-        't',
-    );
-    print "Compatibility tests created.\n";
-
-    clean_files "@compat_tests";
+        postamble qq{test_dynamic :: test_pp\n\n}
+                . qq{test_pp :: pure_all\n}
+                . qq{\t} . $test_via_harness;
+    }
 }
 
+clean_files 'lib/Mouse/Tiny.pm $(O_FILES)';
+
+WriteAll check_nmake => 0;