From: Peter Rabbitson Date: Sun, 21 Feb 2010 11:34:11 +0000 (+0000) Subject: Cleanup the makefile regen a bit X-Git-Tag: v0.08120~15^2~6 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=97f9f16ea3aff5d9e85d89e8a37ade594c4c778d;p=dbsrgits%2FDBIx-Class.git Cleanup the makefile regen a bit --- diff --git a/Makefile.PL b/Makefile.PL index 4509190..d5f0f1c 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -8,6 +8,11 @@ use 5.008001; use FindBin; use lib "$FindBin::Bin/lib"; +# adjust ENV for $AUTHOR system() calls +use Config; +$ENV{PERL5LIB} = join ($Config{path_sep}, @INC); + + ### ### DO NOT ADD OPTIONAL DEPENDENCIES HERE, EVEN AS recommends() ### All of them should go to DBIx::Class::Optional::Dependencies @@ -62,17 +67,20 @@ my $reqs = { test_requires => { %$test_requires }, }; -# re-build README and require extra modules for testing if we're in a checkout +# autogenerate docs and require extra modules for testing if we're in a checkout if ($Module::Install::AUTHOR) { print "Regenerating README\n"; system('pod2text lib/DBIx/Class.pm > README'); - system('perl -Ilib ./script/dbicadmin --pod > lib/dbicadmin.pod'); + if (-f 'MANIFEST') { print "Removing MANIFEST\n"; unlink 'MANIFEST'; } + print "Regenerating dbicadmin.pod\n"; + system('perl script/dbicadmin --pod > lib/dbicadmin.pod'); + print "Regenerating Optional/Dependencies.pod\n"; require DBIx::Class::Optional::Dependencies; DBIx::Class::Optional::Dependencies->_gen_pod; diff --git a/t/03podcoverage.t b/t/03podcoverage.t index b8ead5f..fabdd0c 100644 --- a/t/03podcoverage.t +++ b/t/03podcoverage.t @@ -93,9 +93,7 @@ my $exceptions = { /] }, - 'DBIx::Class::Admin::Types' => { skip => 1 }, - 'DBIx::Class::Admin::Descriptive' => { skip => 1 }, - 'DBIx::Class::Admin::Usage' => { skip => 1 }, + 'DBIx::Class::Admin::*' => { skip => 1 }, 'DBIx::Class::ClassResolver::PassThrough' => { skip => 1 }, 'DBIx::Class::Componentised' => { skip => 1 }, 'DBIx::Class::Relationship::*' => { skip => 1 },