From: Ash Berlin Date: Sun, 12 Nov 2006 16:52:21 +0000 (+0000) Subject: Moved from M::B to M::I X-Git-Tag: v0.08010~150^2~137 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=dbsrgits%2FDBIx-Class.git;a=commitdiff_plain;h=ce4c07df9e268eb44c9b1d132db2eef3d8ec55bf Moved from M::B to M::I Added myself to CONTRIBUTORS --- diff --git a/Build.PL b/Build.PL index 2ba9d22..a919ccc 100644 --- a/Build.PL +++ b/Build.PL @@ -1,32 +1,3 @@ -use strict; -use Module::Build; - -my %arguments = ( - create_makefile_pl => 'passthrough', - license => 'perl', - module_name => 'DBIx::Class', - requires => { - 'Cwd' => 3.19, - 'Data::Page' => 2.00, - 'Scalar::Util' => 0, - 'SQL::Abstract' => 1.20, - 'SQL::Abstract::Limit' => 0.101, - 'Class::C3' => 0.13, - 'Storable' => 0, - 'Class::Data::Accessor' => 0.01, - 'Carp::Clan' => 0, - 'DBI' => 1.40, - 'Module::Find' => 0, - 'Class::Inspector' => 0, - }, - build_requires => { - 'DBD::SQLite' => 1.11, - }, - create_makefile_pl => 'passthrough', - create_readme => 1, - test_files => [ glob('t/*.t'), glob('t/*/*.t') ], - script_files => [ glob('script/*') ], -); - -Module::Build->new(%arguments)->create_build_script; - +# Dear Distribution Packager. This use of require is intentional. +# Module::Install detects Build.PL usage and acts accordingly. +require 'Makefile.PL'; diff --git a/MANIFEST.SKIP b/MANIFEST.SKIP index 10c77a4..1325801 100644 --- a/MANIFEST.SKIP +++ b/MANIFEST.SKIP @@ -39,3 +39,6 @@ # Skip maint stuff ^maint/ + +# Dont use Module::Build anymore +# Build.PL diff --git a/Makefile.PL b/Makefile.PL index 192903a..bef856c 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -1,31 +1,29 @@ -# 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 inc::Module::Install; + +name 'DBIx-Class'; +all_from 'lib/DBIx/Class.pm'; +perl_version '5.006001'; + +requires 'Cwd' => 3.19; +requires 'Data::Page' => 2.00; +requires 'Scalar::Util' => 0; +requires 'SQL::Abstract' => 1.20; +requires 'SQL::Abstract::Limit' => 0.101; +requires 'Class::C3' => 0.13; +requires 'Storable' => 0; +requires 'Class::Data::Accessor' => 0.01; +requires 'Carp::Clan' => 0; +requires 'DBI' => 1.40; +requires 'Module::Find' => 0; +requires 'Class::Inspector' => 0; + +# Perl 5.8.0 doesn't have utf8::is_utf8() +requires 'Encode' => 0 if ($] <= 5.008000); + +build_requires 'DBD::SQLite' => 1.11; + +install_script 'script/dbicadmin'; + +tests "t/*.t t/*/*.t"; + +WriteAll; diff --git a/lib/DBIx/Class.pm b/lib/DBIx/Class.pm index 89a97bb..c977288 100644 --- a/lib/DBIx/Class.pm +++ b/lib/DBIx/Class.pm @@ -180,6 +180,8 @@ andyg: Andy Grundman ank: Andres Kievsky +ash: Ash Berlin + blblack: Brandon L. Black bluefeet: Aran Deltac