X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Makefile.PL;h=f6d3815fe2606af1afdfa630a41915a56057f88b;hb=people%2Filmari%2Fset-constraints-deffered-component;hp=37276d5c25a4b682fa38737126989ac0ff3a46b4;hpb=90706de1867758c4efc19f120e06fec763d27623;p=dbsrgits%2FDBIx-Class.git

diff --git a/Makefile.PL b/Makefile.PL
index 37276d5..f6d3815 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -15,37 +15,15 @@ BEGIN {
   $Module::Install::AUTHOR = 0 if (grep { $ENV{"PERL5_${_}_IS_RUNNING"} } (qw/CPANM CPANPLUS CPAN/) );
 }
 
-homepage 'http://www.dbix-class.org/';
-resources 'IRC'         => 'irc://irc.perl.org/#dbix-class';
-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()
 ### All of them *MUST* go to DBIx::Class::Optional::Dependencies
 ###
 my $runtime_requires = {
-  # FIXME - temporary, needs throwing out for something more efficient
-  'Data::Compare'            => '1.22',
 
   # DBI itself should be capable of installation and execution in pure-perl
   # mode. However it has never been tested yet, so consider XS for the time
@@ -78,13 +56,13 @@ my $runtime_requires = {
   'Data::Page'               => '2.00',
   'Devel::GlobalDestruction' => '0.09',
   'Hash::Merge'              => '0.12',
-  'Moo'                      => '1.002',
+  'Moo'                      => '1.004005',
   'MRO::Compat'              => '0.12',
   'Module::Find'             => '0.07',
   'namespace::clean'         => '0.24',
   'Path::Class'              => '0.18',
   'Scope::Guard'             => '0.03',
-  'SQL::Abstract'            => '1.77',
+  'SQL::Abstract'            => '1.79',
   'Try::Tiny'                => '0.07',
 
   # Technically this is not a core dependency - it is only required
@@ -137,6 +115,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 = {
@@ -147,6 +133,64 @@ my $reqs = {
 
 # only do author-includes if not part of a `make` run
 if ($Module::Install::AUTHOR  and ! $ENV{MAKELEVEL}) {
+  invoke_author_mode()
+}
+else {
+  # make sure this Makefile can not be used to make a dist
+  # (without the author includes there are no meta cleanup, no sanity checks, etc)
+  postamble <<EOP;
+create_distdir: nonauthor_stop_distdir_creation
+nonauthor_stop_distdir_creation:
+\t\$(NOECHO) \$(ECHO) Creation of dists in non-author mode is not allowed
+\t\$(NOECHO) \$(FALSE)
+EOP
+}
+
+# compose final req list, for alphabetical ordering
+my %final_req;
+for my $rtype (keys %$reqs) {
+  for my $mod (keys %{$reqs->{$rtype}} ) {
+
+    # sanity check req duplications
+    die "$mod specified as both a '$rtype' and a '$final_req{$mod}[0]'\n"
+      if $final_req{$mod};
+
+    $final_req{$mod} = [ $rtype, $reqs->{$rtype}{$mod}||0 ],
+  }
+}
+
+# actual require
+for my $mod (sort keys %final_req) {
+  my ($rtype, $ver) = @{$final_req{$mod}};
+  no strict 'refs';
+  $rtype->($mod, $ver);
+}
+
+# author-mode or not - this is where we show a list of missing deps
+# IFF we are running interactively
+auto_install();
+
+{
+  # M::I understands unicode in meta but does not write with the right
+  # layers - fhtagn!!!
+  local $SIG{__WARN__} = sub { warn $_[0] unless $_[0] =~ /Wide character in print/ };
+  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;
+
+sub invoke_author_mode {
   # get options here, make $args available to all snippets
   require Getopt::Long;
   my $getopt = Getopt::Long::Parser->new(
@@ -169,7 +213,7 @@ if ($Module::Install::AUTHOR  and ! $ENV{MAKELEVEL}) {
   # punt here until a new M::I is shipped (if at all)
   my $name = Meta->name || die 'The Module::Install metadata must be available at this point but is not - did you rearrange the Makefile.PL...?';
   $name =~ s/\-/::/g;
-  my $mm_proto = ExtUtils::MakeMaker->new({
+  $mm_proto = ExtUtils::MakeMaker->new({
     NORECURS => 1,
     NAME => $name,
   });
@@ -201,40 +245,3 @@ if ($Module::Install::AUTHOR  and ! $ENV{MAKELEVEL}) {
     ;
   }
 }
-else {
-  # make sure this Makefile can not be used to make a dist
-  # (without the author includes there are no meta cleanup, no sanity checks, etc)
-  postamble <<EOP;
-create_distdir: nonauthor_stop_distdir_creation
-nonauthor_stop_distdir_creation:
-\t\$(NOECHO) \$(ECHO) Creation of dists in non-author mode is not allowed
-\t\$(NOECHO) \$(FALSE)
-EOP
-}
-
-# compose final req list, for alphabetical ordering
-my %final_req;
-for my $rtype (keys %$reqs) {
-  for my $mod (keys %{$reqs->{$rtype}} ) {
-
-    # sanity check req duplications
-    if ($final_req{$mod}) {
-      die "$mod specified as both a '$rtype' and a '$final_req{$mod}[0]'\n";
-    }
-
-    $final_req{$mod} = [ $rtype, $reqs->{$rtype}{$mod}||0 ],
-  }
-}
-
-# actual require
-for my $mod (sort keys %final_req) {
-  my ($rtype, $ver) = @{$final_req{$mod}};
-  no strict 'refs';
-  $rtype->($mod, $ver);
-}
-
-# author-mode or not - this is where we show a list of missing deps
-# IFF we are running interactively
-auto_install();
-
-WriteAll();