[Catalyst-commits] r13079 - in trunk/Catalyst-Model-Xapian: . lib/Catalyst/Model

[marcus at dev.catalyst.perl.org]

Author: marcus
Date: 2010-03-24 11:54:56 +0000 (Wed, 24 Mar 2010)
New Revision: 13079

Removed:
   trunk/Catalyst-Model-Xapian/Build.PL
Modified:
   trunk/Catalyst-Model-Xapian/Changes
   trunk/Catalyst-Model-Xapian/Makefile.PL
   trunk/Catalyst-Model-Xapian/lib/Catalyst/Model/Xapian.pm
Log:
Remove Module::Build

Deleted: trunk/Catalyst-Model-Xapian/Build.PL
===================================================================
--- trunk/Catalyst-Model-Xapian/Build.PL	2010-03-23 23:08:22 UTC (rev 13078)
+++ trunk/Catalyst-Model-Xapian/Build.PL	2010-03-24 11:54:56 UTC (rev 13079)
@@ -1,21 +0,0 @@
-use strict;
-use Module::Build;
-
-my %arguments = (
-    create_makefile_pl => 'passthrough',
-    license            => 'perl',
-    module_name        => 'Catalyst::Model::Xapian',
-    requires           => {
-        'Search::Xapian' => '0.9.2.4',
-        'Encode'         => '0',
-        'Storable'       => '0',
-        'Catalyst'       => '5.30',
-        'Data::Page'     => '0',
-        'MRO::Compat'    => '0',
-    },
-    create_makefile_pl => 'passthrough',
-    test_files         => [ glob('t/*.t') ],
-    create_readme      => 1,
-);
-
-Module::Build->new(%arguments)->create_build_script;

Modified: trunk/Catalyst-Model-Xapian/Changes
===================================================================
--- trunk/Catalyst-Model-Xapian/Changes	2010-03-23 23:08:22 UTC (rev 13078)
+++ trunk/Catalyst-Model-Xapian/Changes	2010-03-24 11:54:56 UTC (rev 13079)
@@ -1,5 +1,8 @@
 Revision history for Perl extension Catalyst::Model::Xapian.
 
+0.04  2010-03-24 12:54:00
+    - Switch to ExtUtils::MakeMaker
+
 0.04  2009-06-25 03:16:00
     - Update to use MRO::Compat
 

Modified: trunk/Catalyst-Model-Xapian/Makefile.PL
===================================================================
--- trunk/Catalyst-Model-Xapian/Makefile.PL	2010-03-23 23:08:22 UTC (rev 13078)
+++ trunk/Catalyst-Model-Xapian/Makefile.PL	2010-03-24 11:54:56 UTC (rev 13079)
@@ -1,31 +1,21 @@
-# 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();
-      
-      CPAN::Shell->install('Module::Build::Compat');
-      CPAN::Shell->expand("Module", "Module::Build::Compat")->uptodate
-	or die "Couldn't install Module::Build, giving up.\n";
-      
-      chdir $cwd or die "Cannot chdir() back to $cwd: $!";
-    }
-    eval "use Module::Build::Compat 0.02; 1" or die $@;
-    
-    Module::Build::Compat->run_build_pl(args => \@ARGV);
-    require Module::Build;
-    Module::Build::Compat->write_makefile(build_class => 'Module::Build');
+use strict;
+use warnings;
+use ExtUtils::MakeMaker;
+
+WriteMakefile(
+    NAME                => 'Catalyst::Model::Xapian',
+    AUTHOR              => 'Jonathan Rockway <mramberg at cpan.org>',
+    VERSION_FROM        => 'lib/Catalyst/Model/Xapian.pm',
+    ABSTRACT_FROM       => 'lib/Catalyst/Model/Xapian.pm',
+    PL_FILES            => {},
+    PREREQ_PM => {
+        'Search::Xapian' => '0.9.2.4',
+        'Encode'         => '0',
+        'Storable'       => '0',
+        'Catalyst'       => '5.30',
+        'Data::Page'     => '0',
+        'MRO::Compat'    => '0',
+		 },
+    dist                => { COMPRESS => 'gzip -9f', SUFFIX => 'gz', },
+    clean               => { FILES => 'Catalyst-Model-Xapian-*' },
+);

Modified: trunk/Catalyst-Model-Xapian/lib/Catalyst/Model/Xapian.pm
===================================================================
--- trunk/Catalyst-Model-Xapian/lib/Catalyst/Model/Xapian.pm	2010-03-23 23:08:22 UTC (rev 13078)
+++ trunk/Catalyst-Model-Xapian/lib/Catalyst/Model/Xapian.pm	2010-03-24 11:54:56 UTC (rev 13079)
@@ -12,7 +12,7 @@
 use MRO::Compat;
 use Time::HiRes qw/gettimeofday tv_interval/;
 
-our $VERSION='0.04';
+our $VERSION='0.05';
 
 __PACKAGE__->mk_accessors('db');
 __PACKAGE__->mk_accessors('qp');