[libmodule-build-perl] 03/07: Imported Upstream version 0.421000
gregor herrmann
gregoa at debian.org
Mon Sep 8 17:25:26 UTC 2014
This is an automated email from the git hooks/post-receive script.
gregoa pushed a commit to branch master
in repository libmodule-build-perl.
commit 3f8c346035af594e8ba4439e13e8be24a079d75a
Author: gregor herrmann <gregoa at debian.org>
Date: Mon Sep 8 19:13:05 2014 +0200
Imported Upstream version 0.421000
---
Build.PL | 8 ++-
Changes | 22 +++++++
META.json | 58 +++++++++--------
META.yml | 55 ++++++++--------
inc/MBVersion.pm | 3 +-
inc/Module/Metadata.pm | 2 +-
lib/Module/Build.pm | 2 +-
lib/Module/Build/Base.pm | 121 ++++++++++-------------------------
lib/Module/Build/Compat.pm | 2 +-
lib/Module/Build/Config.pm | 2 +-
lib/Module/Build/Cookbook.pm | 2 +-
lib/Module/Build/Dumper.pm | 2 +-
lib/Module/Build/Notes.pm | 2 +-
lib/Module/Build/PPMMaker.pm | 2 +-
lib/Module/Build/Platform/Default.pm | 2 +-
lib/Module/Build/Platform/MacOS.pm | 2 +-
lib/Module/Build/Platform/Unix.pm | 2 +-
lib/Module/Build/Platform/VMS.pm | 4 +-
lib/Module/Build/Platform/VOS.pm | 2 +-
lib/Module/Build/Platform/Windows.pm | 4 +-
lib/Module/Build/Platform/aix.pm | 2 +-
lib/Module/Build/Platform/cygwin.pm | 2 +-
lib/Module/Build/Platform/darwin.pm | 2 +-
lib/Module/Build/Platform/os2.pm | 2 +-
lib/Module/Build/PodParser.pm | 2 +-
lib/inc/latest.pm | 2 +-
lib/inc/latest/private.pm | 2 +-
t/extend.t | 12 ++--
28 files changed, 157 insertions(+), 168 deletions(-)
diff --git a/Build.PL b/Build.PL
index 74f052b..a424f41 100644
--- a/Build.PL
+++ b/Build.PL
@@ -25,6 +25,12 @@ use Module::Build;
my $build = Module::Build->new(
module_name => 'Module::Build',
license => 'perl',
+ configure_requires => {
+ 'CPAN::Meta' => '2.142060',
+ 'Perl::OSType' => 1,
+ 'Module::Metadata' => '1.000002',
+ 'version' => '0.87',
+ },
build_requires => {
'File::Temp' => 0.15, # tmpdir() + fixes
'Test::More' => 0.49,
@@ -53,7 +59,7 @@ my $build = Module::Build->new(
'Text::ParseWords' => 0,
'Getopt::Long' => 0,
'Test::Harness' => 0,
- 'CPAN::Meta' => '2.110420',
+ 'CPAN::Meta' => '2.142060',
'Perl::OSType' => 1, # needs 1.0 API
'version' => 0.87, # No longer requires M::B
'Module::Metadata' => 1.000002, # uses version.pm
diff --git a/Changes b/Changes
index ee66ddb..8663c93 100644
--- a/Changes
+++ b/Changes
@@ -1,5 +1,27 @@
Revision history for Perl extension Module::Build.
+0.4210 - Mon Sep 1 13:30:29 CEST 2014
+
+ [BUG FIXES]
+
+ - Fixup CPAN::Meta dependency
+
+ - Handle old releases of CPAN::Meta more gracefully.
+
+0.4209 - Mon Sep 1 12:24:40 CEST 2014
+
+ [BUG FIXES]
+
+ - Stop calling UNIVERSAL::isa as a function
+
+ [ENHANCEMENTS]
+
+ - Use CPAN::Meta::Merge for meta_merge
+
+ - Convert with CPAN::Meta::Convert in meta_add
+
+ - Add configure requirements
+
0.4208 - Mon Aug 18 21:44:38 CEST 2014
[BUG FIXES]
diff --git a/META.json b/META.json
index 9b42e42..5d94933 100644
--- a/META.json
+++ b/META.json
@@ -5,7 +5,7 @@
"Module-Build mailing list at <module-build at perl.org>."
],
"dynamic_config" : 1,
- "generated_by" : "Module::Build version 0.4208",
+ "generated_by" : "Module::Build version 0.421",
"license" : [
"perl_5"
],
@@ -24,13 +24,21 @@
"Test::More" : "0.49"
}
},
+ "configure" : {
+ "requires" : {
+ "CPAN::Meta" : "2.142060",
+ "Module::Metadata" : "1.000002",
+ "Perl::OSType" : "1",
+ "version" : "0.87"
+ }
+ },
"runtime" : {
"recommends" : {
"ExtUtils::Install" : "0.3",
"ExtUtils::Manifest" : "1.54"
},
"requires" : {
- "CPAN::Meta" : "2.110420",
+ "CPAN::Meta" : "2.142060",
"Cwd" : "0",
"Data::Dumper" : "0",
"ExtUtils::CBuilder" : "0.27",
@@ -59,87 +67,87 @@
"provides" : {
"Module::Build" : {
"file" : "lib/Module/Build.pm",
- "version" : "0.4208"
+ "version" : "0.4210"
},
"Module::Build::Base" : {
"file" : "lib/Module/Build/Base.pm",
- "version" : "0.4208"
+ "version" : "0.4210"
},
"Module::Build::Compat" : {
"file" : "lib/Module/Build/Compat.pm",
- "version" : "0.4208"
+ "version" : "0.4210"
},
"Module::Build::Config" : {
"file" : "lib/Module/Build/Config.pm",
- "version" : "0.4208"
+ "version" : "0.4210"
},
"Module::Build::Cookbook" : {
"file" : "lib/Module/Build/Cookbook.pm",
- "version" : "0.4208"
+ "version" : "0.4210"
},
"Module::Build::Dumper" : {
"file" : "lib/Module/Build/Dumper.pm",
- "version" : "0.4208"
+ "version" : "0.4210"
},
"Module::Build::Notes" : {
"file" : "lib/Module/Build/Notes.pm",
- "version" : "0.4208"
+ "version" : "0.4210"
},
"Module::Build::PPMMaker" : {
"file" : "lib/Module/Build/PPMMaker.pm",
- "version" : "0.4208"
+ "version" : "0.4210"
},
"Module::Build::Platform::Default" : {
"file" : "lib/Module/Build/Platform/Default.pm",
- "version" : "0.4208"
+ "version" : "0.4210"
},
"Module::Build::Platform::MacOS" : {
"file" : "lib/Module/Build/Platform/MacOS.pm",
- "version" : "0.4208"
+ "version" : "0.4210"
},
"Module::Build::Platform::Unix" : {
"file" : "lib/Module/Build/Platform/Unix.pm",
- "version" : "0.4208"
+ "version" : "0.4210"
},
"Module::Build::Platform::VMS" : {
"file" : "lib/Module/Build/Platform/VMS.pm",
- "version" : "0.4208"
+ "version" : "0.4210"
},
"Module::Build::Platform::VOS" : {
"file" : "lib/Module/Build/Platform/VOS.pm",
- "version" : "0.4208"
+ "version" : "0.4210"
},
"Module::Build::Platform::Windows" : {
"file" : "lib/Module/Build/Platform/Windows.pm",
- "version" : "0.4208"
+ "version" : "0.4210"
},
"Module::Build::Platform::aix" : {
"file" : "lib/Module/Build/Platform/aix.pm",
- "version" : "0.4208"
+ "version" : "0.4210"
},
"Module::Build::Platform::cygwin" : {
"file" : "lib/Module/Build/Platform/cygwin.pm",
- "version" : "0.4208"
+ "version" : "0.4210"
},
"Module::Build::Platform::darwin" : {
"file" : "lib/Module/Build/Platform/darwin.pm",
- "version" : "0.4208"
+ "version" : "0.4210"
},
"Module::Build::Platform::os2" : {
"file" : "lib/Module/Build/Platform/os2.pm",
- "version" : "0.4208"
+ "version" : "0.4210"
},
"Module::Build::PodParser" : {
"file" : "lib/Module/Build/PodParser.pm",
- "version" : "0.4208"
+ "version" : "0.4210"
},
"inc::latest" : {
"file" : "lib/inc/latest.pm",
- "version" : "0.4208"
+ "version" : "0.4210"
},
"inc::latest::private" : {
"file" : "lib/inc/latest/private.pm",
- "version" : "0.4208"
+ "version" : "0.4210"
}
},
"release_status" : "stable",
@@ -150,7 +158,7 @@
"repository" : {
"url" : "https://github.com/Perl-Toolchain-Gang/Module-Build"
},
- "x_mailingList" : "mailto:module-build at perl.org"
+ "x_MailingList" : "mailto:module-build at perl.org"
},
- "version" : "0.4208"
+ "version" : "0.4210"
}
diff --git a/META.yml b/META.yml
index bf4f523..085104f 100644
--- a/META.yml
+++ b/META.yml
@@ -9,8 +9,13 @@ build_requires:
Parse::CPAN::Meta: '1.4401'
Test::Harness: '3.16'
Test::More: '0.49'
+configure_requires:
+ CPAN::Meta: '2.142060'
+ Module::Metadata: '1.000002'
+ Perl::OSType: '1'
+ version: '0.87'
dynamic_config: 1
-generated_by: 'Module::Build version 0.4208, CPAN::Meta::Converter version 2.140640'
+generated_by: 'Module::Build version 0.421, CPAN::Meta::Converter version 2.142060'
license: perl
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.4.html
@@ -19,72 +24,72 @@ name: Module-Build
provides:
Module::Build:
file: lib/Module/Build.pm
- version: '0.4208'
+ version: '0.4210'
Module::Build::Base:
file: lib/Module/Build/Base.pm
- version: '0.4208'
+ version: '0.4210'
Module::Build::Compat:
file: lib/Module/Build/Compat.pm
- version: '0.4208'
+ version: '0.4210'
Module::Build::Config:
file: lib/Module/Build/Config.pm
- version: '0.4208'
+ version: '0.4210'
Module::Build::Cookbook:
file: lib/Module/Build/Cookbook.pm
- version: '0.4208'
+ version: '0.4210'
Module::Build::Dumper:
file: lib/Module/Build/Dumper.pm
- version: '0.4208'
+ version: '0.4210'
Module::Build::Notes:
file: lib/Module/Build/Notes.pm
- version: '0.4208'
+ version: '0.4210'
Module::Build::PPMMaker:
file: lib/Module/Build/PPMMaker.pm
- version: '0.4208'
+ version: '0.4210'
Module::Build::Platform::Default:
file: lib/Module/Build/Platform/Default.pm
- version: '0.4208'
+ version: '0.4210'
Module::Build::Platform::MacOS:
file: lib/Module/Build/Platform/MacOS.pm
- version: '0.4208'
+ version: '0.4210'
Module::Build::Platform::Unix:
file: lib/Module/Build/Platform/Unix.pm
- version: '0.4208'
+ version: '0.4210'
Module::Build::Platform::VMS:
file: lib/Module/Build/Platform/VMS.pm
- version: '0.4208'
+ version: '0.4210'
Module::Build::Platform::VOS:
file: lib/Module/Build/Platform/VOS.pm
- version: '0.4208'
+ version: '0.4210'
Module::Build::Platform::Windows:
file: lib/Module/Build/Platform/Windows.pm
- version: '0.4208'
+ version: '0.4210'
Module::Build::Platform::aix:
file: lib/Module/Build/Platform/aix.pm
- version: '0.4208'
+ version: '0.4210'
Module::Build::Platform::cygwin:
file: lib/Module/Build/Platform/cygwin.pm
- version: '0.4208'
+ version: '0.4210'
Module::Build::Platform::darwin:
file: lib/Module/Build/Platform/darwin.pm
- version: '0.4208'
+ version: '0.4210'
Module::Build::Platform::os2:
file: lib/Module/Build/Platform/os2.pm
- version: '0.4208'
+ version: '0.4210'
Module::Build::PodParser:
file: lib/Module/Build/PodParser.pm
- version: '0.4208'
+ version: '0.4210'
inc::latest:
file: lib/inc/latest.pm
- version: '0.4208'
+ version: '0.4210'
inc::latest::private:
file: lib/inc/latest/private.pm
- version: '0.4208'
+ version: '0.4210'
recommends:
ExtUtils::Install: '0.3'
ExtUtils::Manifest: '1.54'
requires:
- CPAN::Meta: '2.110420'
+ CPAN::Meta: '2.142060'
Cwd: '0'
Data::Dumper: '0'
ExtUtils::CBuilder: '0.27'
@@ -108,7 +113,7 @@ requires:
perl: '5.008000'
version: '0.87'
resources:
+ MailingList: mailto:module-build at perl.org
license: http://dev.perl.org/licenses/
- mailingList: mailto:module-build at perl.org
repository: https://github.com/Perl-Toolchain-Gang/Module-Build
-version: '0.4208'
+version: '0.4210'
diff --git a/inc/MBVersion.pm b/inc/MBVersion.pm
index 890adce..558a9ff 100644
--- a/inc/MBVersion.pm
+++ b/inc/MBVersion.pm
@@ -959,10 +959,9 @@ sub stringify
sub vcmp
{
- require UNIVERSAL;
my ($left,$right,$swap) = @_;
my $class = ref($left);
- unless ( UNIVERSAL::isa($right, $class) ) {
+ unless ( eval { $right->isa($class) } ) {
$right = $class->new($right);
}
diff --git a/inc/Module/Metadata.pm b/inc/Module/Metadata.pm
index 9e66cde..5d8b5c0 100644
--- a/inc/Module/Metadata.pm
+++ b/inc/Module/Metadata.pm
@@ -84,7 +84,7 @@ sub new_from_module {
my $compare_versions = sub {
my ($v1, $op, $v2) = @_;
$v1 = version->new($v1)
- unless UNIVERSAL::isa($v1,'version');
+ unless eval { $v1->isa('version') };
my $eval_str = "\$v1 $op \$v2";
my $result = eval $eval_str;
diff --git a/lib/Module/Build.pm b/lib/Module/Build.pm
index 784b778..8da27e6 100644
--- a/lib/Module/Build.pm
+++ b/lib/Module/Build.pm
@@ -19,7 +19,7 @@ use Perl::OSType ();
use Module::Build::Base;
our @ISA = qw(Module::Build::Base);
-our $VERSION = '0.4208';
+our $VERSION = '0.4210';
$VERSION = eval $VERSION;
# Inserts the given module into the @ISA hierarchy between
diff --git a/lib/Module/Build/Base.pm b/lib/Module/Build/Base.pm
index 205419f..81df654 100644
--- a/lib/Module/Build/Base.pm
+++ b/lib/Module/Build/Base.pm
@@ -6,7 +6,7 @@ use 5.006;
use strict;
use warnings;
-our $VERSION = '0.4208';
+our $VERSION = '0.4210';
$VERSION = eval $VERSION;
use Carp;
@@ -85,7 +85,7 @@ sub resume {
# Module::Build->new_from_context() and the correct class to use is
# actually a *subclass* of Module::Build, we may need to load that
# subclass here and re-delegate the resume() method to it.
- unless ( UNIVERSAL::isa($package, $self->build_class) ) {
+ unless ( $package->isa($self->build_class) ) {
my $build_class = $self->build_class;
my $config_dir = $self->config_dir || '_build';
my $build_lib = File::Spec->catdir( $config_dir, 'lib' );
@@ -1720,7 +1720,7 @@ sub compare_versions {
my $self = shift;
my ($v1, $op, $v2) = @_;
$v1 = version->new($v1)
- unless UNIVERSAL::isa($v1,'version');
+ unless eval { $v1->isa('version') };
my $eval_str = "\$v1 $op \$v2";
my $result = eval $eval_str;
@@ -1803,7 +1803,7 @@ sub print_build_script {
my $config_requires;
if ( -f $self->metafile ) {
my $meta = eval { $self->read_metafile( $self->metafile ) };
- $config_requires = $meta && $meta->{configure_requires}{'Module::Build'};
+ $config_requires = $meta && $meta->{prereqs}{configure}{requires}{'Module::Build'};
}
$config_requires ||= 0;
@@ -2061,8 +2061,8 @@ sub unparse_args {
my ($self, $args) = @_;
my @out;
while (my ($k, $v) = each %$args) {
- push @out, (UNIVERSAL::isa($v, 'HASH') ? map {+"--$k", "$_=$v->{$_}"} keys %$v :
- UNIVERSAL::isa($v, 'ARRAY') ? map {+"--$k", $_} @$v :
+ push @out, (ref $v eq 'HASH' ? map {+"--$k", "$_=$v->{$_}"} keys %$v :
+ ref $v eq 'ARRAY' ? map {+"--$k", $_} @$v :
("--$k", $v));
}
return @out;
@@ -2970,12 +2970,12 @@ sub find_PL_files {
if (my $files = $self->{properties}{PL_files}) {
# 'PL_files' is given as a Unix file spec, so we localize_file_path().
- if (UNIVERSAL::isa($files, 'ARRAY')) {
+ if (ref $files eq 'ARRAY') {
return { map {$_, [/^(.*)\.PL$/]}
map $self->localize_file_path($_),
@$files };
- } elsif (UNIVERSAL::isa($files, 'HASH')) {
+ } elsif (ref $files eq 'HASH') {
my %out;
while (my ($file, $to) = each %$files) {
$out{ $self->localize_file_path($file) } = [ map $self->localize_file_path($_),
@@ -3016,7 +3016,7 @@ sub find_test_files {
my $p = $self->{properties};
if (my $files = $p->{test_files}) {
- $files = [keys %$files] if UNIVERSAL::isa($files, 'HASH');
+ $files = [keys %$files] if ref $files eq 'HASH';
$files = [map { -d $_ ? $self->expand_test_dir($_) : $_ }
map glob,
$self->split_like_shell($files)];
@@ -4362,8 +4362,8 @@ sub script_files {
next unless $_;
# Always coerce into a hash
- return $_ if UNIVERSAL::isa($_, 'HASH');
- return $_ = { map {$_,1} @$_ } if UNIVERSAL::isa($_, 'ARRAY');
+ return $_ if ref $_ eq 'HASH';
+ return $_ = { map {$_,1} @$_ } if ref $_ eq 'ARRAY';
die "'script_files' must be a hashref, arrayref, or string" if ref();
@@ -4565,28 +4565,13 @@ sub _get_meta_object {
return $meta;
}
-# We return a version 1.4 structure for backwards compatibility
sub read_metafile {
my $self = shift;
my ($metafile) = @_;
return unless $self->try_require("CPAN::Meta", "2.110420");
my $meta = CPAN::Meta->load_file($metafile);
- return $meta->as_struct( {version => "1.4"} );
-}
-
-# For legacy compatibility, we upconvert a 1.4 data structure, ensuring
-# validity, and then downconvert it back to save it.
-#
-# generally, this code should no longer be used
-sub write_metafile {
- my $self = shift;
- my ($metafile, $struct) = @_;
-
- return unless $self->try_require("CPAN::Meta", "2.110420");
-
- my $meta = CPAN::Meta->new( $struct );
- return $meta->save( $metafile, { version => "1.4" } );
+ return $meta->as_struct( {version => "2.0"} );
}
sub normalize_version {
@@ -4659,58 +4644,6 @@ sub _get_license {
return ($meta_license, $meta_license_url);
}
-my %keep = map { $_ => 1 } qw/keywords dynamic_config provides no_index name version abstract/;
-my %ignore = map { $_ => 1 } qw/distribution_type/;
-my %reject = map { $_ => 1 } qw/private author license requires recommends build_requires configure_requires conflicts/;
-
-sub _upconvert_resources {
- my ($input) = @_;
- my %output;
- for my $key (keys %{$input}) {
- my $out_key = $key =~ /^\p{Lu}/ ? "x_\l$key" : $key;
- if ($key eq 'repository') {
- my $name = $input->{$key} =~ m{ \A http s? :// .* (<! \.git ) \z }xms ? 'web' : 'url';
- $output{$out_key} = { $name => $input->{$key} };
- }
- elsif ($key eq 'bugtracker') {
- $output{$out_key} = { web => $input->{$key} }
- }
- else {
- $output{$out_key} = $input->{$key};
- }
- }
- return \%output
-}
-my %custom = (
- resources => \&_upconvert_resources,
-);
-
-sub _upconvert_metapiece {
- my ($input, $type) = @_;
- return $input if exists $input->{'meta-spec'} && $input->{'meta-spec'}{version} == 2;
-
- my %ret;
- for my $key (keys %{$input}) {
- if ($keep{$key}) {
- $ret{$key} = $input->{$key};
- }
- elsif ($ignore{$key}) {
- next;
- }
- elsif ($reject{$key}) {
- croak "Can't $type $key, please use another mechanism";
- }
- elsif (my $converter = $custom{$key}) {
- $ret{$key} = $converter->($input->{$key});
- }
- else {
- my $out_key = $key =~ / \A x_ /xi ? $key : "x_$key";
- $ret{$out_key} = $input->{$key};
- }
- }
- return \%ret;
-}
-
sub get_metadata {
my ($self, %args) = @_;
@@ -4762,14 +4695,30 @@ sub get_metadata {
"Nothing to enter for 'provides' field in metafile.\n");
}
- my $meta_add = _upconvert_metapiece($self->meta_add, 'add');
- while (my($k, $v) = each %{$meta_add} ) {
- $metadata{$k} = $v;
+ if (my $add = $self->meta_add) {
+ if (not exists $add->{'meta-spec'} or $add->{'meta-spec'}{version} != 2) {
+ require CPAN::Meta::Converter;
+ if (CPAN::Meta::Converter->VERSION('2.141170')) {
+ $add = CPAN::Meta::Converter->new($add)->upgrade_fragment;
+ delete $add->{prereqs}; # XXX this would now overwrite all prereqs
+ }
+ else {
+ $self->log_warn("Can't meta_add without CPAN::Meta 2.141170");
+ }
+ }
+
+ while (my($k, $v) = each %{$add}) {
+ $metadata{$k} = $v;
+ }
}
- my $meta_merge = _upconvert_metapiece($self->meta_merge, 'merge');
- while (my($k, $v) = each %{$meta_merge} ) {
- $self->_hash_merge(\%metadata, $k, $v);
+ if (my $merge = $self->meta_merge) {
+ if (eval { require CPAN::Meta::Merge }) {
+ %metadata = %{ CPAN::Meta::Merge->new(default_version => '1.4')->merge(\%metadata, $merge) };
+ }
+ else {
+ $self->log_warn("Can't merge without CPAN::Meta::Merge");
+ }
}
return \%metadata;
@@ -5445,7 +5394,7 @@ sub split_like_shell {
my ($self, $string) = @_;
return () unless defined($string);
- return @$string if UNIVERSAL::isa($string, 'ARRAY');
+ return @$string if ref $string eq 'ARRAY';
$string =~ s/^\s+|\s+$//g;
return () unless length($string);
diff --git a/lib/Module/Build/Compat.pm b/lib/Module/Build/Compat.pm
index b117726..94ccd90 100644
--- a/lib/Module/Build/Compat.pm
+++ b/lib/Module/Build/Compat.pm
@@ -2,7 +2,7 @@ package Module::Build::Compat;
use strict;
use warnings;
-our $VERSION = '0.4208';
+our $VERSION = '0.4210';
use File::Basename ();
use File::Spec;
diff --git a/lib/Module/Build/Config.pm b/lib/Module/Build/Config.pm
index ccde9ba..95d7c9e 100644
--- a/lib/Module/Build/Config.pm
+++ b/lib/Module/Build/Config.pm
@@ -2,7 +2,7 @@ package Module::Build::Config;
use strict;
use warnings;
-our $VERSION = '0.4208';
+our $VERSION = '0.4210';
$VERSION = eval $VERSION;
use Config;
diff --git a/lib/Module/Build/Cookbook.pm b/lib/Module/Build/Cookbook.pm
index ac7d376..83360dd 100644
--- a/lib/Module/Build/Cookbook.pm
+++ b/lib/Module/Build/Cookbook.pm
@@ -1,7 +1,7 @@
package Module::Build::Cookbook;
use strict;
use warnings;
-our $VERSION = '0.4208';
+our $VERSION = '0.4210';
=head1 NAME
diff --git a/lib/Module/Build/Dumper.pm b/lib/Module/Build/Dumper.pm
index ce77dcd..108664a 100644
--- a/lib/Module/Build/Dumper.pm
+++ b/lib/Module/Build/Dumper.pm
@@ -1,7 +1,7 @@
package Module::Build::Dumper;
use strict;
use warnings;
-our $VERSION = '0.4208';
+our $VERSION = '0.4210';
# This is just a split-out of a wrapper function to do Data::Dumper
# stuff "the right way". See:
diff --git a/lib/Module/Build/Notes.pm b/lib/Module/Build/Notes.pm
index 0bc27b4..c8603e1 100644
--- a/lib/Module/Build/Notes.pm
+++ b/lib/Module/Build/Notes.pm
@@ -4,7 +4,7 @@ package Module::Build::Notes;
use strict;
use warnings;
-our $VERSION = '0.4208';
+our $VERSION = '0.4210';
$VERSION = eval $VERSION;
use Data::Dumper;
use Module::Build::Dumper;
diff --git a/lib/Module/Build/PPMMaker.pm b/lib/Module/Build/PPMMaker.pm
index a10a6ca..23c2698 100644
--- a/lib/Module/Build/PPMMaker.pm
+++ b/lib/Module/Build/PPMMaker.pm
@@ -4,7 +4,7 @@ use strict;
use warnings;
use Config;
-our $VERSION = '0.4208';
+our $VERSION = '0.4210';
$VERSION = eval $VERSION;
# This code is mostly borrowed from ExtUtils::MM_Unix 6.10_03, with a
diff --git a/lib/Module/Build/Platform/Default.pm b/lib/Module/Build/Platform/Default.pm
index 838bb9a..eb8468d 100644
--- a/lib/Module/Build/Platform/Default.pm
+++ b/lib/Module/Build/Platform/Default.pm
@@ -2,7 +2,7 @@ package Module::Build::Platform::Default;
use strict;
use warnings;
-our $VERSION = '0.4208';
+our $VERSION = '0.4210';
$VERSION = eval $VERSION;
use Module::Build::Base;
diff --git a/lib/Module/Build/Platform/MacOS.pm b/lib/Module/Build/Platform/MacOS.pm
index d4441d5..f4bf45a 100644
--- a/lib/Module/Build/Platform/MacOS.pm
+++ b/lib/Module/Build/Platform/MacOS.pm
@@ -2,7 +2,7 @@ package Module::Build::Platform::MacOS;
use strict;
use warnings;
-our $VERSION = '0.4208';
+our $VERSION = '0.4210';
$VERSION = eval $VERSION;
use Module::Build::Base;
our @ISA = qw(Module::Build::Base);
diff --git a/lib/Module/Build/Platform/Unix.pm b/lib/Module/Build/Platform/Unix.pm
index 40b1b4f..9a020fa 100644
--- a/lib/Module/Build/Platform/Unix.pm
+++ b/lib/Module/Build/Platform/Unix.pm
@@ -2,7 +2,7 @@ package Module::Build::Platform::Unix;
use strict;
use warnings;
-our $VERSION = '0.4208';
+our $VERSION = '0.4210';
$VERSION = eval $VERSION;
use Module::Build::Base;
diff --git a/lib/Module/Build/Platform/VMS.pm b/lib/Module/Build/Platform/VMS.pm
index d2a46e8..3a07349 100644
--- a/lib/Module/Build/Platform/VMS.pm
+++ b/lib/Module/Build/Platform/VMS.pm
@@ -2,7 +2,7 @@ package Module::Build::Platform::VMS;
use strict;
use warnings;
-our $VERSION = '0.4208';
+our $VERSION = '0.4210';
$VERSION = eval $VERSION;
use Module::Build::Base;
use Config;
@@ -151,7 +151,7 @@ sub _quote_args {
# elements of it and return the reference.
my ($self, @args) = @_;
my $got_arrayref = (scalar(@args) == 1
- && UNIVERSAL::isa($args[0], 'ARRAY'))
+ && ref $args[0] eq 'ARRAY')
? 1
: 0;
diff --git a/lib/Module/Build/Platform/VOS.pm b/lib/Module/Build/Platform/VOS.pm
index 3a09a64..53756ff 100644
--- a/lib/Module/Build/Platform/VOS.pm
+++ b/lib/Module/Build/Platform/VOS.pm
@@ -2,7 +2,7 @@ package Module::Build::Platform::VOS;
use strict;
use warnings;
-our $VERSION = '0.4208';
+our $VERSION = '0.4210';
$VERSION = eval $VERSION;
use Module::Build::Base;
diff --git a/lib/Module/Build/Platform/Windows.pm b/lib/Module/Build/Platform/Windows.pm
index 61aeb41..b61ff1b 100644
--- a/lib/Module/Build/Platform/Windows.pm
+++ b/lib/Module/Build/Platform/Windows.pm
@@ -2,7 +2,7 @@ package Module::Build::Platform::Windows;
use strict;
use warnings;
-our $VERSION = '0.4208';
+our $VERSION = '0.4210';
$VERSION = eval $VERSION;
use Config;
@@ -208,7 +208,7 @@ sub split_like_shell {
(my $self, local $_) = @_;
- return @$_ if defined() && UNIVERSAL::isa($_, 'ARRAY');
+ return @$_ if defined() && ref() eq 'ARRAY';
my @argv;
return @argv unless defined() && length();
diff --git a/lib/Module/Build/Platform/aix.pm b/lib/Module/Build/Platform/aix.pm
index b47d2ef..2ed7ea4 100644
--- a/lib/Module/Build/Platform/aix.pm
+++ b/lib/Module/Build/Platform/aix.pm
@@ -2,7 +2,7 @@ package Module::Build::Platform::aix;
use strict;
use warnings;
-our $VERSION = '0.4208';
+our $VERSION = '0.4210';
$VERSION = eval $VERSION;
use Module::Build::Platform::Unix;
diff --git a/lib/Module/Build/Platform/cygwin.pm b/lib/Module/Build/Platform/cygwin.pm
index f4b5cca..92acb84 100644
--- a/lib/Module/Build/Platform/cygwin.pm
+++ b/lib/Module/Build/Platform/cygwin.pm
@@ -2,7 +2,7 @@ package Module::Build::Platform::cygwin;
use strict;
use warnings;
-our $VERSION = '0.4208';
+our $VERSION = '0.4210';
$VERSION = eval $VERSION;
use Module::Build::Platform::Unix;
diff --git a/lib/Module/Build/Platform/darwin.pm b/lib/Module/Build/Platform/darwin.pm
index 9ee6759..5929f3f 100644
--- a/lib/Module/Build/Platform/darwin.pm
+++ b/lib/Module/Build/Platform/darwin.pm
@@ -2,7 +2,7 @@ package Module::Build::Platform::darwin;
use strict;
use warnings;
-our $VERSION = '0.4208';
+our $VERSION = '0.4210';
$VERSION = eval $VERSION;
use Module::Build::Platform::Unix;
diff --git a/lib/Module/Build/Platform/os2.pm b/lib/Module/Build/Platform/os2.pm
index d94b706..e096fa4 100644
--- a/lib/Module/Build/Platform/os2.pm
+++ b/lib/Module/Build/Platform/os2.pm
@@ -2,7 +2,7 @@ package Module::Build::Platform::os2;
use strict;
use warnings;
-our $VERSION = '0.4208';
+our $VERSION = '0.4210';
$VERSION = eval $VERSION;
use Module::Build::Platform::Unix;
diff --git a/lib/Module/Build/PodParser.pm b/lib/Module/Build/PodParser.pm
index 8ce2134..2140d18 100644
--- a/lib/Module/Build/PodParser.pm
+++ b/lib/Module/Build/PodParser.pm
@@ -2,7 +2,7 @@ package Module::Build::PodParser;
use strict;
use warnings;
-our $VERSION = '0.4208';
+our $VERSION = '0.4210';
$VERSION = eval $VERSION;
sub new {
diff --git a/lib/inc/latest.pm b/lib/inc/latest.pm
index 7d89e0a..679c3ae 100644
--- a/lib/inc/latest.pm
+++ b/lib/inc/latest.pm
@@ -5,7 +5,7 @@ use if $] >= 5.019, 'deprecate';
use 5.006;
use strict;
use warnings;
-our $VERSION = '0.4208';
+our $VERSION = '0.4210';
$VERSION = eval $VERSION;
use Carp;
diff --git a/lib/inc/latest/private.pm b/lib/inc/latest/private.pm
index 5a3e21a..e66f54c 100644
--- a/lib/inc/latest/private.pm
+++ b/lib/inc/latest/private.pm
@@ -5,7 +5,7 @@ use if $] >= 5.019, 'deprecate';
use 5.006;
use strict;
use warnings;
-our $VERSION = '0.4208';
+our $VERSION = '0.4210';
$VERSION = eval $VERSION;
use File::Spec;
diff --git a/t/extend.t b/t/extend.t
index 62830c2..ae30f8d 100644
--- a/t/extend.t
+++ b/t/extend.t
@@ -183,28 +183,28 @@ print "Hello, World!\n";
ok my $mb = Module::Build->new(
module_name => $dist->name,
license => 'perl',
- meta_add => {abstract => 'bar'},
+ meta_add => {keywords => ['bar']},
conflicts => {'Foo::Barxx' => 0},
);
my $data = $mb->get_metadata;
- is_deeply $data->{abstract}, 'bar';
+ is_deeply $data->{keywords}, ['bar'];
- $mb->meta_merge(abstract => 'baz');
+ $mb->meta_merge(keywords => ['baz']);
$data = $mb->get_metadata;
- is_deeply $data->{abstract}, 'baz';
+ is_deeply $data->{keywords}, [qw/bar baz/];
$mb->meta_merge(
'meta-spec' => { version => 2 },
prereqs => {
test => {
- requirements => {
+ requires => {
'Foo::Fooxx' => 0,
}
}
}
);
$data = $mb->get_metadata;
- is_deeply $data->{prereqs}{test}{requirements}, { 'Foo::Fooxx' => 0 };
+ is_deeply $data->{prereqs}{test}{requires}, { 'Foo::Fooxx' => 0 } or diag explain $mb->meta_merge;
}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libmodule-build-perl.git
More information about the Pkg-perl-cvs-commits
mailing list