r64986 - in /branches/upstream/libmodule-depends-perl/current: Build.PL Changes MANIFEST MANIFEST.SKIP META.yml Makefile.PL lib/Module/Depends.pm lib/Module/Depends/Intrusive.pm t/depends.t t/makemaker-false/ t/makemaker-false/Makefile.PL
gregoa at users.alioth.debian.org
gregoa at users.alioth.debian.org
Wed Nov 17 18:02:55 UTC 2010
Author: gregoa
Date: Wed Nov 17 18:01:34 2010
New Revision: 64986
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=64986
Log:
[svn-upgrade] new version libmodule-depends-perl (0.15)
Added:
branches/upstream/libmodule-depends-perl/current/t/makemaker-false/
branches/upstream/libmodule-depends-perl/current/t/makemaker-false/Makefile.PL
Modified:
branches/upstream/libmodule-depends-perl/current/Build.PL
branches/upstream/libmodule-depends-perl/current/Changes
branches/upstream/libmodule-depends-perl/current/MANIFEST
branches/upstream/libmodule-depends-perl/current/MANIFEST.SKIP
branches/upstream/libmodule-depends-perl/current/META.yml
branches/upstream/libmodule-depends-perl/current/Makefile.PL
branches/upstream/libmodule-depends-perl/current/lib/Module/Depends.pm
branches/upstream/libmodule-depends-perl/current/lib/Module/Depends/Intrusive.pm
branches/upstream/libmodule-depends-perl/current/t/depends.t
Modified: branches/upstream/libmodule-depends-perl/current/Build.PL
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmodule-depends-perl/current/Build.PL?rev=64986&op=diff
==============================================================================
--- branches/upstream/libmodule-depends-perl/current/Build.PL (original)
+++ branches/upstream/libmodule-depends-perl/current/Build.PL Wed Nov 17 18:01:34 2010
@@ -8,8 +8,8 @@
'Test::More' => 0,
},
requires => {
- 'YAML' => 0,
- 'File::Spec' => 0,
+ 'Parse::CPAN::Meta' => 0,
+ 'File::Spec' => 0,
'Class::Accessor::Chained' => 0,
},
create_makefile_pl => 'traditional',
Modified: branches/upstream/libmodule-depends-perl/current/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmodule-depends-perl/current/Changes?rev=64986&op=diff
==============================================================================
--- branches/upstream/libmodule-depends-perl/current/Changes (original)
+++ branches/upstream/libmodule-depends-perl/current/Changes Wed Nov 17 18:01:34 2010
@@ -1,3 +1,8 @@
+0.15 Tuesday 23rd February, 2010
+ Allow Makefile.PL/Build.PL exit non-true (Ryan Niebur)
+ Use Parse::CPAN::Meta rather than YAML to parse the
+ META.yml (Takatoshi Kitano)
+
0.14 Wednesday 13th February, 2008
Set $0 to be $file, this allows the use of FindBin in your
Makefile.PL (if you're so inclined)
Modified: branches/upstream/libmodule-depends-perl/current/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmodule-depends-perl/current/MANIFEST?rev=64986&op=diff
==============================================================================
--- branches/upstream/libmodule-depends-perl/current/MANIFEST (original)
+++ branches/upstream/libmodule-depends-perl/current/MANIFEST Wed Nov 17 18:01:34 2010
@@ -17,6 +17,7 @@
t/build_version/Build.PL
t/inline-makemaker/Makefile.PL
t/with-yaml/META.yml
+t/makemaker-false/Makefile.PL
t/module-install/Makefile.PL
t/template-extract/Build.PL
t/template-extract/META.yml
Modified: branches/upstream/libmodule-depends-perl/current/MANIFEST.SKIP
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmodule-depends-perl/current/MANIFEST.SKIP?rev=64986&op=diff
==============================================================================
--- branches/upstream/libmodule-depends-perl/current/MANIFEST.SKIP (original)
+++ branches/upstream/libmodule-depends-perl/current/MANIFEST.SKIP Wed Nov 17 18:01:34 2010
@@ -1,5 +1,6 @@
.cvsignore
\.svn
+\.git
blib/
\bCVS\b
^Makefile$
Modified: branches/upstream/libmodule-depends-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmodule-depends-perl/current/META.yml?rev=64986&op=diff
==============================================================================
--- branches/upstream/libmodule-depends-perl/current/META.yml (original)
+++ branches/upstream/libmodule-depends-perl/current/META.yml Wed Nov 17 18:01:34 2010
@@ -1,14 +1,22 @@
-# http://module-build.sourceforge.net/META-spec.html
-#XXXXXXX This is a prototype!!! It will change in the future!!! XXXXX#
-name: Module-Depends
-version: 0.14
-version_from: lib/Module/Depends.pm
-installdirs: site
+--- #YAML:1.0
+name: Module-Depends
+version: 0.15
+abstract: ~
+author: []
+license: unknown
+distribution_type: module
+configure_requires:
+ ExtUtils::MakeMaker: 0
requires:
- Class::Accessor::Chained: 0
- File::Spec: 0
- Test::More: 0
- YAML: 0
-
-distribution_type: module
-generated_by: ExtUtils::MakeMaker version 6.17
+ Class::Accessor::Chained: 0
+ File::Spec: 0
+ Parse::CPAN::Meta: 0
+ Test::More: 0
+no_index:
+ directory:
+ - t
+ - inc
+generated_by: ExtUtils::MakeMaker version 6.48
+meta-spec:
+ url: http://module-build.sourceforge.net/META-spec-v1.4.html
+ version: 1.4
Modified: branches/upstream/libmodule-depends-perl/current/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmodule-depends-perl/current/Makefile.PL?rev=64986&op=diff
==============================================================================
--- branches/upstream/libmodule-depends-perl/current/Makefile.PL (original)
+++ branches/upstream/libmodule-depends-perl/current/Makefile.PL Wed Nov 17 18:01:34 2010
@@ -1,17 +1,17 @@
-# Note: this file was auto-generated by Module::Build::Compat version 0.03
+# Note: this file was auto-generated by Module::Build::Compat version 0.35
use ExtUtils::MakeMaker;
WriteMakefile
(
- 'PL_FILES' => {},
- 'INSTALLDIRS' => 'site',
'NAME' => 'Module::Depends',
- 'EXE_FILES' => [],
'VERSION_FROM' => 'lib/Module/Depends.pm',
'PREREQ_PM' => {
- 'Test::More' => 0,
- 'YAML' => 0,
- 'Class::Accessor::Chained' => 0,
- 'File::Spec' => 0
- }
+ 'Class::Accessor::Chained' => '0',
+ 'File::Spec' => '0',
+ 'Parse::CPAN::Meta' => '0',
+ 'Test::More' => '0'
+ },
+ 'INSTALLDIRS' => 'site',
+ 'EXE_FILES' => [],
+ 'PL_FILES' => {}
)
;
Modified: branches/upstream/libmodule-depends-perl/current/lib/Module/Depends.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmodule-depends-perl/current/lib/Module/Depends.pm?rev=64986&op=diff
==============================================================================
--- branches/upstream/libmodule-depends-perl/current/lib/Module/Depends.pm (original)
+++ branches/upstream/libmodule-depends-perl/current/lib/Module/Depends.pm Wed Nov 17 18:01:34 2010
@@ -1,10 +1,10 @@
use strict;
package Module::Depends;
-use YAML qw( LoadFile );
+use Parse::CPAN::Meta;
use Cwd qw( getcwd );
use base qw( Class::Accessor::Chained );
__PACKAGE__->mk_accessors(qw( dist_dir debug libs requires build_requires error ));
-our $VERSION = '0.14';
+our $VERSION = '0.15';
=head1 NAME
@@ -74,9 +74,9 @@
sub _find_modules {
my $self = shift;
- my $file = 'META.yml';
- if (-e $file) {
- my $meta = LoadFile( $file );
+ my ($file) = grep { -e $_ } qw( MYMETA.yml META.yml );
+ if ($file) {
+ my $meta = ( Parse::CPAN::Meta::LoadFile( $file ) )[0];
$self->requires( $meta->{requires} );
$self->build_requires( $meta->{build_requires} );
}
@@ -115,7 +115,8 @@
=head1 COPYRIGHT
-Copyright 2004, 2007, 2008 Fotango. All Rights Reserved.
+Copyright 2010, Richard Clamp.
+Copyright 2004-2008, Fotango.
This module is free software; you can redistribute it and/or modify it
under the same terms as Perl itself.
Modified: branches/upstream/libmodule-depends-perl/current/lib/Module/Depends/Intrusive.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmodule-depends-perl/current/lib/Module/Depends/Intrusive.pm?rev=64986&op=diff
==============================================================================
--- branches/upstream/libmodule-depends-perl/current/lib/Module/Depends/Intrusive.pm (original)
+++ branches/upstream/libmodule-depends-perl/current/lib/Module/Depends/Intrusive.pm Wed Nov 17 18:01:34 2010
@@ -81,7 +81,7 @@
no strict;
no warnings;
local $0 = $file;
- require "$file";
+ do "$file";
};
$self->error( $@ ) if $@;
delete $INC{$file};
Modified: branches/upstream/libmodule-depends-perl/current/t/depends.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmodule-depends-perl/current/t/depends.t?rev=64986&op=diff
==============================================================================
--- branches/upstream/libmodule-depends-perl/current/t/depends.t (original)
+++ branches/upstream/libmodule-depends-perl/current/t/depends.t Wed Nov 17 18:01:34 2010
@@ -1,7 +1,7 @@
#!perl
use strict;
use warnings;
-use Test::More tests => 18;
+use Test::More tests => 19;
my $class = 'Module::Depends::Intrusive';
require_ok("Module::Depends");
require_ok($class);
@@ -107,3 +107,9 @@
{ 'Not::A::Real::Module' => 42 },
"odd outcome use of FindBin"
);
+
+my $mm_false = $class->new->dist_dir('t/makemaker-false')->find_modules;
+is( $mm_false->error, '',
+ "Makefile.PL exiting false should not be considered an error",
+);
+
Added: branches/upstream/libmodule-depends-perl/current/t/makemaker-false/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmodule-depends-perl/current/t/makemaker-false/Makefile.PL?rev=64986&op=file
==============================================================================
--- branches/upstream/libmodule-depends-perl/current/t/makemaker-false/Makefile.PL (added)
+++ branches/upstream/libmodule-depends-perl/current/t/makemaker-false/Makefile.PL Wed Nov 17 18:01:34 2010
@@ -1,0 +1,9 @@
+#!perl -w
+use ExtUtils::MakeMaker;
+WriteMakefile(
+ NAME => 'Debian317061',
+ PREREQ_PM => {
+ 'Not::A::Real::Module' => 42,
+ },
+ );
+0;
More information about the Pkg-perl-cvs-commits
mailing list