From: Graham Knop Date: Tue, 12 Aug 2014 06:12:14 +0000 (-0400) Subject: distar-ify X-Git-Tag: v0.27~4 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=9ab3d5c32d6879373ee1a0afc6ebd57dbf5e52fb;p=gitmo%2FClass-C3.git distar-ify --- diff --git a/.gitignore b/.gitignore index fa8b17c..8ec66bc 100644 --- a/.gitignore +++ b/.gitignore @@ -8,8 +8,11 @@ blib build inc pm_to_blib -MANIFEST* -!MANIFEST.SKIP +/MANIFEST +/MANIFEST.bak +/MANIFEST.SKIP +/Distar Debian* README -Class-C3-* +/Class-C3-*/ +/Class-C3-*.tar.gz diff --git a/MANIFEST.SKIP b/MANIFEST.SKIP deleted file mode 100644 index 839cd78..0000000 --- a/MANIFEST.SKIP +++ /dev/null @@ -1,23 +0,0 @@ -^_build -^Build$ -^blib -~$ -\.bak$ -^MANIFEST\.SKIP$ -^MYMETA\. -CVS -\.svn -\.DS_Store -cover_db -\..*\.sw.?$ -^Makefile$ -^pm_to_blib$ -^MakeMaker-\d -^blibdirs$ -\.old$ -^#.*#$ -^\.# -\.gz$ -DEV_README -Build.PL -^\. diff --git a/Makefile.PL b/Makefile.PL index bda7994..5f53c66 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -1,93 +1,107 @@ use strict; -use warnings; +use warnings FATAL => 'all'; use 5.006; -use ExtUtils::MakeMaker; - -my $mymeta_works = eval { ExtUtils::MakeMaker->VERSION('6.5707'); 1 }; -my $mymeta = $mymeta_works || eval { ExtUtils::MakeMaker->VERSION('6.5702'); 1 }; - -my %BUILD_DEPS = ( - 'Test::More' => '0.47', -); -my %OPT_BUILD_DEPS = ( $] < 5.009_005 and is_smoker() ) - ? ( 'Devel::Hide' => 0 ) : () -; - -my %RUN_DEPS = ( - # needed by the PP version only, have them installed - # regardless of XS availability or perl version - # (for fatpacking and whatnot) - 'Algorithm::C3' => '0.07', - 'Scalar::Util' => '0', -); -my %OPT_RUN_DEPS = ( $] < 5.009_005 and can_xs() ) - ? ( 'Class::C3::XS' => '0.13' ) : () -; - -my %META_BITS = ( +my %META = ( + name => 'Class-C3', + license => 'perl_5', + prereqs => { + configure => { requires => { + 'ExtUtils::MakeMaker' => 0, + 'ExtUtils::CBuilder' => 0.27, + } }, + build => { requires => { + } }, + test => { + requires => { + 'Test::More' => '0.47', + }, + }, + runtime => { + requires => { + 'Algorithm::C3' => '0.07', + 'Scalar::Util' => '0', + 'perl' => 5.006, + }, + }, + develop => { + requires => { map { $_ => 0 } qw( + indirect multidimensional bareword::filehandles + Moose Mouse namespace::clean namespace::autoclean + MooseX::Types::Common::Numeric + Type::Tiny + ) }, + }, + }, resources => { - homepage => 'http://search.cpan.org/dist/Class-C3', - repository => 'git://git.shadowcat.co.uk/gitmo/Class-C3.git', - bugtracker => 'http://rt.cpan.org/Public/Dist/Display.html?Name=Class-C3', + repository => { + url => 'git://git.shadowcat.co.uk/gitmo/Class-C3.git', + web => 'http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=gitmo/Class-C3.git', + type => 'git', + }, + bugtracker => { + web => 'https://rt.cpan.org/Public/Dist/Display.html?Name=Class-C3', + mailto => 'bug-Class-C3@rt.cpan.org', + }, + homepage => 'https://metacpan.org/release/Class-C3', + license => [ 'http://dev.perl.org/licenses/' ], + }, + no_index => { + directory => [ 't', 'xt', 'opt' ] }, ); -my %WriteMakefileArgs = ( - 'NAME' => 'Class::C3', - 'AUTHOR' => 'Stevan Little, ', - 'VERSION_FROM' => 'lib/Class/C3.pm', - 'ABSTRACT_FROM' => 'lib/Class/C3.pm', - 'MIN_PERL_VERSION' => '5.006', - 'CONFIGURE_REQUIRES' => { 'ExtUtils::CBuilder' => 0.27 }, - 'PREREQ_PM' => { - %RUN_DEPS, %OPT_RUN_DEPS, - $mymeta_works ? () : (%BUILD_DEPS, %OPT_BUILD_DEPS), +my %MM_ARGS = ( + TEST_REQUIRES => { + ( $] < 5.009_005 and is_smoker() ) + ? ( 'Devel::Hide' => 0 ) : () + }, + PREREQ_PM => { + ( $] < 5.009_005 and can_xs() ) + ? ( 'Class::C3::XS' => '0.13' ) : () }, - - $mymeta_works - ? ( # BUILD_REQUIRES makes MYMETA right, requires stops META being wrong - 'BUILD_REQUIRES' => { %BUILD_DEPS, %OPT_BUILD_DEPS }, - 'META_ADD' => { - %META_BITS, - requires => \%RUN_DEPS, - }, - ) - : ( # META_ADD both to get META right - only Makefile written - 'META_ADD' => { - %META_BITS, - requires => \%RUN_DEPS, - build_requires => \%BUILD_DEPS, - }, - ) - , - - ($mymeta and !$mymeta_works) ? ( 'NO_MYMETA' => 1 ) : (), - - 'LICENSE' => 'perl', ); - -unless ( eval { ExtUtils::MakeMaker->VERSION('6.56') } ) { - my $br = delete $WriteMakefileArgs{BUILD_REQUIRES}; - my $pp = $WriteMakefileArgs{PREREQ_PM}; - for my $mod ( keys %$br ) { - if ( exists $pp->{$mod} ) { - $pp->{$mod} = $br->{$mod} if $br->{$mod} > $pp->{$mod}; - } - else { - $pp->{$mod} = $br->{$mod}; - } - } +############################################################################## +require ExtUtils::MakeMaker; +(do 'maint/Makefile.PL.include' or die $@) unless -f 'META.yml'; + +# have to do this since old EUMM dev releases miss the eval $VERSION line +my $eumm_version = eval $ExtUtils::MakeMaker::VERSION; +my $mymeta = $eumm_version >= 6.57_02; +my $mymeta_broken = $mymeta && $eumm_version < 6.57_07; + +($MM_ARGS{NAME} = $META{name}) =~ s/-/::/g; +($MM_ARGS{VERSION_FROM} = "lib/$MM_ARGS{NAME}.pm") =~ s{::}{/}g; +$MM_ARGS{LICENSE} = $META{license} + if $eumm_version >= 6.30; +$MM_ARGS{NO_MYMETA} = 1 + if $mymeta_broken; +$MM_ARGS{META_ADD} = { 'meta-spec' => { version => 2 }, %META } + unless -f 'META.yml'; + +for (qw(configure build test runtime)) { + my $key = $_ eq 'runtime' ? 'PREREQ_PM' : uc $_.'_REQUIRES'; + my $r = $MM_ARGS{$key} = { + %{$META{prereqs}{$_}{requires} || {}}, + %{delete $MM_ARGS{$key} || {}}, + }; + defined $r->{$_} or delete $r->{$_} for keys %$r; } -delete $WriteMakefileArgs{CONFIGURE_REQUIRES} - unless eval { ExtUtils::MakeMaker->VERSION('6.52') }; +$MM_ARGS{MIN_PERL_VERSION} = delete $MM_ARGS{PREREQ_PM}{perl} || 0; -system("pod2text lib/Class/C3.pm >README") - unless -f 'META.yml'; +delete $MM_ARGS{MIN_PERL_VERSION} + if $eumm_version < 6.47_01; +$MM_ARGS{BUILD_REQUIRES} = {%{$MM_ARGS{BUILD_REQUIRES}}, %{delete $MM_ARGS{TEST_REQUIRES}}} + if $eumm_version < 6.63_03; +$MM_ARGS{PREREQ_PM} = {%{$MM_ARGS{PREREQ_PM}}, %{delete $MM_ARGS{BUILD_REQUIRES}}} + if $eumm_version < 6.55_01; +delete $MM_ARGS{CONFIGURE_REQUIRES} + if $eumm_version < 6.51_03; -WriteMakefile(%WriteMakefileArgs); +ExtUtils::MakeMaker::WriteMakefile(%MM_ARGS); +############################################################################## # Secondary compile testing via ExtUtils::CBuilder sub can_xs {