Win32 fixes

diff --git a/Changes b/Changes
index c7ed4a8..6815d3d 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,5 +1,11 @@
 This file documents the revision history for Perl extension Catalyst-Devel.
 
+NEXT 2011-09-05 13:05:00
+        - Stop requiring Starman and MooseX::Daemonize on Win32 as they're
+          optional components in Catalyst::Runtime and won't install
+          on Windows.
+        - Fix test to work on Windows. 
+
 1.34 2011-08-16 09:02:00
         - Bump required version of Catalyst to 5.9
         - Merge psgi support. catalyst.pl will now generate a default

diff --git a/Makefile.PL b/Makefile.PL
index e3b05be..edf930b 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -21,8 +21,11 @@ requires 'File::ChangeNotify' => '0.07';
 requires 'File::Copy::Recursive';
 requires 'Path::Class' => '0.09';
 requires 'Template'    => '2.14';
-requires 'MooseX::Daemonize'; # Optional in scripts
-requires 'Starman'; # Optional in scripts
+
+if (!$Module::Install::AUTHOR && $^O ne 'MSWin32') {
+    requires 'MooseX::Daemonize'; # Optional in scripts
+    requires 'Starman'; # Optional in scripts
+}
 
 # The Catalyst applications this module distribution have a Makefile.PL using
 # Module::Install as well as the Module::Install::Catalyst extension included in
@@ -42,13 +45,6 @@ install_share 'share';
 
 author_tests 't/author';
 
-if ( $^O eq 'MSWin32' ) {
-    # Proc::Background needs this on Win32 but doesn't actually
-    # require it, if it's missing it just dies in the Makefile.PL.
-    requires 'Win32::Process' => '0.04';
-    requires 'Proc::Background';
-}
-
 if (!$ENV{CATALYST_DEVEL_NO_510_CHECK}) {
     use Symbol 'gensym';
     use IPC::Open3;