r34862 - in /trunk/libmodule-build-perl: ./ debian/ lib/Module/ lib/Module/Build/ lib/Module/Build/Platform/ t/
ryan52-guest at users.alioth.debian.org
ryan52-guest at users.alioth.debian.org
Wed May 6 05:40:22 UTC 2009
Author: ryan52-guest
Date: Wed May 6 05:40:16 2009
New Revision: 34862
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=34862
Log:
* New upstream release
* Add myself to Uploaders
* Debian Policy 3.8.1
Modified:
trunk/libmodule-build-perl/Build.PL
trunk/libmodule-build-perl/Changes
trunk/libmodule-build-perl/META.yml
trunk/libmodule-build-perl/README
trunk/libmodule-build-perl/debian/changelog
trunk/libmodule-build-perl/debian/control
trunk/libmodule-build-perl/lib/Module/Build.pm
trunk/libmodule-build-perl/lib/Module/Build/Base.pm
trunk/libmodule-build-perl/lib/Module/Build/Compat.pm
trunk/libmodule-build-perl/lib/Module/Build/Config.pm
trunk/libmodule-build-perl/lib/Module/Build/Cookbook.pm
trunk/libmodule-build-perl/lib/Module/Build/Dumper.pm
trunk/libmodule-build-perl/lib/Module/Build/ModuleInfo.pm
trunk/libmodule-build-perl/lib/Module/Build/Notes.pm
trunk/libmodule-build-perl/lib/Module/Build/PPMMaker.pm
trunk/libmodule-build-perl/lib/Module/Build/Platform/Amiga.pm
trunk/libmodule-build-perl/lib/Module/Build/Platform/Default.pm
trunk/libmodule-build-perl/lib/Module/Build/Platform/EBCDIC.pm
trunk/libmodule-build-perl/lib/Module/Build/Platform/MPEiX.pm
trunk/libmodule-build-perl/lib/Module/Build/Platform/MacOS.pm
trunk/libmodule-build-perl/lib/Module/Build/Platform/RiscOS.pm
trunk/libmodule-build-perl/lib/Module/Build/Platform/Unix.pm
trunk/libmodule-build-perl/lib/Module/Build/Platform/VMS.pm
trunk/libmodule-build-perl/lib/Module/Build/Platform/VOS.pm
trunk/libmodule-build-perl/lib/Module/Build/Platform/Windows.pm
trunk/libmodule-build-perl/lib/Module/Build/Platform/aix.pm
trunk/libmodule-build-perl/lib/Module/Build/Platform/cygwin.pm
trunk/libmodule-build-perl/lib/Module/Build/Platform/darwin.pm
trunk/libmodule-build-perl/lib/Module/Build/Platform/os2.pm
trunk/libmodule-build-perl/lib/Module/Build/PodParser.pm
trunk/libmodule-build-perl/t/compat.t
trunk/libmodule-build-perl/t/ext.t
Modified: trunk/libmodule-build-perl/Build.PL
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmodule-build-perl/Build.PL?rev=34862&op=diff
==============================================================================
--- trunk/libmodule-build-perl/Build.PL (original)
+++ trunk/libmodule-build-perl/Build.PL Wed May 6 05:40:16 2009
@@ -23,6 +23,7 @@
},
requires => {
'perl' => '5.006001',
+ 'Archive::Tar' => '1.08',
'Data::Dumper' => 0,
'File::Basename' => 0,
'File::Compare' => 0,
@@ -41,7 +42,6 @@
'Test::Harness' => 0,
},
recommends => {
- 'Archive::Tar' => '1.08',
'ExtUtils::CBuilder' => 0.15,
'ExtUtils::Install' => 0.30,
'ExtUtils::ParseXS' => 1.02,
Modified: trunk/libmodule-build-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmodule-build-perl/Changes?rev=34862&op=diff
==============================================================================
--- trunk/libmodule-build-perl/Changes (original)
+++ trunk/libmodule-build-perl/Changes Wed May 6 05:40:16 2009
@@ -1,5 +1,32 @@
Revision history for Perl extension Module::Build.
+0.33 - Sun May 3 20:16:34 PDT 2009
+
+ Bug-fixes:
+ - Fixed RT#45462: Compat.pm needs to reference 'Build.com' on VMS
+ [patch from John Malmberg]
+ - Fixed RT#45461: ext.t on VMS [patch from John Malmberg]
+ - Fixed RT#43861: Module::Build::PPMMaker has broken PPD name
+ versioning for v5.10+
+
+0.32_01 - Tue Apr 14 17:14:22 PDT 2009
+
+ Bug-fixes:
+ - Module::Build::Compat had stopped adding "PL_FILES => {}" when no
+ PL_files property was set in Build.PL; restored old behavior and fixed
+ tests and documentation related to this issue [David Golden]
+ - Caches ExtUtils::CBuilder object in a temporary stash instead of properties
+ - Fixed undef resources->license in META.yml (RT #44453).
+ - Use $^X instead of 'perl' in t/ext.t [David Golden] (RT #43485)
+
+ Other:
+ - Generated META.yml will indicate version 1.4 of the specification
+ (RT #37478) [patch from Alexandr Ciornii]
+ - Archive::Tar now the default for generating tarballs on all platforms
+ (avoids problems with incompatible tar binaries)
+ - dist_dir() now uses dist_name() and dist_version() accessors rather
+ than using its properties directly. [brian d foy] (RT #45038)
+
0.32 - Wed Feb 25 17:40:02 PST 2009
No changes since 0.31_04.
Modified: trunk/libmodule-build-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmodule-build-perl/META.yml?rev=34862&op=diff
==============================================================================
--- trunk/libmodule-build-perl/META.yml (original)
+++ trunk/libmodule-build-perl/META.yml Wed May 6 05:40:16 2009
@@ -1,6 +1,6 @@
---
name: Module-Build
-version: 0.32
+version: 0.33
author:
- 'Ken Williams <kwilliams at cpan.org>'
- |-
@@ -15,6 +15,7 @@
license: http://dev.perl.org/licenses/
repository: http://svn.perl.org/modules/Module-Build/
requires:
+ Archive::Tar: 1.08
Cwd: 0
Data::Dumper: 0
ExtUtils::Install: 0
@@ -37,7 +38,6 @@
Test::Harness: 3.16
Test::More: 0.49
recommends:
- Archive::Tar: 1.08
ExtUtils::CBuilder: 0.15
ExtUtils::Install: 0.3
ExtUtils::ParseXS: 1.02
@@ -47,76 +47,76 @@
provides:
Module::Build:
file: lib/Module/Build.pm
- version: 0.32
+ version: 0.33
Module::Build::Base:
file: lib/Module/Build/Base.pm
- version: 0.32
+ version: 0.33
Module::Build::Compat:
file: lib/Module/Build/Compat.pm
- version: 0.32
+ version: 0.33
Module::Build::Config:
file: lib/Module/Build/Config.pm
- version: 0.32
+ version: 0.33
Module::Build::Cookbook:
file: lib/Module/Build/Cookbook.pm
- version: 0.32
+ version: 0.33
Module::Build::Dumper:
file: lib/Module/Build/Dumper.pm
- version: 0.32
+ version: 0.33
Module::Build::ModuleInfo:
file: lib/Module/Build/ModuleInfo.pm
- version: 0.32
+ version: 0.33
Module::Build::Notes:
file: lib/Module/Build/Notes.pm
- version: 0.32
+ version: 0.33
Module::Build::PPMMaker:
file: lib/Module/Build/PPMMaker.pm
- version: 0.32
+ version: 0.33
Module::Build::Platform::Amiga:
file: lib/Module/Build/Platform/Amiga.pm
- version: 0.32
+ version: 0.33
Module::Build::Platform::Default:
file: lib/Module/Build/Platform/Default.pm
- version: 0.32
+ version: 0.33
Module::Build::Platform::EBCDIC:
file: lib/Module/Build/Platform/EBCDIC.pm
- version: 0.32
+ version: 0.33
Module::Build::Platform::MPEiX:
file: lib/Module/Build/Platform/MPEiX.pm
- version: 0.32
+ version: 0.33
Module::Build::Platform::MacOS:
file: lib/Module/Build/Platform/MacOS.pm
- version: 0.32
+ version: 0.33
Module::Build::Platform::RiscOS:
file: lib/Module/Build/Platform/RiscOS.pm
- version: 0.32
+ version: 0.33
Module::Build::Platform::Unix:
file: lib/Module/Build/Platform/Unix.pm
- version: 0.32
+ version: 0.33
Module::Build::Platform::VMS:
file: lib/Module/Build/Platform/VMS.pm
- version: 0.32
+ version: 0.33
Module::Build::Platform::VOS:
file: lib/Module/Build/Platform/VOS.pm
- version: 0.32
+ version: 0.33
Module::Build::Platform::Windows:
file: lib/Module/Build/Platform/Windows.pm
- version: 0.32
+ version: 0.33
Module::Build::Platform::aix:
file: lib/Module/Build/Platform/aix.pm
- version: 0.32
+ version: 0.33
Module::Build::Platform::cygwin:
file: lib/Module/Build/Platform/cygwin.pm
- version: 0.32
+ version: 0.33
Module::Build::Platform::darwin:
file: lib/Module/Build/Platform/darwin.pm
- version: 0.32
+ version: 0.33
Module::Build::Platform::os2:
file: lib/Module/Build/Platform/os2.pm
- version: 0.32
+ version: 0.33
Module::Build::PodParser:
file: lib/Module/Build/PodParser.pm
- version: 0.32
+ version: 0.33
Module::Build::PodTester:
file: lib/Module/Build/Base.pm
Module::Build::Version:
@@ -125,7 +125,7 @@
Module::Build::YAML:
file: lib/Module/Build/YAML.pm
version: 0.50
-generated_by: Module::Build version 0.32
+generated_by: Module::Build version 0.33
meta-spec:
- url: http://module-build.sourceforge.net/META-spec-v1.2.html
- version: 1.2
+ url: http://module-build.sourceforge.net/META-spec-v1.4.html
+ version: 1.4
Modified: trunk/libmodule-build-perl/README
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmodule-build-perl/README?rev=34862&op=diff
==============================================================================
--- trunk/libmodule-build-perl/README (original)
+++ trunk/libmodule-build-perl/README Wed May 6 05:40:16 2009
@@ -156,10 +156,9 @@
will create a tarball of the files listed in MANIFEST and compress
the tarball using GZIP compression.
- By default, this action will use the external `tar' and `gzip'
- executables on Unix-like platforms, and the `Archive::Tar' module
- elsewhere. However, you can force it to use whatever executable you
- want by supplying an explicit `tar' (and optional `gzip') parameter:
+ By default, this action will use the `Archive::Tar' module. However,
+ you can force it to use binary "tar" and "gzip" executables by
+ supplying an explicit `tar' (and optional `gzip') parameter:
./Build dist --tar C:\path\to\tar.exe --gzip C:\path\to\zip.exe
Modified: trunk/libmodule-build-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmodule-build-perl/debian/changelog?rev=34862&op=diff
==============================================================================
--- trunk/libmodule-build-perl/debian/changelog (original)
+++ trunk/libmodule-build-perl/debian/changelog Wed May 6 05:40:16 2009
@@ -1,4 +1,4 @@
-libmodule-build-perl (0.3200-1) UNRELEASED; urgency=low
+libmodule-build-perl (0.3300-1) UNRELEASED; urgency=low
ON HOLD:
+ libpod-readme-perl missing, will file ITP
@@ -26,7 +26,12 @@
(source stanza).
* debian/control: Added: ${misc:Depends} to Depends: field.
- -- Antonio Radici <antonio at dyne.org> Fri, 06 Mar 2009 22:07:06 +0000
+ [ Ryan Niebur ]
+ * New upstream release
+ * Add myself to Uploaders
+ * Debian Policy 3.8.1
+
+ -- Ryan Niebur <ryanryan52 at gmail.com> Tue, 05 May 2009 22:40:06 -0700
libmodule-build-perl (0.3000-1) unstable; urgency=low
Modified: trunk/libmodule-build-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmodule-build-perl/debian/control?rev=34862&op=diff
==============================================================================
--- trunk/libmodule-build-perl/debian/control (original)
+++ trunk/libmodule-build-perl/debian/control Wed May 6 05:40:16 2009
@@ -4,13 +4,13 @@
Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
Uploaders: Jay Bonci <jaybonci at debian.org>, Niko Tyni <ntyni at debian.org>,
gregor herrmann <gregor+debian at comodo.priv.at>, Damyan Ivanov <dmn at debian.org>,
- Antonio Radici <antonio at dyne.org>
+ Antonio Radici <antonio at dyne.org>, Ryan Niebur <ryanryan52 at gmail.com>
Build-Depends: debhelper (>= 7), quilt (>= 0.40)
Build-Depends-Indep: perl (>= 5.6.0-16), libyaml-perl,
libextutils-cbuilder-perl, libextutils-parsexs-perl, libarchive-tar-perl,
libpar-dist-perl (>= 0.17), libversion-perl, libarchive-zip-perl,
libtest-harness-perl (>= 3.16), libtie-cphash-perl
-Standards-Version: 3.8.0
+Standards-Version: 3.8.1
Homepage: http://search.cpan.org/dist/Module-Build/
Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libmodule-build-perl/
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-perl/trunk/libmodule-build-perl/
Modified: trunk/libmodule-build-perl/lib/Module/Build.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmodule-build-perl/lib/Module/Build.pm?rev=34862&op=diff
==============================================================================
--- trunk/libmodule-build-perl/lib/Module/Build.pm (original)
+++ trunk/libmodule-build-perl/lib/Module/Build.pm Wed May 6 05:40:16 2009
@@ -15,7 +15,7 @@
use vars qw($VERSION @ISA);
@ISA = qw(Module::Build::Base);
-$VERSION = '0.32';
+$VERSION = '0.33';
$VERSION = eval $VERSION;
# Okay, this is the brute-force method of finding out what kind of
@@ -54,6 +54,7 @@
interix Unix
gnu Unix
gnukfreebsd Unix
+ nto Unix
dos Windows
MSWin32 Windows
@@ -311,10 +312,9 @@
tarball of the files listed in F<MANIFEST> and compress the tarball using
GZIP compression.
-By default, this action will use the external C<tar> and C<gzip>
-executables on Unix-like platforms, and the C<Archive::Tar> module
-elsewhere. However, you can force it to use whatever executable you
-want by supplying an explicit C<tar> (and optional C<gzip>) parameter:
+By default, this action will use the C<Archive::Tar> module. However, you can
+force it to use binary "tar" and "gzip" executables by supplying an explicit
+C<tar> (and optional C<gzip>) parameter:
./Build dist --tar C:\path\to\tar.exe --gzip C:\path\to\zip.exe
Modified: trunk/libmodule-build-perl/lib/Module/Build/Base.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmodule-build-perl/lib/Module/Build/Base.pm?rev=34862&op=diff
==============================================================================
--- trunk/libmodule-build-perl/lib/Module/Build/Base.pm (original)
+++ trunk/libmodule-build-perl/lib/Module/Build/Base.pm Wed May 6 05:40:16 2009
@@ -4,7 +4,7 @@
use strict;
use vars qw($VERSION);
-$VERSION = '0.32';
+$VERSION = '0.33';
$VERSION = eval $VERSION;
BEGIN { require 5.00503 }
@@ -129,6 +129,7 @@
%input,
},
phash => {},
+ stash => {}, # temporary caching, not stored in _build
}, $package;
$self->_set_defaults;
@@ -3424,7 +3425,7 @@
sub dist_dir {
my ($self) = @_;
- return "$self->{properties}{dist_name}-$self->{properties}{dist_version}";
+ return join "-", $self->dist_name, $self->dist_version;
}
sub ppm_name {
@@ -3566,34 +3567,50 @@
push @INC, File::Spec->catdir($self->blib, 'lib');
}
- $self->write_metafile;
-}
-
-sub write_metafile {
- my $self = shift;
- my $metafile = $self->metafile;
+ if ( $self->write_metafile( $self->metafile, $self->generate_metadata ) ) {
+ $self->{wrote_metadata} = 1;
+ $self->_add_to_manifest('MANIFEST', $metafile);
+ }
+
+ return 1;
+}
+
+sub generate_metadata {
+ my $self = shift;
+ my $node = {};
if ($self->_mb_feature('YAML_support')) {
require YAML;
require YAML::Node;
-
# We use YAML::Node to get the order nice in the YAML file.
- $self->prepare_metadata( my $node = YAML::Node->new({}) );
-
+ $self->prepare_metadata( $node = YAML::Node->new({}) );
+ } else {
+ require Module::Build::YAML;
+ my @order_keys;
+ $self->prepare_metadata($node, \@order_keys);
+ $node->{_order} = \@order_keys;
+ }
+ return $node;
+}
+
+sub write_metafile {
+ my $self = shift;
+ my ($metafile, $node) = @_;
+
+ if ($self->_mb_feature('YAML_support')) {
+ # XXX this is probably redundant, but stick with it
+ require YAML;
+ require YAML::Node;
+ delete $node->{_order}; # XXX also probably redundant, but for safety
# YAML API changed after version 0.30
my $yaml_sub = $YAML::VERSION le '0.30' ? \&YAML::StoreFile : \&YAML::DumpFile;
- $self->{wrote_metadata} = $yaml_sub->($metafile, $node );
-
+ $yaml_sub->( $metafile, $node );
} else {
+ # XXX probably redundant
require Module::Build::YAML;
- my (%node, @order_keys);
- $self->prepare_metadata(\%node, \@order_keys);
- $node{_order} = \@order_keys;
- &Module::Build::YAML::DumpFile($metafile, \%node);
- $self->{wrote_metadata} = 1;
- }
-
- $self->_add_to_manifest('MANIFEST', $metafile);
+ &Module::Build::YAML::DumpFile($metafile, $node);
+ }
+ return 1;
}
sub prepare_metadata {
@@ -3617,17 +3634,19 @@
if (defined( my $l = $self->license )) {
die "Unknown license string '$l'"
- unless exists $self->valid_licenses->{ $self->license };
-
- if (my $key = $self->valid_licenses->{ $self->license }) {
+ unless exists $self->valid_licenses->{ $l };
+
+ if (my $key = $self->valid_licenses->{ $l }) {
my $class = "Software::License::$key";
if (eval "use $class; 1") {
# S::L requires a 'holder' key
$node->{resources}{license} = $class->new({holder=>"nobody"})->url;
- } else {
- $node->{resources}{license} = $self->_license_url($key);
}
- }
+ else {
+ $node->{resources}{license} = $self->_license_url($l);
+ }
+ }
+ # XXX we are silently omitting the url for any unknown license
}
if (exists $p->{configure_requires}) {
@@ -3663,8 +3682,8 @@
$add_node->('generated_by', "Module::Build version $Module::Build::VERSION");
$add_node->('meta-spec',
- {version => '1.2',
- url => 'http://module-build.sourceforge.net/META-spec-v1.2.html',
+ {version => '1.4',
+ url => 'http://module-build.sourceforge.net/META-spec-v1.4.html',
});
while (my($k, $v) = each %{$self->meta_add}) {
@@ -4144,13 +4163,13 @@
# Returns a CBuilder object
my $self = shift;
- my $p = $self->{properties};
- return $p->{_cbuilder} if $p->{_cbuilder};
+ my $s = $self->{stash};
+ return $s->{_cbuilder} if $s->{_cbuilder};
die "Module::Build is not configured with C_support"
unless $self->_mb_feature('C_support');
require ExtUtils::CBuilder;
- return $p->{_cbuilder} = ExtUtils::CBuilder->new(
+ return $s->{_cbuilder} = ExtUtils::CBuilder->new(
config => $self->config,
($self->quiet ? (quiet => 1 ) : ()),
);
Modified: trunk/libmodule-build-perl/lib/Module/Build/Compat.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmodule-build-perl/lib/Module/Build/Compat.pm?rev=34862&op=diff
==============================================================================
--- trunk/libmodule-build-perl/lib/Module/Build/Compat.pm (original)
+++ trunk/libmodule-build-perl/lib/Module/Build/Compat.pm Wed May 6 05:40:16 2009
@@ -2,7 +2,7 @@
use strict;
use vars qw($VERSION);
-$VERSION = '0.32';
+$VERSION = '0.33';
use File::Spec;
use IO::File;
@@ -143,7 +143,9 @@
eval "use Module::Build::Compat 0.02; 1" or die $@;
%s
Module::Build::Compat->run_build_pl(args => \@ARGV);
- exit(0) unless(-e 'Build'); # cpantesters convention
+ my $build_script = 'Build';
+ $build_script .= '.com' if $^O eq 'VMS';
+ exit(0) unless(-e $build_script); # cpantesters convention
require %s;
Module::Build::Compat->write_makefile(build_class => '%s');
EOF
@@ -176,7 +178,7 @@
$MM_Args{EXE_FILES} = [ sort keys %{$build->script_files} ] if $build->script_files;
- $MM_Args{PL_FILES} = $build->PL_files if $build->PL_files;
+ $MM_Args{PL_FILES} = $build->PL_files || {};
local $Data::Dumper::Terse = 1;
my $args = Data::Dumper::Dumper(\%MM_Args);
@@ -501,11 +503,7 @@
they won't get to take advantage of Module::Build's extra features
either.
-If you go this route, make sure you explicitly set C<PL_FILES> in the
-call to C<WriteMakefile()> (probably to an empty hash reference), or
-else MakeMaker will mistakenly run the Build.PL and you'll get an
-error message about "Too early to run Build script" or something. For
-good measure, of course, test both the F<Makefile.PL> and the
+For good measure, of course, test both the F<Makefile.PL> and the
F<Build.PL> before shipping.
=item 3.
Modified: trunk/libmodule-build-perl/lib/Module/Build/Config.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmodule-build-perl/lib/Module/Build/Config.pm?rev=34862&op=diff
==============================================================================
--- trunk/libmodule-build-perl/lib/Module/Build/Config.pm (original)
+++ trunk/libmodule-build-perl/lib/Module/Build/Config.pm Wed May 6 05:40:16 2009
@@ -2,7 +2,7 @@
use strict;
use vars qw($VERSION);
-$VERSION = '0.32';
+$VERSION = '0.33';
$VERSION = eval $VERSION;
use Config;
Modified: trunk/libmodule-build-perl/lib/Module/Build/Cookbook.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmodule-build-perl/lib/Module/Build/Cookbook.pm?rev=34862&op=diff
==============================================================================
--- trunk/libmodule-build-perl/lib/Module/Build/Cookbook.pm (original)
+++ trunk/libmodule-build-perl/lib/Module/Build/Cookbook.pm Wed May 6 05:40:16 2009
@@ -1,7 +1,7 @@
package Module::Build::Cookbook;
use strict;
use vars qw($VERSION);
-$VERSION = '0.32';
+$VERSION = '0.33';
=head1 NAME
Modified: trunk/libmodule-build-perl/lib/Module/Build/Dumper.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmodule-build-perl/lib/Module/Build/Dumper.pm?rev=34862&op=diff
==============================================================================
--- trunk/libmodule-build-perl/lib/Module/Build/Dumper.pm (original)
+++ trunk/libmodule-build-perl/lib/Module/Build/Dumper.pm Wed May 6 05:40:16 2009
@@ -1,7 +1,7 @@
package Module::Build::Dumper;
use strict;
use vars qw($VERSION);
-$VERSION = '0.32';
+$VERSION = '0.33';
# This is just a split-out of a wrapper function to do Data::Dumper
# stuff "the right way". See:
Modified: trunk/libmodule-build-perl/lib/Module/Build/ModuleInfo.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmodule-build-perl/lib/Module/Build/ModuleInfo.pm?rev=34862&op=diff
==============================================================================
--- trunk/libmodule-build-perl/lib/Module/Build/ModuleInfo.pm (original)
+++ trunk/libmodule-build-perl/lib/Module/Build/ModuleInfo.pm Wed May 6 05:40:16 2009
@@ -8,7 +8,7 @@
use strict;
use vars qw($VERSION);
-$VERSION = '0.32';
+$VERSION = '0.33';
$VERSION = eval $VERSION;
use File::Spec;
Modified: trunk/libmodule-build-perl/lib/Module/Build/Notes.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmodule-build-perl/lib/Module/Build/Notes.pm?rev=34862&op=diff
==============================================================================
--- trunk/libmodule-build-perl/lib/Module/Build/Notes.pm (original)
+++ trunk/libmodule-build-perl/lib/Module/Build/Notes.pm Wed May 6 05:40:16 2009
@@ -4,7 +4,7 @@
use strict;
use vars qw($VERSION);
-$VERSION = '0.32';
+$VERSION = '0.33';
$VERSION = eval $VERSION;
use Data::Dumper;
use IO::File;
Modified: trunk/libmodule-build-perl/lib/Module/Build/PPMMaker.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmodule-build-perl/lib/Module/Build/PPMMaker.pm?rev=34862&op=diff
==============================================================================
--- trunk/libmodule-build-perl/lib/Module/Build/PPMMaker.pm (original)
+++ trunk/libmodule-build-perl/lib/Module/Build/PPMMaker.pm Wed May 6 05:40:16 2009
@@ -2,7 +2,7 @@
use strict;
use vars qw($VERSION);
-$VERSION = '0.32';
+$VERSION = '0.33';
$VERSION = eval $VERSION;
# This code is mostly borrowed from ExtUtils::MM_Unix 6.10_03, with a
@@ -130,8 +130,10 @@
my ($self, $config) = @_;
my $varchname = $config->{archname};
# Append "-5.8" to architecture name for Perl 5.8 and later
- if (defined($^V) && ord(substr($^V,1)) >= 8) {
- $varchname .= sprintf("-%d.%d", ord($^V), ord(substr($^V,1)));
+ if ($] >= 5.008) {
+ my $vstring = sprintf "%vd", $^V;
+ $vstring =~ s/\.\d+$//;
+ $varchname .= "-$vstring";
}
return $varchname;
}
Modified: trunk/libmodule-build-perl/lib/Module/Build/Platform/Amiga.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmodule-build-perl/lib/Module/Build/Platform/Amiga.pm?rev=34862&op=diff
==============================================================================
--- trunk/libmodule-build-perl/lib/Module/Build/Platform/Amiga.pm (original)
+++ trunk/libmodule-build-perl/lib/Module/Build/Platform/Amiga.pm Wed May 6 05:40:16 2009
@@ -2,7 +2,7 @@
use strict;
use vars qw($VERSION);
-$VERSION = '0.32';
+$VERSION = '0.33';
$VERSION = eval $VERSION;
use Module::Build::Base;
Modified: trunk/libmodule-build-perl/lib/Module/Build/Platform/Default.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmodule-build-perl/lib/Module/Build/Platform/Default.pm?rev=34862&op=diff
==============================================================================
--- trunk/libmodule-build-perl/lib/Module/Build/Platform/Default.pm (original)
+++ trunk/libmodule-build-perl/lib/Module/Build/Platform/Default.pm Wed May 6 05:40:16 2009
@@ -2,7 +2,7 @@
use strict;
use vars qw($VERSION);
-$VERSION = '0.32';
+$VERSION = '0.33';
$VERSION = eval $VERSION;
use Module::Build::Base;
Modified: trunk/libmodule-build-perl/lib/Module/Build/Platform/EBCDIC.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmodule-build-perl/lib/Module/Build/Platform/EBCDIC.pm?rev=34862&op=diff
==============================================================================
--- trunk/libmodule-build-perl/lib/Module/Build/Platform/EBCDIC.pm (original)
+++ trunk/libmodule-build-perl/lib/Module/Build/Platform/EBCDIC.pm Wed May 6 05:40:16 2009
@@ -2,7 +2,7 @@
use strict;
use vars qw($VERSION);
-$VERSION = '0.32';
+$VERSION = '0.33';
$VERSION = eval $VERSION;
use Module::Build::Base;
Modified: trunk/libmodule-build-perl/lib/Module/Build/Platform/MPEiX.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmodule-build-perl/lib/Module/Build/Platform/MPEiX.pm?rev=34862&op=diff
==============================================================================
--- trunk/libmodule-build-perl/lib/Module/Build/Platform/MPEiX.pm (original)
+++ trunk/libmodule-build-perl/lib/Module/Build/Platform/MPEiX.pm Wed May 6 05:40:16 2009
@@ -2,7 +2,7 @@
use strict;
use vars qw($VERSION);
-$VERSION = '0.32';
+$VERSION = '0.33';
$VERSION = eval $VERSION;
use Module::Build::Base;
Modified: trunk/libmodule-build-perl/lib/Module/Build/Platform/MacOS.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmodule-build-perl/lib/Module/Build/Platform/MacOS.pm?rev=34862&op=diff
==============================================================================
--- trunk/libmodule-build-perl/lib/Module/Build/Platform/MacOS.pm (original)
+++ trunk/libmodule-build-perl/lib/Module/Build/Platform/MacOS.pm Wed May 6 05:40:16 2009
@@ -2,7 +2,7 @@
use strict;
use vars qw($VERSION);
-$VERSION = '0.32';
+$VERSION = '0.33';
$VERSION = eval $VERSION;
use Module::Build::Base;
use vars qw(@ISA);
Modified: trunk/libmodule-build-perl/lib/Module/Build/Platform/RiscOS.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmodule-build-perl/lib/Module/Build/Platform/RiscOS.pm?rev=34862&op=diff
==============================================================================
--- trunk/libmodule-build-perl/lib/Module/Build/Platform/RiscOS.pm (original)
+++ trunk/libmodule-build-perl/lib/Module/Build/Platform/RiscOS.pm Wed May 6 05:40:16 2009
@@ -2,7 +2,7 @@
use strict;
use vars qw($VERSION);
-$VERSION = '0.32';
+$VERSION = '0.33';
$VERSION = eval $VERSION;
use Module::Build::Base;
Modified: trunk/libmodule-build-perl/lib/Module/Build/Platform/Unix.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmodule-build-perl/lib/Module/Build/Platform/Unix.pm?rev=34862&op=diff
==============================================================================
--- trunk/libmodule-build-perl/lib/Module/Build/Platform/Unix.pm (original)
+++ trunk/libmodule-build-perl/lib/Module/Build/Platform/Unix.pm Wed May 6 05:40:16 2009
@@ -2,19 +2,12 @@
use strict;
use vars qw($VERSION);
-$VERSION = '0.32';
+$VERSION = '0.33';
$VERSION = eval $VERSION;
use Module::Build::Base;
use vars qw(@ISA);
@ISA = qw(Module::Build::Base);
-
-sub make_tarball {
- my $self = shift;
- $self->{args}{tar} ||= ['tar'];
- $self->{args}{gzip} ||= ['gzip'];
- $self->SUPER::make_tarball(@_);
-}
sub is_executable {
# We consider the owner bit to be authoritative on a file, because
Modified: trunk/libmodule-build-perl/lib/Module/Build/Platform/VMS.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmodule-build-perl/lib/Module/Build/Platform/VMS.pm?rev=34862&op=diff
==============================================================================
--- trunk/libmodule-build-perl/lib/Module/Build/Platform/VMS.pm (original)
+++ trunk/libmodule-build-perl/lib/Module/Build/Platform/VMS.pm Wed May 6 05:40:16 2009
@@ -2,7 +2,7 @@
use strict;
use vars qw($VERSION);
-$VERSION = '0.32';
+$VERSION = '0.33';
$VERSION = eval $VERSION;
use Module::Build::Base;
Modified: trunk/libmodule-build-perl/lib/Module/Build/Platform/VOS.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmodule-build-perl/lib/Module/Build/Platform/VOS.pm?rev=34862&op=diff
==============================================================================
--- trunk/libmodule-build-perl/lib/Module/Build/Platform/VOS.pm (original)
+++ trunk/libmodule-build-perl/lib/Module/Build/Platform/VOS.pm Wed May 6 05:40:16 2009
@@ -2,7 +2,7 @@
use strict;
use vars qw($VERSION);
-$VERSION = '0.32';
+$VERSION = '0.33';
$VERSION = eval $VERSION;
use Module::Build::Base;
Modified: trunk/libmodule-build-perl/lib/Module/Build/Platform/Windows.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmodule-build-perl/lib/Module/Build/Platform/Windows.pm?rev=34862&op=diff
==============================================================================
--- trunk/libmodule-build-perl/lib/Module/Build/Platform/Windows.pm (original)
+++ trunk/libmodule-build-perl/lib/Module/Build/Platform/Windows.pm Wed May 6 05:40:16 2009
@@ -2,7 +2,7 @@
use strict;
use vars qw($VERSION);
-$VERSION = '0.32';
+$VERSION = '0.33';
$VERSION = eval $VERSION;
use Config;
Modified: trunk/libmodule-build-perl/lib/Module/Build/Platform/aix.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmodule-build-perl/lib/Module/Build/Platform/aix.pm?rev=34862&op=diff
==============================================================================
--- trunk/libmodule-build-perl/lib/Module/Build/Platform/aix.pm (original)
+++ trunk/libmodule-build-perl/lib/Module/Build/Platform/aix.pm Wed May 6 05:40:16 2009
@@ -2,7 +2,7 @@
use strict;
use vars qw($VERSION);
-$VERSION = '0.32';
+$VERSION = '0.33';
$VERSION = eval $VERSION;
use Module::Build::Platform::Unix;
Modified: trunk/libmodule-build-perl/lib/Module/Build/Platform/cygwin.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmodule-build-perl/lib/Module/Build/Platform/cygwin.pm?rev=34862&op=diff
==============================================================================
--- trunk/libmodule-build-perl/lib/Module/Build/Platform/cygwin.pm (original)
+++ trunk/libmodule-build-perl/lib/Module/Build/Platform/cygwin.pm Wed May 6 05:40:16 2009
@@ -2,7 +2,7 @@
use strict;
use vars qw($VERSION);
-$VERSION = '0.32';
+$VERSION = '0.33';
$VERSION = eval $VERSION;
use Module::Build::Platform::Unix;
Modified: trunk/libmodule-build-perl/lib/Module/Build/Platform/darwin.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmodule-build-perl/lib/Module/Build/Platform/darwin.pm?rev=34862&op=diff
==============================================================================
--- trunk/libmodule-build-perl/lib/Module/Build/Platform/darwin.pm (original)
+++ trunk/libmodule-build-perl/lib/Module/Build/Platform/darwin.pm Wed May 6 05:40:16 2009
@@ -2,7 +2,7 @@
use strict;
use vars qw($VERSION);
-$VERSION = '0.32';
+$VERSION = '0.33';
$VERSION = eval $VERSION;
use Module::Build::Platform::Unix;
Modified: trunk/libmodule-build-perl/lib/Module/Build/Platform/os2.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmodule-build-perl/lib/Module/Build/Platform/os2.pm?rev=34862&op=diff
==============================================================================
--- trunk/libmodule-build-perl/lib/Module/Build/Platform/os2.pm (original)
+++ trunk/libmodule-build-perl/lib/Module/Build/Platform/os2.pm Wed May 6 05:40:16 2009
@@ -2,7 +2,7 @@
use strict;
use vars qw($VERSION);
-$VERSION = '0.32';
+$VERSION = '0.33';
$VERSION = eval $VERSION;
use Module::Build::Platform::Unix;
Modified: trunk/libmodule-build-perl/lib/Module/Build/PodParser.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmodule-build-perl/lib/Module/Build/PodParser.pm?rev=34862&op=diff
==============================================================================
--- trunk/libmodule-build-perl/lib/Module/Build/PodParser.pm (original)
+++ trunk/libmodule-build-perl/lib/Module/Build/PodParser.pm Wed May 6 05:40:16 2009
@@ -2,7 +2,7 @@
use strict;
use vars qw($VERSION);
-$VERSION = '0.32';
+$VERSION = '0.33';
$VERSION = eval $VERSION;
use vars qw(@ISA);
Modified: trunk/libmodule-build-perl/t/compat.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmodule-build-perl/t/compat.t?rev=34862&op=diff
==============================================================================
--- trunk/libmodule-build-perl/t/compat.t (original)
+++ trunk/libmodule-build-perl/t/compat.t Wed May 6 05:40:16 2009
@@ -369,17 +369,17 @@
my $expected = shift;
SKIP: {
- skip "$makefile not found", 1 unless -e $makefile;
- my $pl_files = find_params_in_makefile()->{PL_FILES} || {};
- is_deeply $pl_files, $expected,
- "$makefile has correct PL_FILES line";
+ skip 1, 'Makefile.PL not found' unless -e 'Makefile.PL';
+ my $args = extract_writemakefile_args() || {};
+ is_deeply $args->{PL_FILES}, $expected,
+ "Makefile.PL has correct PL_FILES line";
}
}
sub test_makefile_pl_requires_perl {
my $perl_version = shift || q{};
SKIP: {
- skip 'Makefile.PL not found', 1 unless -e 'Makefile.PL';
+ skip 1, 'Makefile.PL not found' unless -e 'Makefile.PL';
my $file_contents = slurp 'Makefile.PL';
my $found_requires = $file_contents =~ m{^require $perl_version;}ms;
if (length $perl_version) {
@@ -417,3 +417,16 @@
return \%params;
}
+
+sub extract_writemakefile_args {
+ SKIP: {
+ skip 1, 'Makefile.PL not found' unless -e 'Makefile.PL';
+ my $file_contents = slurp 'Makefile.PL';
+ my ($args) = $file_contents =~ m{^WriteMakefile\n\((.*)\).*;}ms;
+ ok $args, "Found WriteMakefile arguments"
+ or diag "Makefile.PL:\n$file_contents";
+ my %args = eval $args or diag $args; ## no critic
+ return \%args;
+ }
+}
+
Modified: trunk/libmodule-build-perl/t/ext.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmodule-build-perl/t/ext.t?rev=34862&op=diff
==============================================================================
--- trunk/libmodule-build-perl/t/ext.t (original)
+++ trunk/libmodule-build-perl/t/ext.t Wed May 6 05:40:16 2009
@@ -129,7 +129,7 @@
my @data = map values(%$_), @unix_splits, @win_splits;
for my $d (@data) {
- chomp(my $out = Module::Build->_backticks('perl', '-le', 'print join " ", map "{$_}", @ARGV', @$d));
+ chomp(my $out = Module::Build->_backticks($^X, '-le', 'print join " ", map "{$_}", @ARGV', @$d));
is($out, join(' ', map "{$_}", @$d), "backticks round trip for ".join('',map "{$_}", @$d));
}
}
@@ -137,6 +137,12 @@
{
# Make sure run_perl_script() propagates @INC
my $dir = MBTest->tmpdir;
+ if ($^O eq 'VMS') {
+ # VMS can store INC paths in Unix format with out the trailing
+ # directory delimiter.
+ $dir = VMS::Filespec::unixify($dir);
+ $dir =~ s#/$##;
+ }
local @INC = ($dir, @INC);
my $output = stdout_of( sub { Module::Build->run_perl_script('-le', [], ['print for @INC']) } );
like $output, qr{^\Q$dir\E}m;
More information about the Pkg-perl-cvs-commits
mailing list