From: Fuji, Goro Date: Thu, 23 Sep 2010 06:05:57 +0000 (+0900) Subject: Cleanup Makefile.PL, etc. X-Git-Tag: 0.71~30 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=2af880191b27692321cb8c3f2b90de5902b7b469;p=gitmo%2FMouse.git Cleanup Makefile.PL, etc. --- diff --git a/.gitignore b/.gitignore index b0ae5a0..a9e073e 100644 --- a/.gitignore +++ b/.gitignore @@ -13,7 +13,7 @@ Mouse-* *~ *.bak *.old -xt/compatibility/ +xt/compat/ cover_db/* nytprof* *.out diff --git a/MANIFEST.SKIP b/MANIFEST.SKIP index 8e5a18d..e16e1cc 100644 --- a/MANIFEST.SKIP +++ b/MANIFEST.SKIP @@ -36,7 +36,7 @@ # Moose specific tests -xt/compatibility +xt/compat xt/external t/.*/failing diff --git a/Makefile.PL b/Makefile.PL index f340858..891bfa0 100755 --- a/Makefile.PL +++ b/Makefile.PL @@ -58,19 +58,17 @@ CHECK my $use_xs = ($] >= 5.008_001 && want_xs()); if($use_xs){ - print "Mouse configured with XS.\n", - "NOTE: You can try --pp option to configure Mouse with Pure Perl.\n"; + print "Mouse configured with XS.\n"; - cc_warnings(); use_ppport(3.19); use_xshelper(); + cc_warnings(); cc_src_paths('xs-src'); } else{ print "Mouse configured with Pure Perl.\n"; } - tests 't/*.t t/*/*.t'; author_tests 'xt'; @@ -82,20 +80,16 @@ if ($Module::Install::AUTHOR) { if (eval { require Moose; Moose->VERSION($require_version) }) { print "You have Moose ", Moose->VERSION, ".\n"; - if (eval { require Module::Install::AuthorTests }) { - do 'tool/create-moose-compatibility-tests.pl'; - # repeat testing - # see also ExtUtils::MM_Any::test_via_harness() - my $t_moose = q{$(FULLPERLRUN) -MExtUtils::Command::MM -e} - .q{ "test_harness($(TEST_VERBOSE), '$(INST_LIB)', '$(INST_ARCHLIB)')"} - .q{ xt/compatibility/t/*/*.t } . "\n"; - - postamble qq{test_dynamic :: test_moose\n\n} - . qq{test_moose :: pure_all\n} - . qq{\t} . $t_moose; - } else { - print "You don't have a M::I::AuthorTests.\n"; - } + do 'tool/create-moose-compatibility-tests.pl'; + # repeat testing + # see also ExtUtils::MM_Any::test_via_harness() + my $t_moose = q{$(FULLPERLRUN) -MExtUtils::Command::MM -e} + .q{ "test_harness($(TEST_VERBOSE), '$(INST_LIB)', '$(INST_ARCHLIB)')"} + .q{ xt/compat/t/*/*.t } . "\n"; + + postamble qq{test :: test_moose\n\n} + . qq{test_moose :: pure_all\n} + . qq{\t} . $t_moose; } else { print "You don't have Moose $require_version. skipping moose compatibility test\n"; } @@ -107,7 +101,7 @@ if ($Module::Install::AUTHOR) { .q{ "do 'tool/force-pp.pl'; test_harness($(TEST_VERBOSE), '$(INST_LIB)', '$(INST_ARCHLIB)')"} .q{ $(TEST_FILES)} . "\n"; - postamble qq{test_dynamic :: test_pp\n\n} + postamble qq{test :: test_pp\n\n} . qq{test_pp :: pure_all\n} . qq{\t} . $t_pp; } diff --git a/lib/Mouse/Util.pm b/lib/Mouse/Util.pm index 076ca34..307531a 100644 --- a/lib/Mouse/Util.pm +++ b/lib/Mouse/Util.pm @@ -395,7 +395,7 @@ The same as C. =head2 Class::MOP functions -The followign functions are not exportable. +The following functions are not exportable. =head3 C<< Mouse::Util::is_class_loaded($classname) -> Bool >> diff --git a/tool/create-moose-compatibility-tests.pl b/tool/create-moose-compatibility-tests.pl index 05f33ce..9508364 100644 --- a/tool/create-moose-compatibility-tests.pl +++ b/tool/create-moose-compatibility-tests.pl @@ -6,9 +6,9 @@ use File::Path (); use File::Spec (); use File::Basename (); -print "Creating compatibility tests in xt/compatibility/* ...\n"; +print "Creating compatibility tests in xt/compat/* ...\n"; -File::Path::rmtree(File::Spec->catfile('xt', 'compatibility')); +File::Path::rmtree(File::Spec->catfile('xt', 'compat')); # some test does not pass... currently skip it. my %SKIP_TEST = ( @@ -51,7 +51,7 @@ File::Find::find( my $dirname = File::Basename::dirname($_); - my $tmpdir = File::Spec->catfile('xt', 'compatibility', $dirname); + my $tmpdir = File::Spec->catfile('xt', 'compat', $dirname); File::Path::mkpath($tmpdir); my $tmpfile = File::Spec->catfile($tmpdir, $basename); diff --git a/xt/002-pod_spell.t b/xt/002-pod_spell.t index 212886f..3549727 100644 --- a/xt/002-pod_spell.t +++ b/xt/002-pod_spell.t @@ -163,6 +163,7 @@ destructuring dev DWIM DUCKTYPE +exportable GitHub hashrefs hotspots