From: Peter Rabbitson Date: Mon, 28 Sep 2015 06:52:07 +0000 (+0200) Subject: Streamline meta etc X-Git-Tag: 0.26~4 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=p5sagit%2Fnamespace-clean.git;a=commitdiff_plain;h=18377f5b48c5ddfa2a6ca9e6ec7109e1e0ad50a0 Streamline meta etc --- diff --git a/Makefile.PL b/Makefile.PL index 266f171..d160e01 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -2,22 +2,57 @@ use strict; use warnings; use 5.008001; -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.88', -); +my %META = ( + name => 'namespace::clean', + license => 'perl_5', + + abstract => 'Keep imports and functions out of your namespace', + author => [ + 'Robert \'phaylon\' Sedlacek ', + 'Florian Ragwitz ', + 'Jesse Luehrs ', + 'Peter Rabbitson ', + 'Father Chrysostomos ', + ], + + prereqs => { + configure => { + requires => { + 'ExtUtils::MakeMaker' => 0, + 'ExtUtils::CBuilder' => 0.27, + } + }, + runtime => { + requires => { + 'Package::Stash' => '0.23', + 'B::Hooks::EndOfScope' => '0.12', + 'perl' => '5.008001', + }, + }, + test => { + requires => { + 'Test::More' => '0.88', + } + }, + }, -my %RUN_DEPS = ( - 'Package::Stash' => '0.23', - 'B::Hooks::EndOfScope' => '0.12', + resources => { + x_IRC => 'irc://irc.perl.org/#toolchain', + homepage => 'http://search.cpan.org/dist/namespace-clean', + repository => { + type => 'git', + url => 'git://git.shadowcat.co.uk/p5sagit/namespace-clean.git', + web => 'http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=p5sagit/namespace-clean.git', + }, + bugtracker => { + mailto => 'bug-namespace-clean@rt.cpan.org', + web => 'http://rt.cpan.org/Public/Dist/Display.html?Name=namespace-clean', + }, + }, ); -# a sub-namer is needed if using the debugger on some perls -my %OPT_RUN_DEPS = ( ( +my %MM_ARGS = ( ( + # a sub-namer is needed if using the debugger on some perls require 'lib/namespace/clean/_Util.pm' and namespace::clean::_Util::DEBUGGER_NEEDS_CV_RENAME() @@ -27,97 +62,57 @@ my %OPT_RUN_DEPS = ( ( can_xs() ) # when changing version, also change $sn_ver in namespace/clean/_Util.pm - ? ( 'Sub::Name' => '0.04' ) + ? ( PREREQ_PM => { 'Sub::Name' => '0.04' } ) : () ); -my %META_BITS = ( - resources => { - homepage => 'http://search.cpan.org/dist/namespace-clean', - # EUMM not supporting nested meta :( - #repository => { - # type => 'git', - # url => 'git://git.shadowcat.co.uk/p5sagit/namespace-clean.git', - # web => 'http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=p5sagit/namespace-clean.git', - #} - #bugtracker => { - # mailto => 'bug-namespace-clean@rt.cpan.org', - # web => 'http://rt.cpan.org/Public/Dist/Display.html?Name=namespace-clean', - #}, - - repository => 'git://git.shadowcat.co.uk/p5sagit/namespace-clean.git', - bugtracker => 'http://rt.cpan.org/Public/Dist/Display.html?Name=namespace-clean', - }, -); - -my %WriteMakefileArgs = ( - 'NAME' => 'namespace::clean', - 'VERSION_FROM' => 'lib/namespace/clean.pm', - 'ABSTRACT' => 'Keep imports and functions out of your namespace', - 'AUTHOR' => 'Robert \'phaylon\' Sedlacek , Florian Ragwitz , Jesse Luehrs ', - 'CONFIGURE_REQUIRES' => { 'ExtUtils::CBuilder' => 0.27 }, - 'PREREQ_PM' => { - %RUN_DEPS, %OPT_RUN_DEPS, - $mymeta_works ? () : (%BUILD_DEPS), - }, - - $mymeta_works - ? ( # BUILD_REQUIRES makes MYMETA right, requires stops META being wrong - 'BUILD_REQUIRES' => \%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}; - } - } +## BOILERPLATE ############################################################### +require ExtUtils::MakeMaker; + +# 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; +$META{license} = [ $META{license} ] + if $META{license} && !ref $META{license}; +$MM_ARGS{LICENSE} = $META{license}[0] + if $META{license} && $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; -WriteMakefile(%WriteMakefileArgs); +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; -# Secondary compile testing via ExtUtils::CBuilder -sub can_xs { - # Do we have the configure_requires checker? - local $@; - eval "require ExtUtils::CBuilder;"; - if ( $@ ) { - # They don't obey configure_requires, so it is - # someone old and delicate. Try to avoid hurting - # them by falling back to an older simpler test. - return can_cc(); - } +ExtUtils::MakeMaker::WriteMakefile(%MM_ARGS); +## END BOILERPLATE ########################################################### - return ExtUtils::CBuilder->new( quiet => 1 )->have_compiler; -} +# FIXME +# Need to replace with EU::HC, but too many changes for this release already +########################################### # can we locate a (the) C compiler sub can_cc { my @chunks = split(/ /, $Config::Config{cc}) or return; @@ -139,6 +134,7 @@ sub can_run { return $found_cmd; } + require File::Spec; for my $dir ((split /$Config::Config{path_sep}/, $ENV{PATH}), '.') { next if $dir eq ''; my $abs = File::Spec->catfile($dir, $cmd); @@ -147,3 +143,71 @@ sub can_run { return; } + +# Can our C compiler environment build XS files +sub can_xs { + # Do we have the configure_requires checker? + local $@; + eval "require ExtUtils::CBuilder; ExtUtils::CBuilder->VERSION(0.27)"; + if ( $@ ) { + # They don't obey configure_requires, so it is + # someone old and delicate. Try to avoid hurting + # them by falling back to an older simpler test. + return can_cc(); + } + + # Do we have a working C compiler + my $builder = ExtUtils::CBuilder->new( + quiet => 1, + ); + unless ( $builder->have_compiler ) { + # No working C compiler + return 0; + } + + # Write a C file representative of what XS becomes + require File::Temp; + my ( $FH, $tmpfile ) = File::Temp::tempfile( + "compilexs-XXXXX", + SUFFIX => '.c', + ); + binmode $FH; + print $FH <<'END_C'; +#include "EXTERN.h" +#include "perl.h" +#include "XSUB.h" + +int main(int argc, char **argv) { + return 0; +} + +int boot_sanexs() { + return 1; +} + +END_C + close $FH; + + # Can the C compiler access the same headers XS does + my @libs = (); + my $object = undef; + eval { + local $^W = 0; + $object = $builder->compile( + source => $tmpfile, + ); + @libs = $builder->link( + objects => $object, + module_name => 'sanexs', + ); + }; + my $result = $@ ? 0 : 1; + + # Clean up all the build files + foreach ( $tmpfile, $object, @libs ) { + next unless defined $_; + 1 while unlink; + } + + return $result; +} diff --git a/lib/namespace/clean.pm b/lib/namespace/clean.pm index 1e6a59e..e80413b 100644 --- a/lib/namespace/clean.pm +++ b/lib/namespace/clean.pm @@ -4,6 +4,8 @@ use warnings; use strict; our $VERSION = '0.25'; +$VERSION = eval $VERSION if $VERSION =~ /_/; # numify for warning-free dev releases + our $STORAGE_VAR = '__NAMESPACE_CLEAN_STORAGE'; use B::Hooks::EndOfScope 'on_scope_end';