From: Peter Rabbitson <ribasushi@cpan.org>
Date: Sun, 21 Feb 2010 12:37:30 +0000 (+0000)
Subject: Reorder makefile author actions to make output more readable
X-Git-Tag: v0.08120~15^2
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=92f8f62a409498010240d0ac9f251c4d61fc64f7;p=dbsrgits%2FDBIx-Class.git

Reorder makefile author actions to make output more readable
---

diff --git a/Makefile.PL b/Makefile.PL
index f01351d..d98c782 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -59,28 +59,9 @@ my $reqs = {
   test_requires => { %$test_requires },
 };
 
-# 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');
-
-  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;
-
-# FIXME Disabled due to unsolved issues, ask theorbtwo
-#  require Module::Install::Pod::Inherit;
-#  PodInherit();
 
+# require extra modules for testing if we're in a checkout
+if ($Module::Install::AUTHOR) {
   warn <<'EOW';
 ******************************************************************************
 ******************************************************************************
@@ -92,6 +73,7 @@ if ($Module::Install::AUTHOR) {
 
 EOW
 
+  require DBIx::Class::Optional::Dependencies;
   $reqs->{test_requires} = {
     %{$reqs->{test_requires}},
     %{DBIx::Class::Optional::Dependencies->_all_optional_requirements},
@@ -119,6 +101,31 @@ for my $mod (sort keys %final_req) {
   $rtype->($mod, $ver);
 }
 
+auto_install();
+
+# re-create various autogenerated documentation bits
+if ($Module::Install::AUTHOR) {
+
+  print "Regenerating README\n";
+  system('pod2text lib/DBIx/Class.pm > README');
+
+  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;
+
+  # FIXME Disabled due to unsolved issues, ask theorbtwo
+  #  require Module::Install::Pod::Inherit;
+  #  PodInherit();
+}
+
 install_script (qw|
     script/dbicadmin
 |);
@@ -142,8 +149,6 @@ no_index package => $_ for (qw/
 /);
 
 
-auto_install();
-
 WriteAll();