X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Makefile.PL;h=c6ae2a2e0a4413dcd062a193c5a01cf4a1d96e59;hb=86eaf9262df0d45dd0658eabce1e889730056dba;hp=e5ca72993d3199b4ac616745608996f0e7b5bed1;hpb=e946eafd5c7f853cf90d996210d773bdb31cf68c;p=catagits%2FCatalyst-Engine-STOMP.git

diff --git a/Makefile.PL b/Makefile.PL
index e5ca729..c6ae2a2 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -1,57 +1,49 @@
-use inc::Module::Install;
+use inc::Module::Install 0.91;
+use strict;
+use warnings;
 use 5.008006;
 
+BEGIN {
+    if ($Module::Install::AUTHOR) {
+        require Module::Install::AuthorRequires;
+    }
+}
+
 license  'perl';
 
 name     'Catalyst-Engine-Stomp';
 all_from 'lib/Catalyst/Engine/Stomp.pm';
 
 requires 'Catalyst::Engine::Embeddable'  => '0.0.1';
-requires 'Catalyst::Action::REST' => undef;
 requires 'Catalyst::Runtime'  => '5.80004';
 requires 'Moose' => undef;
+requires 'MooseX::Types' => undef;
 requires 'MooseX::Workers' => '0.05';
 requires 'Net::Stomp' => '0.34';
 requires 'YAML::XS' => '0.32';
+requires 'Data::Serializer' => '0.49';
 requires 'namespace::autoclean' => '0.05';
 
 test_requires 'Alien::ActiveMQ' => '0.00003';
+test_requires 'Catalyst::Plugin::ConfigLoader' => undef;
 
-no_index package => 'StompTestApp';
-no_index package => 'StompTestApp::Controller::TestController';
-
-my @force_build_requires_if_author = qw(
-  Test::NoTabs
-  Test::Pod
-  Test::Pod::Coverage
-  Pod::Coverage
-);
+author_requires 'Test::NoTabs';
+author_requires 'Test::Pod';
+author_requires 'Test::Pod::Coverage';
+author_requires 'Pod::Coverage';
 
 if ($Module::Install::AUTHOR) {
-    foreach my $module (@force_build_requires_if_author) {
-        build_requires $module;
-    }
     darwin_check_no_resource_forks();
 }
 
+resources
+    'repository' => 'git://github.com/chrisa/catalyst-engine-stomp.git',
+    'license' => 'http://dev.perl.org/licenses/';
+
 install_script glob('script/*.pl');
 auto_install;
 WriteAll;
 
-if ($Module::Install::AUTHOR) {
-
-  # Strip out the author only build_requires from META.yml
-  # Need to do this _after_ WriteAll else it looses track of them
-  strip_author_only_build_requires(@force_build_requires_if_author);
-
-  Meta->{values}{resources} = [
-    [ 'license',    => 'http://dev.perl.org/licenses/' ],
-    [ 'repository', => 'git://github.com/chrisa/catalyst-engine-stomp.git' ],
-  ];
-
-  Meta->write;
-}
-
 sub darwin_check_no_resource_forks {
     if ($^O eq 'darwin') {
         my $osx_ver = `/usr/bin/sw_vers -productVersion`;
@@ -59,7 +51,7 @@ sub darwin_check_no_resource_forks {
 
         # TAR on 10.4 wants COPY_EXTENDED_ATTRIBUTES_DISABLE
         # On 10.5 (Leopard) it wants COPYFILE_DISABLE
-        my $attr = $osx_ver eq '10.5' ? 'COPYFILE_DISABLE' : 'COPY_EXTENDED_ATTRIBUTES_DISABLE';
+        my $attr = $osx_ver =~ /^10.5/ ? 'COPYFILE_DISABLE' : 'COPY_EXTENDED_ATTRIBUTES_DISABLE';
 
         makemaker_args(dist => { PREOP => qq{\@if [ "\$\$$attr" != "true" ]; then}.
                                           qq{ echo "You must set the ENV variable $attr to true,"; }.
@@ -67,17 +59,3 @@ sub darwin_check_no_resource_forks {
         }
 }
 
-sub strip_author_only_build_requires {
-    my @build_requires_to_strip = @_;
-    Meta->{values}{build_requires} = [ grep {
-      my $ok = 1;
-      foreach my $module (@build_requires_to_strip) {
-        if ($_->[0] =~ /$module/) {
-          $ok = 0;
-          last;
-        }
-      }
-      $ok;
-    } @{Meta->{values}{build_requires}} ];
-}
-