From ed2626cf8679e99fc477df3fa95beaadb3149437 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=94=90=E9=B3=B3?= Date: Sat, 16 Oct 2010 10:07:38 +0800 Subject: [PATCH] * Switch back to "small" makefile_pl as "passthrough" is now deprecated. --- Build.PL | 12 ++++++++---- Makefile.PL | 30 +----------------------------- 2 files changed, 9 insertions(+), 33 deletions(-) diff --git a/Build.PL b/Build.PL index 4ef5a25..4e02c3d 100644 --- a/Build.PL +++ b/Build.PL @@ -7,16 +7,20 @@ Module::Build->new( dist_name => 'Acme-Hello', dist_version => '0.04', license => 'CC0', - create_makefile_pl => 'passthrough', + create_makefile_pl => 'small', sign => 1, + configure_requires => { + 'Module::Build' => 0.36, + }, + recommends => { - 'Locale::Maketext' => '0.20', - 'Locale::Maketext::Lexicon' => '0.15', + 'Locale::Maketext' => '0.20', + 'Locale::Maketext::Lexicon' => '0.15', }, requires => { - 'perl' => '5.005', + 'perl' => '5.005', }, )->create_build_script; diff --git a/Makefile.PL b/Makefile.PL index 826929f..ef3312e 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -1,35 +1,7 @@ # Note: this file was auto-generated by Module::Build::Compat version 0.36_16 require 5.005; - - 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 $@; + use Module::Build::Compat 0.02; Module::Build::Compat->run_build_pl(args => \@ARGV); - my $build_script = 'Build'; - $build_script .= '.com' if $^O eq 'VMS'; - exit(0) unless(-e $build_script); # cpantesters convention require Module::Build; Module::Build::Compat->write_makefile(build_class => 'Module::Build');