[Catalyst-commits] r8690 - in trunk/Catalyst-Plugin-Geography: . lib/Catalyst/Plugin

[marcus at dev.catalyst.perl.org]

Author: marcus
Date: 2008-12-02 12:35:22 +0000 (Tue, 02 Dec 2008)
New Revision: 8690

Removed:
   trunk/Catalyst-Plugin-Geography/Build.PL
Modified:
   trunk/Catalyst-Plugin-Geography/Changes
   trunk/Catalyst-Plugin-Geography/MANIFEST
   trunk/Catalyst-Plugin-Geography/Makefile.PL
   trunk/Catalyst-Plugin-Geography/lib/Catalyst/Plugin/Geography.pm
Log:
Switch to Module::Install

Deleted: trunk/Catalyst-Plugin-Geography/Build.PL
===================================================================
--- trunk/Catalyst-Plugin-Geography/Build.PL	2008-12-02 09:54:09 UTC (rev 8689)
+++ trunk/Catalyst-Plugin-Geography/Build.PL	2008-12-02 12:35:22 UTC (rev 8690)
@@ -1,17 +0,0 @@
-use strict;
-use Module::Build;
-
-my $build = Module::Build->new(
-    create_makefile_pl => 'passthrough',
-    license            => 'perl',
-    module_name        => 'Catalyst::Plugin::Geography',
-    requires           => {
-      'IP::Country::Fast'     => 0,
-      'Geography::Countries'  => 0
-    },
-    create_makefile_pl => 'passthrough',
-    test_files   => [
-        glob('t/*.t') 
-    ]
-);
-$build->create_build_script;

Modified: trunk/Catalyst-Plugin-Geography/Changes
===================================================================
--- trunk/Catalyst-Plugin-Geography/Changes	2008-12-02 09:54:09 UTC (rev 8689)
+++ trunk/Catalyst-Plugin-Geography/Changes	2008-12-02 12:35:22 UTC (rev 8690)
@@ -1,4 +1,7 @@
 Revision history for Perl extension Catalyst::Plugin::Geography
 
+0.02  Tue Dec 02 13:31:00 2008
+        - Switch to Module::Install
+        
 0.01  Sun May 01 13:28:00 2005
         - packaged up chansen's original version.

Modified: trunk/Catalyst-Plugin-Geography/MANIFEST
===================================================================
--- trunk/Catalyst-Plugin-Geography/MANIFEST	2008-12-02 09:54:09 UTC (rev 8689)
+++ trunk/Catalyst-Plugin-Geography/MANIFEST	2008-12-02 12:35:22 UTC (rev 8690)
@@ -1,10 +1,17 @@
-Build.PL
-Makefile.PL
 Changes
+inc/Module/Install.pm
+inc/Module/Install/Base.pm
+inc/Module/Install/Can.pm
+inc/Module/Install/Fetch.pm
+inc/Module/Install/Makefile.pm
+inc/Module/Install/Metadata.pm
+inc/Module/Install/Win32.pm
+inc/Module/Install/WriteAll.pm
 lib/Catalyst/Plugin/Geography.pm
 lib/Catalyst/Plugin/Geography/Implementation.pm
+Makefile.PL
 MANIFEST			This list of files
+META.yml
 t/01use.t
 t/02pod.t
 t/03podcoverage.t
-META.yml

Modified: trunk/Catalyst-Plugin-Geography/Makefile.PL
===================================================================
--- trunk/Catalyst-Plugin-Geography/Makefile.PL	2008-12-02 09:54:09 UTC (rev 8689)
+++ trunk/Catalyst-Plugin-Geography/Makefile.PL	2008-12-02 12:35:22 UTC (rev 8690)
@@ -1,31 +1,9 @@
-# Note: this file was auto-generated by Module::Build::Compat version 0.03
-    
-    unless (eval "use Module::Build::Compat 0.02; 1" ) {
-      print "This module requires Module::Build to install itself.\n";
-      
-      require ExtUtils::MakeMaker;
-      my $yn = ExtUtils::MakeMaker::prompt
-	('  Install Module::Build now from CPAN?', 'y');
-      
-      unless ($yn =~ /^y/i) {
-	die " *** Cannot install without Module::Build.  Exiting ...\n";
-      }
-      
-      require Cwd;
-      require File::Spec;
-      require CPAN;
-      
-      # Save this 'cause CPAN will chdir all over the place.
-      my $cwd = Cwd::cwd();
-      my $makefile = File::Spec->rel2abs($0);
-      
-      CPAN::Shell->install('Module::Build::Compat')
-	or die " *** Cannot install without Module::Build.  Exiting ...\n";
-      
-      chdir $cwd or die "Cannot chdir() back to $cwd: $!";
-    }
-    eval "use Module::Build::Compat 0.02; 1" or die $@;
-    use lib '_build/lib';
-    Module::Build::Compat->run_build_pl(args => \@ARGV);
-    require Module::Build;
-    Module::Build::Compat->write_makefile(build_class => 'Module::Build');
+use inc::Module::Install;
+
+name 'Catalyst-Plugin-Geography';
+all_from 'lib/Catalyst/Plugin/Geography.pm';
+
+requires 'IP::Country::Fast';
+requires 'Geography::Countries';
+
+WriteAll;
\ No newline at end of file

Modified: trunk/Catalyst-Plugin-Geography/lib/Catalyst/Plugin/Geography.pm
===================================================================
--- trunk/Catalyst-Plugin-Geography/lib/Catalyst/Plugin/Geography.pm	2008-12-02 09:54:09 UTC (rev 8689)
+++ trunk/Catalyst-Plugin-Geography/lib/Catalyst/Plugin/Geography.pm	2008-12-02 12:35:22 UTC (rev 8690)
@@ -3,7 +3,7 @@
 use strict;
 use Catalyst::Plugin::Geography::Implementation;
 
-our $VERSION = '0.01';
+our $VERSION = '0.02';
 
 *geo = \&geography;    # Makes sri happy ;)