Reorganize dist-time meta handling (no semantic changes)

diff --git a/Makefile.PL b/Makefile.PL
index e2de85e..20d0404 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -49,30 +49,9 @@ BEGIN {
   }
 }
 
-homepage 'http://www.dbix-class.org/';
-resources 'x_IRC'       => 'irc://irc.perl.org/#dbix-class';
-resources 'x_WebIRC'    => 'https://chat.mibbit.com/#dbix-class@irc.perl.org';
-resources 'license'     => 'http://dev.perl.org/licenses/';
-resources 'repository'  => 'https://github.com/dbsrgits/DBIx-Class';
-resources 'MailingList' => 'http://lists.scsys.co.uk/cgi-bin/mailman/listinfo/dbix-class';
-resources 'bugtracker'  => 'http://rt.cpan.org/NoAuth/Bugs.html?Dist=DBIx-Class';
-
-name     'DBIx-Class';
+name         'DBIx-Class';
+version_from 'lib/DBIx/Class.pm';
 perl_version '5.008001';
-all_from 'lib/DBIx/Class.pm';
-Meta->{values}{x_authority} = 'cpan:RIBASUSHI';
-
-# nothing determined at runtime, except for possibly SQLT dep, see
-# comment further down
-dynamic_config 0;
-
-tests_recursive (qw|
-    t
-|);
-
-install_script (qw|
-    script/dbicadmin
-|);
 
 ###
 ### DO NOT ADD OPTIONAL DEPENDENCIES HERE, EVEN AS recommends()
@@ -172,6 +151,14 @@ if ($ENV{DBICTEST_SQLT_DEPLOY}) {
   }
 }
 
+tests_recursive (qw|
+    t
+|);
+
+install_script (qw|
+    script/dbicadmin
+|);
+
 # this is so we can order requires alphabetically
 # copies are needed for potential author requires injection
 my $reqs = {
@@ -223,6 +210,13 @@ WriteAll();
 
 exit 0;
 
+
+###
+### Nothing user-serviceable beyond this point
+### (none of this executes on regular install)
+###
+
+
 # needs to be here to keep 5.8 string eval happy
 # (the include of Makefile.PL.inc loop)
 my $mm_proto;

diff --git a/maint/Makefile.PL.inc/21_meta_noindex.pl b/maint/Makefile.PL.inc/21_meta_noindex.pl
deleted file mode 100644 (file)
index 062e74c..0000000
--- a/maint/Makefile.PL.inc/21_meta_noindex.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-print "Appending to the no_index META list\n";
-
-# Deprecated/internal modules need no exposure when building the meta
-no_index directory => $_ for (qw|
-  lib/DBIx/Class/Admin
-  lib/DBIx/Class/PK/Auto
-  lib/DBIx/Class/CDBICompat
-  maint
-|);
-no_index package => $_ for (qw/
-  DBIx::Class::Storage::DBIHacks
-  DBIx::Class::Storage::BlockRunner
-  DBIx::Class::Carp
-  DBIx::Class::_Util
-  DBIx::Class::ResultSet::Pager
-/);
-
-# keep the Makefile.PL eval happy
-1;

diff --git a/maint/Makefile.PL.inc/21_set_meta.pl b/maint/Makefile.PL.inc/21_set_meta.pl
new file mode 100644 (file)
index 0000000..e489860
--- /dev/null
+++ b/maint/Makefile.PL.inc/21_set_meta.pl
@@ -0,0 +1,37 @@
+# authorshipz
+author 'mst: Matt S. Trout <mst@shadowcat.co.uk>';
+Meta->{values}{x_authority} = 'cpan:RIBASUSHI';
+
+# legalese
+license 'perl';
+resources 'license' => 'http://dev.perl.org/licenses/';
+
+# misc resources
+abstract_from 'lib/DBIx/Class.pm';
+resources 'homepage'    => 'http://www.dbix-class.org/';
+resources 'IRC'         => 'irc://irc.perl.org/#dbix-class';
+resources 'repository'  => 'https://github.com/dbsrgits/DBIx-Class';
+resources 'MailingList' => 'http://lists.scsys.co.uk/cgi-bin/mailman/listinfo/dbix-class';
+resources 'bugtracker'  => 'http://rt.cpan.org/NoAuth/Bugs.html?Dist=DBIx-Class';
+
+# nothing determined at runtime, except for possibly SQLT dep
+# (see the check around DBICTEST_SQLT_DEPLOY in Makefile.PL)
+dynamic_config 0;
+
+# Deprecated/internal modules need no exposure when building the meta
+no_index directory => $_ for (qw|
+  lib/DBIx/Class/Admin
+  lib/DBIx/Class/PK/Auto
+  lib/DBIx/Class/CDBICompat
+  maint
+|);
+no_index package => $_ for (qw/
+  DBIx::Class::Storage::DBIHacks
+  DBIx::Class::Storage::BlockRunner
+  DBIx::Class::Carp
+  DBIx::Class::_Util
+  DBIx::Class::ResultSet::Pager
+/);
+
+# keep the Makefile.PL eval happy
+1;