diff options
Diffstat (limited to 'cpan')
26 files changed, 52 insertions, 71 deletions
diff --git a/cpan/Module-Build/lib/Module/Build.pm b/cpan/Module-Build/lib/Module/Build.pm index fff5db6369..ecc729e79c 100644 --- a/cpan/Module-Build/lib/Module/Build.pm +++ b/cpan/Module-Build/lib/Module/Build.pm @@ -18,7 +18,7 @@ use Module::Build::Base; use vars qw($VERSION @ISA); @ISA = qw(Module::Build::Base); -$VERSION = '0.4007'; +$VERSION = '0.4008'; $VERSION = eval $VERSION; # Inserts the given module into the @ISA hierarchy between diff --git a/cpan/Module-Build/lib/Module/Build/API.pod b/cpan/Module-Build/lib/Module/Build/API.pod index f68fdf71ac..af859e7fe4 100644 --- a/cpan/Module-Build/lib/Module/Build/API.pod +++ b/cpan/Module-Build/lib/Module/Build/API.pod @@ -2119,6 +2119,6 @@ perl(1), L<Module::Build>(3), L<Module::Build::Authoring>(3), L<Module::Build::Cookbook>(3), L<ExtUtils::MakeMaker>(3) F<META.yml> Specification: -L<CPAN::META::Spec> +L<CPAN::Meta::Spec> =cut diff --git a/cpan/Module-Build/lib/Module/Build/Authoring.pod b/cpan/Module-Build/lib/Module/Build/Authoring.pod index 7bbf562549..a32b31e2e1 100644 --- a/cpan/Module-Build/lib/Module/Build/Authoring.pod +++ b/cpan/Module-Build/lib/Module/Build/Authoring.pod @@ -317,7 +317,7 @@ perl(1), L<Module::Build>(3), L<Module::Build::API>(3), L<Module::Build::Cookbook>(3), L<ExtUtils::MakeMaker>(3), L<YAML>(3) F<META.yml> Specification: -L<CPAN::META::Spec> +L<CPAN::Meta::Spec> L<http://www.dsmit.com/cons/> diff --git a/cpan/Module-Build/lib/Module/Build/Base.pm b/cpan/Module-Build/lib/Module/Build/Base.pm index 706ed4f5d0..24fcbd0850 100644 --- a/cpan/Module-Build/lib/Module/Build/Base.pm +++ b/cpan/Module-Build/lib/Module/Build/Base.pm @@ -6,7 +6,7 @@ use strict; use vars qw($VERSION); use warnings; -$VERSION = '0.4007'; +$VERSION = '0.4008'; $VERSION = eval $VERSION; BEGIN { require 5.006001 } @@ -2760,28 +2760,9 @@ sub run_tap_harness { sub run_test_harness { my ($self, $tests) = @_; require Test::Harness; - my $p = $self->{properties}; - # Work around a Test::Harness bug that loses the particular perl - # we're running under. $self->perl is trustworthy, but $^X isn't. - local $^X = $self->perl; - - # Do everything in our power to work with all versions of Test::Harness - local ($Test::Harness::verbose, - $Test::Harness::Verbose, - $ENV{TEST_VERBOSE}, - $ENV{HARNESS_VERBOSE}) = ($p->{verbose} || 0) x 4; - - my @harness_switches = $self->harness_switches; - return Test::Harness::runtests(@$tests) unless @harness_switches; # Nothing to modify - - local $Test::Harness::switches = join ' ', grep defined, $Test::Harness::switches, @harness_switches; - local $Test::Harness::Switches = join ' ', grep defined, $Test::Harness::Switches, @harness_switches; - local $ENV{HARNESS_PERL_SWITCHES} = join ' ', grep defined, $ENV{HARNESS_PERL_SWITCHES}, @harness_switches; - - $Test::Harness::switches = undef unless length $Test::Harness::switches; - $Test::Harness::Switches = undef unless defined $Test::Harness::Switches and length $Test::Harness::Switches; - delete $ENV{HARNESS_PERL_SWITCHES} unless length $ENV{HARNESS_PERL_SWITCHES}; + local $Test::Harness::verbose = $self->verbose || 0; + local $Test::Harness::switches = join ' ', $self->harness_switches; Test::Harness::runtests(@$tests); } diff --git a/cpan/Module-Build/lib/Module/Build/Compat.pm b/cpan/Module-Build/lib/Module/Build/Compat.pm index 7f17f18213..bb5f9ebd72 100644 --- a/cpan/Module-Build/lib/Module/Build/Compat.pm +++ b/cpan/Module-Build/lib/Module/Build/Compat.pm @@ -2,7 +2,7 @@ package Module::Build::Compat; use strict; use vars qw($VERSION); -$VERSION = '0.4007'; +$VERSION = '0.4008'; use File::Basename (); use File::Spec; diff --git a/cpan/Module-Build/lib/Module/Build/Config.pm b/cpan/Module-Build/lib/Module/Build/Config.pm index b89732fccb..53742e8ee9 100644 --- a/cpan/Module-Build/lib/Module/Build/Config.pm +++ b/cpan/Module-Build/lib/Module/Build/Config.pm @@ -2,7 +2,7 @@ package Module::Build::Config; use strict; use vars qw($VERSION); -$VERSION = '0.4007'; +$VERSION = '0.4008'; $VERSION = eval $VERSION; use Config; diff --git a/cpan/Module-Build/lib/Module/Build/ConfigData.pm b/cpan/Module-Build/lib/Module/Build/ConfigData.pm index 9e49ca64bc..d55745cb6d 100644 --- a/cpan/Module-Build/lib/Module/Build/ConfigData.pm +++ b/cpan/Module-Build/lib/Module/Build/ConfigData.pm @@ -167,38 +167,38 @@ do{ my $x = [ {}, {}, { - 'license_creation' => { - 'requires' => { - 'Software::License' => 0 - }, - 'description' => 'Create licenses automatically in distributions' - }, - 'inc_bundling_support' => { - 'requires' => { - 'ExtUtils::Installed' => '1.999', - 'ExtUtils::Install' => '1.54' - }, - 'description' => 'Bundle Module::Build in inc/' - }, 'manpage_support' => { 'requires' => { 'Pod::Man' => 0 }, 'description' => 'Create Unix man pages' }, - 'PPM_support' => { - 'description' => 'Generate PPM files for distributions' - }, 'dist_authoring' => { - 'requires' => { - 'Archive::Tar' => '1.09' - }, 'recommends' => { 'Module::Signature' => '0.21', 'Pod::Readme' => '0.04' }, - 'description' => 'Create new distributions' + 'description' => 'Create new distributions', + 'requires' => { + 'Archive::Tar' => '1.09' + } }, + 'license_creation' => { + 'requires' => { + 'Software::License' => 0 + }, + 'description' => 'Create licenses automatically in distributions' + }, + 'PPM_support' => { + 'description' => 'Generate PPM files for distributions' + }, + 'inc_bundling_support' => { + 'description' => 'Bundle Module::Build in inc/', + 'requires' => { + 'ExtUtils::Installed' => '1.999', + 'ExtUtils::Install' => '1.54' + } + }, 'HTML_support' => { 'requires' => { 'Pod::Html' => 0 diff --git a/cpan/Module-Build/lib/Module/Build/Cookbook.pm b/cpan/Module-Build/lib/Module/Build/Cookbook.pm index 1afd6ea47e..24925bd3b8 100644 --- a/cpan/Module-Build/lib/Module/Build/Cookbook.pm +++ b/cpan/Module-Build/lib/Module/Build/Cookbook.pm @@ -1,7 +1,7 @@ package Module::Build::Cookbook; use strict; use vars qw($VERSION); -$VERSION = '0.4007'; +$VERSION = '0.4008'; =head1 NAME diff --git a/cpan/Module-Build/lib/Module/Build/Dumper.pm b/cpan/Module-Build/lib/Module/Build/Dumper.pm index 6c4301b515..58f89f2330 100644 --- a/cpan/Module-Build/lib/Module/Build/Dumper.pm +++ b/cpan/Module-Build/lib/Module/Build/Dumper.pm @@ -1,7 +1,7 @@ package Module::Build::Dumper; use strict; use vars qw($VERSION); -$VERSION = '0.4007'; +$VERSION = '0.4008'; # This is just a split-out of a wrapper function to do Data::Dumper # stuff "the right way". See: diff --git a/cpan/Module-Build/lib/Module/Build/ModuleInfo.pm b/cpan/Module-Build/lib/Module/Build/ModuleInfo.pm index 1fc478f83f..118bd3014d 100644 --- a/cpan/Module-Build/lib/Module/Build/ModuleInfo.pm +++ b/cpan/Module-Build/lib/Module/Build/ModuleInfo.pm @@ -4,7 +4,7 @@ package Module::Build::ModuleInfo; use strict; use vars qw($VERSION); -$VERSION = '0.4007'; +$VERSION = '0.4008'; $VERSION = eval $VERSION; require Module::Metadata; diff --git a/cpan/Module-Build/lib/Module/Build/Notes.pm b/cpan/Module-Build/lib/Module/Build/Notes.pm index adc5d1a6b0..11b65ceed7 100644 --- a/cpan/Module-Build/lib/Module/Build/Notes.pm +++ b/cpan/Module-Build/lib/Module/Build/Notes.pm @@ -4,7 +4,7 @@ package Module::Build::Notes; use strict; use vars qw($VERSION); -$VERSION = '0.4007'; +$VERSION = '0.4008'; $VERSION = eval $VERSION; use Data::Dumper; use Module::Build::Dumper; diff --git a/cpan/Module-Build/lib/Module/Build/PPMMaker.pm b/cpan/Module-Build/lib/Module/Build/PPMMaker.pm index 530ff682b2..f526ee7799 100644 --- a/cpan/Module-Build/lib/Module/Build/PPMMaker.pm +++ b/cpan/Module-Build/lib/Module/Build/PPMMaker.pm @@ -4,7 +4,7 @@ use strict; use Config; use vars qw($VERSION); -$VERSION = '0.4007'; +$VERSION = '0.4008'; $VERSION = eval $VERSION; # This code is mostly borrowed from ExtUtils::MM_Unix 6.10_03, with a diff --git a/cpan/Module-Build/lib/Module/Build/Platform/Default.pm b/cpan/Module-Build/lib/Module/Build/Platform/Default.pm index 3161229dbb..9daf521982 100644 --- a/cpan/Module-Build/lib/Module/Build/Platform/Default.pm +++ b/cpan/Module-Build/lib/Module/Build/Platform/Default.pm @@ -2,7 +2,7 @@ package Module::Build::Platform::Default; use strict; use vars qw($VERSION); -$VERSION = '0.4007'; +$VERSION = '0.4008'; $VERSION = eval $VERSION; use Module::Build::Base; diff --git a/cpan/Module-Build/lib/Module/Build/Platform/MacOS.pm b/cpan/Module-Build/lib/Module/Build/Platform/MacOS.pm index 64711c7ad4..2f4eb0962d 100644 --- a/cpan/Module-Build/lib/Module/Build/Platform/MacOS.pm +++ b/cpan/Module-Build/lib/Module/Build/Platform/MacOS.pm @@ -2,7 +2,7 @@ package Module::Build::Platform::MacOS; use strict; use vars qw($VERSION); -$VERSION = '0.4007'; +$VERSION = '0.4008'; $VERSION = eval $VERSION; use Module::Build::Base; use vars qw(@ISA); diff --git a/cpan/Module-Build/lib/Module/Build/Platform/Unix.pm b/cpan/Module-Build/lib/Module/Build/Platform/Unix.pm index 27490a68d1..9e32cf466f 100644 --- a/cpan/Module-Build/lib/Module/Build/Platform/Unix.pm +++ b/cpan/Module-Build/lib/Module/Build/Platform/Unix.pm @@ -2,7 +2,7 @@ package Module::Build::Platform::Unix; use strict; use vars qw($VERSION); -$VERSION = '0.4007'; +$VERSION = '0.4008'; $VERSION = eval $VERSION; use Module::Build::Base; diff --git a/cpan/Module-Build/lib/Module/Build/Platform/VMS.pm b/cpan/Module-Build/lib/Module/Build/Platform/VMS.pm index 4c7a544464..d96148f215 100644 --- a/cpan/Module-Build/lib/Module/Build/Platform/VMS.pm +++ b/cpan/Module-Build/lib/Module/Build/Platform/VMS.pm @@ -2,7 +2,7 @@ package Module::Build::Platform::VMS; use strict; use vars qw($VERSION); -$VERSION = '0.4007'; +$VERSION = '0.4008'; $VERSION = eval $VERSION; use Module::Build::Base; use Config; diff --git a/cpan/Module-Build/lib/Module/Build/Platform/VOS.pm b/cpan/Module-Build/lib/Module/Build/Platform/VOS.pm index 72b1671b7c..2152fcdd64 100644 --- a/cpan/Module-Build/lib/Module/Build/Platform/VOS.pm +++ b/cpan/Module-Build/lib/Module/Build/Platform/VOS.pm @@ -2,7 +2,7 @@ package Module::Build::Platform::VOS; use strict; use vars qw($VERSION); -$VERSION = '0.4007'; +$VERSION = '0.4008'; $VERSION = eval $VERSION; use Module::Build::Base; diff --git a/cpan/Module-Build/lib/Module/Build/Platform/Windows.pm b/cpan/Module-Build/lib/Module/Build/Platform/Windows.pm index 5d54318e7d..d1ee9cda87 100644 --- a/cpan/Module-Build/lib/Module/Build/Platform/Windows.pm +++ b/cpan/Module-Build/lib/Module/Build/Platform/Windows.pm @@ -2,7 +2,7 @@ package Module::Build::Platform::Windows; use strict; use vars qw($VERSION); -$VERSION = '0.4007'; +$VERSION = '0.4008'; $VERSION = eval $VERSION; use Config; diff --git a/cpan/Module-Build/lib/Module/Build/Platform/aix.pm b/cpan/Module-Build/lib/Module/Build/Platform/aix.pm index 6763c3229a..be1f49df89 100644 --- a/cpan/Module-Build/lib/Module/Build/Platform/aix.pm +++ b/cpan/Module-Build/lib/Module/Build/Platform/aix.pm @@ -2,7 +2,7 @@ package Module::Build::Platform::aix; use strict; use vars qw($VERSION); -$VERSION = '0.4007'; +$VERSION = '0.4008'; $VERSION = eval $VERSION; use Module::Build::Platform::Unix; diff --git a/cpan/Module-Build/lib/Module/Build/Platform/cygwin.pm b/cpan/Module-Build/lib/Module/Build/Platform/cygwin.pm index 0ff9a46e37..a1e41b0483 100644 --- a/cpan/Module-Build/lib/Module/Build/Platform/cygwin.pm +++ b/cpan/Module-Build/lib/Module/Build/Platform/cygwin.pm @@ -2,7 +2,7 @@ package Module::Build::Platform::cygwin; use strict; use vars qw($VERSION); -$VERSION = '0.4007'; +$VERSION = '0.4008'; $VERSION = eval $VERSION; use Module::Build::Platform::Unix; diff --git a/cpan/Module-Build/lib/Module/Build/Platform/darwin.pm b/cpan/Module-Build/lib/Module/Build/Platform/darwin.pm index c4909c1dd3..8b2965506c 100644 --- a/cpan/Module-Build/lib/Module/Build/Platform/darwin.pm +++ b/cpan/Module-Build/lib/Module/Build/Platform/darwin.pm @@ -2,7 +2,7 @@ package Module::Build::Platform::darwin; use strict; use vars qw($VERSION); -$VERSION = '0.4007'; +$VERSION = '0.4008'; $VERSION = eval $VERSION; use Module::Build::Platform::Unix; diff --git a/cpan/Module-Build/lib/Module/Build/Platform/os2.pm b/cpan/Module-Build/lib/Module/Build/Platform/os2.pm index e755480031..bf7c339931 100644 --- a/cpan/Module-Build/lib/Module/Build/Platform/os2.pm +++ b/cpan/Module-Build/lib/Module/Build/Platform/os2.pm @@ -2,7 +2,7 @@ package Module::Build::Platform::os2; use strict; use vars qw($VERSION); -$VERSION = '0.4007'; +$VERSION = '0.4008'; $VERSION = eval $VERSION; use Module::Build::Platform::Unix; diff --git a/cpan/Module-Build/lib/Module/Build/PodParser.pm b/cpan/Module-Build/lib/Module/Build/PodParser.pm index 5cc4fbef02..f61286ea54 100644 --- a/cpan/Module-Build/lib/Module/Build/PodParser.pm +++ b/cpan/Module-Build/lib/Module/Build/PodParser.pm @@ -2,7 +2,7 @@ package Module::Build::PodParser; use strict; use vars qw($VERSION); -$VERSION = '0.4007'; +$VERSION = '0.4008'; $VERSION = eval $VERSION; use vars qw(@ISA); diff --git a/cpan/Module-Build/lib/inc/latest.pm b/cpan/Module-Build/lib/inc/latest.pm index 05dee95ddd..e3546e4da7 100644 --- a/cpan/Module-Build/lib/inc/latest.pm +++ b/cpan/Module-Build/lib/inc/latest.pm @@ -4,7 +4,7 @@ use if $] >= 5.019, 'deprecate'; use strict; use vars qw($VERSION); -$VERSION = '0.4007'; +$VERSION = '0.4008'; $VERSION = eval $VERSION; use Carp; diff --git a/cpan/Module-Build/lib/inc/latest/private.pm b/cpan/Module-Build/lib/inc/latest/private.pm index 0cb9214d96..1659d29a2f 100644 --- a/cpan/Module-Build/lib/inc/latest/private.pm +++ b/cpan/Module-Build/lib/inc/latest/private.pm @@ -4,7 +4,7 @@ use if $] >= 5.019, 'deprecate'; use strict; use vars qw($VERSION); -$VERSION = '0.4007'; +$VERSION = '0.4008'; $VERSION = eval $VERSION; use File::Spec; diff --git a/cpan/Module-Build/t/unit_run_test_harness.t b/cpan/Module-Build/t/unit_run_test_harness.t index 0d19be2791..e6a7f53bf0 100644 --- a/cpan/Module-Build/t/unit_run_test_harness.t +++ b/cpan/Module-Build/t/unit_run_test_harness.t @@ -24,7 +24,7 @@ use Test::Harness; { package MB::Subclass; use base qw(Module::Build); - sub harness_switches { } + sub harness_switches { return } } { @@ -35,19 +35,19 @@ use Test::Harness; no warnings qw[redefine once]; # This runs run_test_harness with Test::Harness::switches = undef and harness_switches() returning empty list, - # ensure there are no warnings, and output is undef too + # ensure there are no warnings, and output is empty too { my $mb = MB::Subclass->new( module_name => $dist->name ); local *Test::Harness::runtests = sub { is shift(), $mock1, "runtests ran with expected parameters"; is shift(), $mock2, "runtests ran with expected parameters"; - is $Test::Harness::switches, undef, "switches are undef"; - is $Test::Harness::Switches, undef, "switches are undef"; + is $Test::Harness::switches, '', "switches are undef"; + is $Test::Harness::Switches, '', "switches are undef"; }; # $Test::Harness::switches and $Test::Harness::switches are aliases, but we pretend we don't know this - local $Test::Harness::switches = undef; - local $Test::Harness::switches = undef; + local $Test::Harness::switches = ''; + local $Test::Harness::switches = ''; $mb->run_test_harness([$mock1, $mock2]); ok 1, "run_test_harness should not produce warning if Test::Harness::[Ss]witches are undef and harness_switches() return empty list"; |