From: Graham Knop Date: Thu, 27 Aug 2020 13:16:07 +0000 (+0200) Subject: convert to Distar X-Git-Tag: v1.42~8 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Devel.git;a=commitdiff_plain;h=640ab5c9596156e638b60c960c778867d751e9ee convert to Distar --- diff --git a/.gitignore b/.gitignore index 3246d50..44e4674 100644 --- a/.gitignore +++ b/.gitignore @@ -1,13 +1,13 @@ /MANIFEST /MANIFEST.bak -/META.* +/MANIFEST.SKIP /MYMETA.* /Makefile /Makefile.old /README /blib/ -/inc/ /pm_to_blib +/Distar *~ *# .#* diff --git a/INSTALL.SKIP b/INSTALL.SKIP deleted file mode 100644 index 76238b1..0000000 --- a/INSTALL.SKIP +++ /dev/null @@ -1,4 +0,0 @@ -# Skip .svn metadata to stop you getting crap in your sharedir -# when you're using svn and in author mode -\.svn - diff --git a/MANIFEST.SKIP b/MANIFEST.SKIP deleted file mode 100644 index 4dcd0f7..0000000 --- a/MANIFEST.SKIP +++ /dev/null @@ -1,47 +0,0 @@ -# Ignore INSTALL.SKIP, used to stop getting .svn directories copied into -# blib/, but not in a built dist (i.e. not used outside of author mode). -^INSTALL.SKIP - -^Catalyst-Devel - -^MYMETA - -# Avoid version control files. -\bRCS\b -\bCVS\b -,v$ -\B\.svn\b -\B\.git - -# Avoid Makemaker generated and utility files. -\bMakefile$ -\bblib -\bMakeMaker-\d -\bpm_to_blib$ -\bblibdirs$ -^MANIFEST\.SKIP$ - -# Avoid Module::Build generated and utility files. -\bBuild$ -\b_build - -# Avoid temp and backup files. -~$ -\.tmp$ -\.old$ -\.bak$ -\#$ -\b\.# -^\.DS_Store$ - -# Avoid Apache::Test files -t/conf/apache_test_config.pm -t/conf/extra.conf$ -t/conf/httpd.conf -t/conf/mime.types -t/htdocs -t/logs -t/var - -# No tarballs! -\.gz$ diff --git a/Makefile.PL b/Makefile.PL index 964ce6b..26d24c7 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -1,71 +1,94 @@ use strict; -use warnings; -use lib '.'; -use lib 'inc'; -use inc::Module::Install 0.91; -use Module::Install::AuthorRequires; -use Module::Install::AuthorTests; -use Module::Install::Authority; - -name 'Catalyst-Devel'; -all_from 'lib/Catalyst/Devel.pm'; -authority 'cpan:MSTROUT'; - -requires 'Moose'; -requires 'MooseX::Emulate::Class::Accessor::Fast'; -requires 'File::ShareDir'; -requires 'namespace::clean'; -requires 'namespace::autoclean'; -requires 'Catalyst' => '5.90001'; -requires 'Catalyst::Action::RenderView' => '0.10'; -requires 'Catalyst::Plugin::Static::Simple' => '0.28'; -requires 'Catalyst::Plugin::ConfigLoader' => '0.30'; -requires 'Config::General' => '2.42'; # as of 1.07, we use .conf and not .yaml -requires 'File::ChangeNotify' => '0.07'; -requires 'File::Copy::Recursive'; -requires 'Path::Class' => '0.09'; -requires 'Template' => '2.14'; - -if (!$Module::Install::AUTHOR && $^O ne 'MSWin32') { - requires 'MooseX::Daemonize'; # Optional in scripts - requires 'Starman'; # Optional in scripts +use warnings FATAL => 'all'; +use 5.006; + +my %META = ( + name => 'Catalyst-Devel', + license => 'perl_5', + prereqs => { + configure => { requires => { + 'ExtUtils::MakeMaker' => 0, + 'File::ShareDir::Install' => 0, + } }, + test => { + requires => { + 'Test::More' => '0.94', + 'Test::Fatal' => '0.003', + }, + }, + runtime => { + requires => { + 'Moose' => 0, + 'MooseX::Emulate::Class::Accessor::Fast' => 0, + 'File::ShareDir' => 0, + 'namespace::clean' => 0, + 'namespace::autoclean' => 0, + 'Catalyst' => '5.90001', + 'Catalyst::Action::RenderView' => '0.10', + 'Catalyst::Plugin::Static::Simple' => '0.28', + 'Catalyst::Plugin::ConfigLoader' => '0.30', + 'Config::General' => '2.42', + 'File::ChangeNotify' => '0.07', + 'File::Copy::Recursive' => 0, + 'Path::Class' => '0.09', + 'Template' => '2.14', + 'Module::Install' => '1.02', + }, + }, + develop => { + requires => { + 'Proc::Background' => 0, + 'Test::Pod' => 0, + 'Test::Pod::Coverage' => 0, + }, + }, + }, + resources => { + repository => { + url => 'git://git.shadowcat.co.uk/catagits/Catalyst-Devel.git', + web => 'http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits/Catalyst-Devel.git', + type => 'git', + }, + x_IRC => 'irc://irc.perl.org/#catalyst', + x_MailingList => 'http://lists.scsys.co.uk/cgi-bin/mailman/listinfo/catalyst', + homepage => 'http://dev.catalyst.perl.org/', + bugtracker => { + web => 'https://rt.cpan.org/Public/Dist/Display.html?Name=Catalyst-Devel', + mailto => 'bug-Catalyst-Devel@rt.cpan.org', + }, + license => [ 'http://dev.perl.org/licenses/' ], + }, + no_index => { + directory => [ 't', 'xt' ] + }, + x_authority => 'cpan:MSTROUT', +); + +{ + package MY; + use File::ShareDir::Install qw(install_share postamble); + install_share 'share'; } -# The Catalyst applications this module distribution have a Makefile.PL using -# Module::Install as well as the Module::Install::Catalyst extension included in -# this distribution. Therefore we really *depend* on Module::Install to be -# installed, even though we also use it to build this distribution and include -# it in its inc/ directory for releases. -requires 'Module::Install' => '1.02'; - -author_requires 'Proc::Background'; -author_requires 'Test::Pod'; -author_requires 'Test::Pod::Coverage'; - -test_requires 'Test::More' => '0.94'; -test_requires 'Test::Fatal' => '0.003'; - -install_share 'share'; - -author_tests 't/author'; +my %MM_ARGS = ( + PREREQ_PM => { + # kill warning from older versions of Class::C3 + ( ("$]" >= 5.009_005 && eval { require Class::C3 } && !eval { Class::C3->VERSION(0.20) }) ? ( + 'Class::C3' => '0.20', + ) : () ), + }, +); if (!$ENV{CATALYST_DEVEL_NO_510_CHECK}) { - use Symbol 'gensym'; - use IPC::Open3; - use File::Spec; - open my $null, '>', File::Spec->devnull; - my $err = gensym; - my $pid = open3(gensym, $null, $err, qq{"$^X" -It/lib -MUnknownError -e 1}); - - my $unknown_error = 0; - - while (<$err>) { - $unknown_error = 1 if /^Unknown error/; - } + require IPC::Open3; + require File::Spec; + open my $in, '<', File::Spec->devnull; + my $pid = IPC::Open3::open3($in, my $out, undef, $^X, '-It/lib', '-MUnknownError', '-e1'); + my $output = do { local $/; <$out> }; waitpid $pid, 0; - if ($unknown_error) { + if ($output =~ /^Unknown error/m) { warn <= 5.009_005 && can_use('Class::C3') && !can_use('Class::C3', 0.20)) { - requires 'Class::C3' => '0.20'; -} -auto_install; - -WriteAll; +## BOILERPLATE ############################################################### +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; +$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'; +$MM_ARGS{PL_FILES} ||= {}; +$MM_ARGS{NORECURS} = 1 + if not exists $MM_ARGS{NORECURS}; + +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; +} -if ($Module::Install::AUTHOR) { - Meta->{values}{resources} = [ - [ 'MailingList' => 'http://lists.scsys.co.uk/cgi-bin/mailman/listinfo/catalyst' ], - [ 'IRC' => 'irc://irc.perl.org/#catalyst' ], - [ 'license', => 'http://dev.perl.org/licenses/' ], - [ 'homepage', => 'http://dev.catalyst.perl.org/'], - [ 'repository', => 'git://git.shadowcat.co.uk/catagits/Catalyst-Devel.git' ], - ]; +$MM_ARGS{MIN_PERL_VERSION} = delete $MM_ARGS{PREREQ_PM}{perl} || 0; - Meta->{values}{requires} = [ grep { - $_->[0] ne 'Class::C3' - } @{ Meta->{values}{requires} } ]; +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; - Meta->write; -} +ExtUtils::MakeMaker::WriteMakefile(%MM_ARGS); +## END BOILERPLATE ########################################################### diff --git a/maint/Makefile.PL.include b/maint/Makefile.PL.include new file mode 100644 index 0000000..f7d98dd --- /dev/null +++ b/maint/Makefile.PL.include @@ -0,0 +1,9 @@ +BEGIN { -e 'Distar' or system("git clone https://github.com/p5sagit/Distar.git") } +use lib 'Distar/lib'; +use Distar; + +author 'sri - Sebastian Riedel '; + +manifest_include share => qr{.*}; + +1; diff --git a/t/author/version_numbers.t b/t/author/version_numbers.t deleted file mode 100644 index dc5d959..0000000 --- a/t/author/version_numbers.t +++ /dev/null @@ -1,45 +0,0 @@ -use strict; -use warnings; - -use FindBin qw/$Bin/; -use File::Spec; -use File::Find (); -use ExtUtils::MakeMaker (); - -use File::Find::Rule; -use Module::Info; - -use Test::More; - -my %versions; -File::Find::find({ - no_chdir => 1, - wanted => sub { - return - if -d; - return - if !/\.pm\z/; - - my $version = MM->parse_version($_); - $version = undef - if $version && $version eq 'undef'; - - ( my $stripped_file = $_ ) =~ s{.*lib/}{}; - - $versions{$stripped_file} = $version; - }, -}, File::Spec->catdir($Bin, '..', '..', 'lib')); - -my $ver = delete $versions{'Catalyst/Devel.pm'}; -ok $ver; -ok scalar(keys %versions); - -for my $module ( sort keys %versions ) { - next unless $versions{$module}; - - is( $versions{$module}, $ver, - "version for $module is the same as in Catalyst/Devel.pm" ); -} - -done_testing; - diff --git a/t/author/pod.t b/xt/pod.t similarity index 100% rename from t/author/pod.t rename to xt/pod.t diff --git a/t/author/podcoverage.t b/xt/podcoverage.t similarity index 100% rename from t/author/podcoverage.t rename to xt/podcoverage.t