r56944 - in /trunk/libclass-accessor-grouped-perl: ./ debian/ debian/source/ inc/Module/ inc/Module/Install/ lib/Class/Accessor/
ansgar-guest at users.alioth.debian.org
ansgar-guest at users.alioth.debian.org
Mon Apr 26 07:54:41 UTC 2010
Author: ansgar-guest
Date: Mon Apr 26 07:53:33 2010
New Revision: 56944
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=56944
Log:
* New upstream release.
* Recommend libclass-xsaccessor-perl.
* Add build-dependency on libclass-xsaccessor-perl to use Class::XSAccessor
during tests.
* Use source format 3.0 (quilt).
* debian/copyright: Formatting changes for current DEP-5 proposal.
* debian/copyright: Update years of copyright.
Added:
trunk/libclass-accessor-grouped-perl/debian/source/
trunk/libclass-accessor-grouped-perl/debian/source/format
Modified:
trunk/libclass-accessor-grouped-perl/Changes
trunk/libclass-accessor-grouped-perl/META.yml
trunk/libclass-accessor-grouped-perl/Makefile.PL
trunk/libclass-accessor-grouped-perl/README
trunk/libclass-accessor-grouped-perl/debian/changelog
trunk/libclass-accessor-grouped-perl/debian/control
trunk/libclass-accessor-grouped-perl/debian/copyright
trunk/libclass-accessor-grouped-perl/inc/Module/AutoInstall.pm
trunk/libclass-accessor-grouped-perl/inc/Module/Install.pm
trunk/libclass-accessor-grouped-perl/inc/Module/Install/AutoInstall.pm
trunk/libclass-accessor-grouped-perl/inc/Module/Install/Base.pm
trunk/libclass-accessor-grouped-perl/inc/Module/Install/Can.pm
trunk/libclass-accessor-grouped-perl/inc/Module/Install/Fetch.pm
trunk/libclass-accessor-grouped-perl/inc/Module/Install/Include.pm
trunk/libclass-accessor-grouped-perl/inc/Module/Install/Makefile.pm
trunk/libclass-accessor-grouped-perl/inc/Module/Install/Metadata.pm
trunk/libclass-accessor-grouped-perl/inc/Module/Install/Win32.pm
trunk/libclass-accessor-grouped-perl/inc/Module/Install/WriteAll.pm
trunk/libclass-accessor-grouped-perl/lib/Class/Accessor/Grouped.pm
Modified: trunk/libclass-accessor-grouped-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libclass-accessor-grouped-perl/Changes?rev=56944&op=diff
==============================================================================
--- trunk/libclass-accessor-grouped-perl/Changes (original)
+++ trunk/libclass-accessor-grouped-perl/Changes Mon Apr 26 07:53:33 2010
@@ -1,4 +1,8 @@
Revision history for Class::Accessor::Grouped.
+
+0.09003 Fri Apr 23 23:00:19 2010
+ - use Class::XSAccessor if available for 'simple' accessors, except on
+ MSWin32, with documentation
0.09002 Tue Oct 20 23:16:28 2009
- removing Class::XSAccessor usage for now
Modified: trunk/libclass-accessor-grouped-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libclass-accessor-grouped-perl/META.yml?rev=56944&op=diff
==============================================================================
--- trunk/libclass-accessor-grouped-perl/META.yml (original)
+++ trunk/libclass-accessor-grouped-perl/META.yml Mon Apr 26 07:53:33 2010
@@ -8,7 +8,7 @@
configure_requires:
ExtUtils::MakeMaker: 6.42
distribution_type: module
-generated_by: 'Module::Install version 0.91'
+generated_by: 'Module::Install version 0.94'
license: perl
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.4.html
@@ -21,7 +21,7 @@
provides:
Class::Accessor::Grouped:
file: lib/Class/Accessor/Grouped.pm
- version: 0.09002
+ version: 0.09003
requires:
Carp: 0
Class::Inspector: 0
@@ -32,4 +32,4 @@
resources:
license: http://dev.perl.org/licenses/
repository: http://dev.catalyst.perl.org/repos/bast/trunk/Class-Accessor-Grouped/
-version: 0.09002
+version: 0.09003
Modified: trunk/libclass-accessor-grouped-perl/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libclass-accessor-grouped-perl/Makefile.PL?rev=56944&op=diff
==============================================================================
--- trunk/libclass-accessor-grouped-perl/Makefile.PL (original)
+++ trunk/libclass-accessor-grouped-perl/Makefile.PL Mon Apr 26 07:53:33 2010
@@ -25,6 +25,8 @@
system('pod2text lib/Class/Accessor/Grouped.pm > README');
}
+realclean_files 'README';
+
auto_provides;
auto_install;
Modified: trunk/libclass-accessor-grouped-perl/README
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libclass-accessor-grouped-perl/README?rev=56944&op=diff
==============================================================================
--- trunk/libclass-accessor-grouped-perl/README (original)
+++ trunk/libclass-accessor-grouped-perl/README Mon Apr 26 07:53:33 2010
@@ -128,6 +128,14 @@
Returns a list of 'parent' or 'super' class names that the current class
inherited from.
+Performance
+ You can speed up accessors of type 'simple' by installing
+ Class::XSAccessor. Note however that the use of this module is disabled
+ by default on Win32 systems, as it causes yet unresolved segfaults. If
+ you are a Win32 user, and want to try this module with
+ Class::XSAccessor, set $Class::Accessor::Grouped::hasXS to a true value
+ before registering your accessors (e.g. in a "BEGIN" block)
+
AUTHORS
Matt S. Trout <mst at shadowcatsystems.co.uk> Christopher H. Laco
<claco at chrislaco.com>
@@ -137,7 +145,7 @@
Guillermo Roditi <groditi at cpan.org>
COPYRIGHT & LICENSE
- Copyright (c) 2006-2009 Matt S. Trout <mst at shadowcatsystems.co.uk>
+ Copyright (c) 2006-2010 Matt S. Trout <mst at shadowcatsystems.co.uk>
This program is free software; you can redistribute it and/or modify it
under the same terms as perl itself.
Modified: trunk/libclass-accessor-grouped-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libclass-accessor-grouped-perl/debian/changelog?rev=56944&op=diff
==============================================================================
--- trunk/libclass-accessor-grouped-perl/debian/changelog (original)
+++ trunk/libclass-accessor-grouped-perl/debian/changelog Mon Apr 26 07:53:33 2010
@@ -1,3 +1,15 @@
+libclass-accessor-grouped-perl (0.09003-1) unstable; urgency=low
+
+ * New upstream release.
+ * Recommend libclass-xsaccessor-perl.
+ * Add build-dependency on libclass-xsaccessor-perl to use Class::XSAccessor
+ during tests.
+ * Use source format 3.0 (quilt).
+ * debian/copyright: Formatting changes for current DEP-5 proposal.
+ * debian/copyright: Update years of copyright.
+
+ -- Ansgar Burchardt <ansgar at 43-1.org> Mon, 26 Apr 2010 16:53:15 +0900
+
libclass-accessor-grouped-perl (0.09002-1) unstable; urgency=low
[ Jonathan Yu ]
Modified: trunk/libclass-accessor-grouped-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libclass-accessor-grouped-perl/debian/control?rev=56944&op=diff
==============================================================================
--- trunk/libclass-accessor-grouped-perl/debian/control (original)
+++ trunk/libclass-accessor-grouped-perl/debian/control Mon Apr 26 07:53:33 2010
@@ -1,10 +1,10 @@
Source: libclass-accessor-grouped-perl
Section: perl
Priority: optional
-Build-Depends: debhelper (>= 7.0.50)
+Build-Depends: debhelper (>= 7.0.50~)
Build-Depends-Indep: perl, libclass-inspector-perl, libtest-pod-coverage-perl,
libtest-pod-perl, libmro-compat-perl, libsub-name-perl (>= 0.04), libsub-identify-perl,
- libtest-strict-perl
+ libtest-strict-perl, libclass-xsaccessor-perl
Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
Uploaders: Krzysztof Krzyżaniak (eloy) <eloy at debian.org>,
Ansgar Burchardt <ansgar at 43-1.org>, Jonathan Yu <jawnsy at cpan.org>,
@@ -18,6 +18,7 @@
Architecture: all
Depends: ${perl:Depends}, ${misc:Depends}, libclass-inspector-perl,
libmro-compat-perl, libsub-name-perl (>= 0.04)
+Recommends: libclass-xsaccessor-perl
Description: Perl module to build groups of accessors
Class::Accessor::Grouped lets you build groups of accessors that will call
different getters and setters.
Modified: trunk/libclass-accessor-grouped-perl/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libclass-accessor-grouped-perl/debian/copyright?rev=56944&op=diff
==============================================================================
--- trunk/libclass-accessor-grouped-perl/debian/copyright (original)
+++ trunk/libclass-accessor-grouped-perl/debian/copyright Mon Apr 26 07:53:33 2010
@@ -1,28 +1,24 @@
-Format-Specification:
- http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=196
-Upstream-Maintainer: Rafael Kitover <rkitover at io.com>
-Upstream-Source: http://search.cpan.org/dist/Class-Accessor-Grouped/
-Upstream-Name: Class-Accessor-Grouped
+Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
+Maintainer: Rafael Kitover <rkitover at io.com>
+Source: http://search.cpan.org/dist/Class-Accessor-Grouped/
+Name: Class-Accessor-Grouped
-Files: *
-Copyright: 2006-2009 Matt S. Trout <mst at shadowcatsystems.co.uk>
-License-Alias: Perl
-License: GPL-1+ | Artistic
+Copyright: 2006-2010, Matt S. Trout <mst at shadowcatsystems.co.uk>
+License: GPL-1+ or Artistic
Files: debian/*
Copyright: 2009, Jonathan Yu <jawnsy at cpan.org>
2007-2009, Krzysztof Krzyzaniak (eloy) <eloy at debian.org>
- 2008, Ansgar Burchardt <ansgar at 43-1.org>
+ 2008-2010, Ansgar Burchardt <ansgar at 43-1.org>
2008, Roberto C. Sanchez <roberto at debian.org>
2007-2010, gregor herrmann <gregoa at debian.org>
-License: GPL-1+ | Artistic
+License: GPL-1+ or Artistic
Files: inc/Module/*
-Copyright: 2002-2009, Adam Kennedy <adamk at cpan.org>
- 2002-2009, Audrey Tang <autrijus at autrijus.org>
- 2002-2009, Brian Ingerson <ingy at cpan.org>
-License-Alias: Perl
-License: Artistic | GPL-1+
+Copyright: 2002-2010, Adam Kennedy <adamk at cpan.org>
+ 2002-2010, Audrey Tang <autrijus at autrijus.org>
+ 2002-2010, Brian Ingerson <ingy at cpan.org>
+License: Artistic or GPL-1+
License: Artistic
This program is free software; you can redistribute it and/or modify
Added: trunk/libclass-accessor-grouped-perl/debian/source/format
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libclass-accessor-grouped-perl/debian/source/format?rev=56944&op=file
==============================================================================
--- trunk/libclass-accessor-grouped-perl/debian/source/format (added)
+++ trunk/libclass-accessor-grouped-perl/debian/source/format Mon Apr 26 07:53:33 2010
@@ -1,0 +1,1 @@
+3.0 (quilt)
Modified: trunk/libclass-accessor-grouped-perl/inc/Module/AutoInstall.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libclass-accessor-grouped-perl/inc/Module/AutoInstall.pm?rev=56944&op=diff
==============================================================================
--- trunk/libclass-accessor-grouped-perl/inc/Module/AutoInstall.pm (original)
+++ trunk/libclass-accessor-grouped-perl/inc/Module/AutoInstall.pm Mon Apr 26 07:53:33 2010
@@ -672,7 +672,20 @@
sub _load_cpan {
return if $CPAN::VERSION and $CPAN::Config and not @_;
require CPAN;
- if ( $CPAN::HandleConfig::VERSION ) {
+
+ # CPAN-1.82+ adds CPAN::Config::AUTOLOAD to redirect to
+ # CPAN::HandleConfig->load. CPAN reports that the redirection
+ # is deprecated in a warning printed at the user.
+
+ # CPAN-1.81 expects CPAN::HandleConfig->load, does not have
+ # $CPAN::HandleConfig::VERSION but cannot handle
+ # CPAN::Config->load
+
+ # Which "versions expect CPAN::Config->load?
+
+ if ( $CPAN::HandleConfig::VERSION
+ || CPAN::HandleConfig->can('load')
+ ) {
# Newer versions of CPAN have a HandleConfig module
CPAN::HandleConfig->load;
} else {
@@ -802,4 +815,4 @@
__END__
-#line 1056
+#line 1069
Modified: trunk/libclass-accessor-grouped-perl/inc/Module/Install.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libclass-accessor-grouped-perl/inc/Module/Install.pm?rev=56944&op=diff
==============================================================================
--- trunk/libclass-accessor-grouped-perl/inc/Module/Install.pm (original)
+++ trunk/libclass-accessor-grouped-perl/inc/Module/Install.pm Mon Apr 26 07:53:33 2010
@@ -28,7 +28,7 @@
# This is not enforced yet, but will be some time in the next few
# releases once we can make sure it won't clash with custom
# Module::Install extensions.
- $VERSION = '0.91';
+ $VERSION = '0.94';
# Storage for the pseudo-singleton
$MAIN = undef;
@@ -348,17 +348,24 @@
return $call;
}
+# Done in evals to avoid confusing Perl::MinimumVersion
+eval( $] >= 5.006 ? <<'END_NEW' : <<'END_OLD' ); die $@ if $@;
sub _read {
local *FH;
- if ( $] >= 5.006 ) {
- open( FH, '<', $_[0] ) or die "open($_[0]): $!";
- } else {
- open( FH, "< $_[0]" ) or die "open($_[0]): $!";
- }
+ open( FH, '<', $_[0] ) or die "open($_[0]): $!";
my $string = do { local $/; <FH> };
close FH or die "close($_[0]): $!";
return $string;
}
+END_NEW
+sub _read {
+ local *FH;
+ open( FH, "< $_[0]" ) or die "open($_[0]): $!";
+ my $string = do { local $/; <FH> };
+ close FH or die "close($_[0]): $!";
+ return $string;
+}
+END_OLD
sub _readperl {
my $string = Module::Install::_read($_[0]);
@@ -379,18 +386,26 @@
return $string;
}
+# Done in evals to avoid confusing Perl::MinimumVersion
+eval( $] >= 5.006 ? <<'END_NEW' : <<'END_OLD' ); die $@ if $@;
sub _write {
local *FH;
- if ( $] >= 5.006 ) {
- open( FH, '>', $_[0] ) or die "open($_[0]): $!";
- } else {
- open( FH, "> $_[0]" ) or die "open($_[0]): $!";
- }
+ open( FH, '>', $_[0] ) or die "open($_[0]): $!";
foreach ( 1 .. $#_ ) {
print FH $_[$_] or die "print($_[0]): $!";
}
close FH or die "close($_[0]): $!";
}
+END_NEW
+sub _write {
+ local *FH;
+ open( FH, "> $_[0]" ) or die "open($_[0]): $!";
+ foreach ( 1 .. $#_ ) {
+ print FH $_[$_] or die "print($_[0]): $!";
+ }
+ close FH or die "close($_[0]): $!";
+}
+END_OLD
# _version is for processing module versions (eg, 1.03_05) not
# Perl versions (eg, 5.8.1).
@@ -427,4 +442,4 @@
1;
-# Copyright 2008 - 2009 Adam Kennedy.
+# Copyright 2008 - 2010 Adam Kennedy.
Modified: trunk/libclass-accessor-grouped-perl/inc/Module/Install/AutoInstall.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libclass-accessor-grouped-perl/inc/Module/Install/AutoInstall.pm?rev=56944&op=diff
==============================================================================
--- trunk/libclass-accessor-grouped-perl/inc/Module/Install/AutoInstall.pm (original)
+++ trunk/libclass-accessor-grouped-perl/inc/Module/Install/AutoInstall.pm Mon Apr 26 07:53:33 2010
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '0.91';
+ $VERSION = '0.94';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
Modified: trunk/libclass-accessor-grouped-perl/inc/Module/Install/Base.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libclass-accessor-grouped-perl/inc/Module/Install/Base.pm?rev=56944&op=diff
==============================================================================
--- trunk/libclass-accessor-grouped-perl/inc/Module/Install/Base.pm (original)
+++ trunk/libclass-accessor-grouped-perl/inc/Module/Install/Base.pm Mon Apr 26 07:53:33 2010
@@ -4,7 +4,7 @@
use strict 'vars';
use vars qw{$VERSION};
BEGIN {
- $VERSION = '0.91';
+ $VERSION = '0.94';
}
# Suspend handler for "redefined" warnings
Modified: trunk/libclass-accessor-grouped-perl/inc/Module/Install/Can.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libclass-accessor-grouped-perl/inc/Module/Install/Can.pm?rev=56944&op=diff
==============================================================================
--- trunk/libclass-accessor-grouped-perl/inc/Module/Install/Can.pm (original)
+++ trunk/libclass-accessor-grouped-perl/inc/Module/Install/Can.pm Mon Apr 26 07:53:33 2010
@@ -9,7 +9,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '0.91';
+ $VERSION = '0.94';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
Modified: trunk/libclass-accessor-grouped-perl/inc/Module/Install/Fetch.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libclass-accessor-grouped-perl/inc/Module/Install/Fetch.pm?rev=56944&op=diff
==============================================================================
--- trunk/libclass-accessor-grouped-perl/inc/Module/Install/Fetch.pm (original)
+++ trunk/libclass-accessor-grouped-perl/inc/Module/Install/Fetch.pm Mon Apr 26 07:53:33 2010
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '0.91';
+ $VERSION = '0.94';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
Modified: trunk/libclass-accessor-grouped-perl/inc/Module/Install/Include.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libclass-accessor-grouped-perl/inc/Module/Install/Include.pm?rev=56944&op=diff
==============================================================================
--- trunk/libclass-accessor-grouped-perl/inc/Module/Install/Include.pm (original)
+++ trunk/libclass-accessor-grouped-perl/inc/Module/Install/Include.pm Mon Apr 26 07:53:33 2010
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '0.91';
+ $VERSION = '0.94';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
Modified: trunk/libclass-accessor-grouped-perl/inc/Module/Install/Makefile.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libclass-accessor-grouped-perl/inc/Module/Install/Makefile.pm?rev=56944&op=diff
==============================================================================
--- trunk/libclass-accessor-grouped-perl/inc/Module/Install/Makefile.pm (original)
+++ trunk/libclass-accessor-grouped-perl/inc/Module/Install/Makefile.pm Mon Apr 26 07:53:33 2010
@@ -7,7 +7,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '0.91';
+ $VERSION = '0.94';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
@@ -34,6 +34,17 @@
}
}
+# Store a cleaned up version of the MakeMaker version,
+# since we need to behave differently in a variety of
+# ways based on the MM version.
+my $makemaker = eval $ExtUtils::MakeMaker::VERSION;
+
+# If we are passed a param, do a "newer than" comparison.
+# Otherwise, just return the MakeMaker version.
+sub makemaker {
+ ( @_ < 2 or $makemaker >= eval($_[1]) ) ? $makemaker : 0
+}
+
sub makemaker_args {
my $self = shift;
my $args = ( $self->{makemaker_args} ||= {} );
@@ -44,7 +55,7 @@
# For mm args that take multiple space-seperated args,
# append an argument to the current list.
sub makemaker_append {
- my $self = sShift;
+ my $self = shift;
my $name = shift;
my $args = $self->makemaker_args;
$args->{name} = defined $args->{$name}
@@ -107,6 +118,9 @@
%test_dir = ();
require File::Find;
File::Find::find( \&_wanted_t, $dir );
+ if ( -d 'xt' and ($Module::Install::AUTHOR or $ENV{RELEASE_TESTING}) ) {
+ File::Find::find( \&_wanted_t, 'xt' );
+ }
$self->tests( join ' ', map { "$_/*.t" } sort keys %test_dir );
}
@@ -130,12 +144,13 @@
# an underscore, even though its own version may contain one!
# Hence the funny regexp to get rid of it. See RT #35800
# for details.
- $self->build_requires( 'ExtUtils::MakeMaker' => $ExtUtils::MakeMaker::VERSION =~ /^(\d+\.\d+)/ );
- $self->configure_requires( 'ExtUtils::MakeMaker' => $ExtUtils::MakeMaker::VERSION =~ /^(\d+\.\d+)/ );
+ my $v = $ExtUtils::MakeMaker::VERSION =~ /^(\d+\.\d+)/;
+ $self->build_requires( 'ExtUtils::MakeMaker' => $v );
+ $self->configure_requires( 'ExtUtils::MakeMaker' => $v );
} else {
# Allow legacy-compatibility with 5.005 by depending on the
# most recent EU:MM that supported 5.005.
- $self->build_requires( 'ExtUtils::MakeMaker' => 6.42 );
+ $self->build_requires( 'ExtUtils::MakeMaker' => 6.42 );
$self->configure_requires( 'ExtUtils::MakeMaker' => 6.42 );
}
@@ -145,57 +160,87 @@
$args->{NAME} = $self->module_name || $self->name;
$args->{VERSION} = $self->version;
$args->{NAME} =~ s/-/::/g;
+ $DB::single = 1;
if ( $self->tests ) {
- $args->{test} = { TESTS => $self->tests };
+ $args->{test} = {
+ TESTS => $self->tests,
+ };
+ } elsif ( -d 'xt' and ($Module::Install::AUTHOR or $ENV{RELEASE_TESTING}) ) {
+ $args->{test} = {
+ TESTS => join( ' ', map { "$_/*.t" } grep { -d $_ } qw{ t xt } ),
+ };
}
if ( $] >= 5.005 ) {
$args->{ABSTRACT} = $self->abstract;
$args->{AUTHOR} = $self->author;
}
- if ( eval($ExtUtils::MakeMaker::VERSION) >= 6.10 ) {
- $args->{NO_META} = 1;
- }
- if ( eval($ExtUtils::MakeMaker::VERSION) > 6.17 and $self->sign ) {
+ if ( $self->makemaker(6.10) ) {
+ $args->{NO_META} = 1;
+ #$args->{NO_MYMETA} = 1;
+ }
+ if ( $self->makemaker(6.17) and $self->sign ) {
$args->{SIGN} = 1;
}
unless ( $self->is_admin ) {
delete $args->{SIGN};
}
- # Merge both kinds of requires into prereq_pm
my $prereq = ($args->{PREREQ_PM} ||= {});
%$prereq = ( %$prereq,
- map { @$_ }
+ map { @$_ } # flatten [module => version]
map { @$_ }
grep $_,
- ($self->configure_requires, $self->build_requires, $self->requires)
+ ($self->requires)
);
# Remove any reference to perl, PREREQ_PM doesn't support it
delete $args->{PREREQ_PM}->{perl};
- # merge both kinds of requires into prereq_pm
+ # Merge both kinds of requires into BUILD_REQUIRES
+ my $build_prereq = ($args->{BUILD_REQUIRES} ||= {});
+ %$build_prereq = ( %$build_prereq,
+ map { @$_ } # flatten [module => version]
+ map { @$_ }
+ grep $_,
+ ($self->configure_requires, $self->build_requires)
+ );
+
+ # Remove any reference to perl, BUILD_REQUIRES doesn't support it
+ delete $args->{BUILD_REQUIRES}->{perl};
+
+ # Delete bundled dists from prereq_pm
my $subdirs = ($args->{DIR} ||= []);
if ($self->bundles) {
foreach my $bundle (@{ $self->bundles }) {
my ($file, $dir) = @$bundle;
push @$subdirs, $dir if -d $dir;
- delete $prereq->{$file};
+ delete $build_prereq->{$file}; #Delete from build prereqs only
}
+ }
+
+ unless ( $self->makemaker('6.55_03') ) {
+ %$prereq = (%$prereq,%$build_prereq);
+ delete $args->{BUILD_REQUIRES};
}
if ( my $perl_version = $self->perl_version ) {
eval "use $perl_version; 1"
or die "ERROR: perl: Version $] is installed, "
. "but we need version >= $perl_version";
+
+ if ( $self->makemaker(6.48) ) {
+ $args->{MIN_PERL_VERSION} = $perl_version;
+ }
}
$args->{INSTALLDIRS} = $self->installdirs;
- my %args = map { ( $_ => $args->{$_} ) } grep {defined($args->{$_})} keys %$args;
+ my %args = map {
+ ( $_ => $args->{$_} ) } grep {defined($args->{$_} )
+ } keys %$args;
my $user_preop = delete $args{dist}->{PREOP};
- if (my $preop = $self->admin->preop($user_preop)) {
+ if ( my $preop = $self->admin->preop($user_preop) ) {
foreach my $key ( keys %$preop ) {
$args{dist}->{$key} = $preop->{$key};
}
@@ -265,4 +310,4 @@
__END__
-#line 394
+#line 439
Modified: trunk/libclass-accessor-grouped-perl/inc/Module/Install/Metadata.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libclass-accessor-grouped-perl/inc/Module/Install/Metadata.pm?rev=56944&op=diff
==============================================================================
--- trunk/libclass-accessor-grouped-perl/inc/Module/Install/Metadata.pm (original)
+++ trunk/libclass-accessor-grouped-perl/inc/Module/Install/Metadata.pm Mon Apr 26 07:53:33 2010
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '0.91';
+ $VERSION = '0.94';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
@@ -230,6 +230,8 @@
die("The path '$file' does not exist, or is not a file");
}
+ $self->{values}{all_from} = $file;
+
# Some methods pull from POD instead of code.
# If there is a matching .pod, use that instead
my $pod = $file;
@@ -385,11 +387,10 @@
}
}
-sub perl_version_from {
- my $self = shift;
+sub _extract_perl_version {
if (
- Module::Install::_read($_[0]) =~ m/
- ^
+ $_[0] =~ m/
+ ^\s*
(?:use|require) \s*
v?
([\d_\.]+)
@@ -398,6 +399,16 @@
) {
my $perl_version = $1;
$perl_version =~ s{_}{}g;
+ return $perl_version;
+ } else {
+ return;
+ }
+}
+
+sub perl_version_from {
+ my $self = shift;
+ my $perl_version=_extract_perl_version(Module::Install::_read($_[0]));
+ if ($perl_version) {
$self->perl_version($perl_version);
} else {
warn "Cannot determine perl version info from $_[0]\n";
@@ -425,13 +436,12 @@
}
}
-sub license_from {
- my $self = shift;
+sub _extract_license {
if (
- Module::Install::_read($_[0]) =~ m/
+ $_[0] =~ m/
(
=head \d \s+
- (?:licen[cs]e|licensing|copyright|legal)\b
+ (?:licen[cs]e|licensing|copyrights?|legal)\b
.*?
)
(=head\\d.*|=cut.*|)
@@ -439,7 +449,9 @@
/ixms ) {
my $license_text = $1;
my @phrases = (
- 'under the same (?:terms|license) as (?:perl|the perl programming language) itself' => 'perl', 1,
+ 'under the same (?:terms|license) as (?:perl|the perl programming language)' => 'perl', 1,
+ 'under the terms of (?:perl|the perl programming language) itself' => 'perl', 1,
+ 'Artistic and GPL' => 'perl', 1,
'GNU general public license' => 'gpl', 1,
'GNU public license' => 'gpl', 1,
'GNU lesser general public license' => 'lgpl', 1,
@@ -456,20 +468,32 @@
'proprietary' => 'proprietary', 0,
);
while ( my ($pattern, $license, $osi) = splice(@phrases, 0, 3) ) {
- $pattern =~ s{\s+}{\\s+}g;
+ $pattern =~ s#\s+#\\s+#gs;
if ( $license_text =~ /\b$pattern\b/i ) {
- $self->license($license);
- return 1;
+ return $license;
}
}
- }
-
- warn "Cannot determine license info from $_[0]\n";
- return 'unknown';
+ } else {
+ return;
+ }
+}
+
+sub license_from {
+ my $self = shift;
+ if (my $license=_extract_license(Module::Install::_read($_[0]))) {
+ $self->license($license);
+ } else {
+ warn "Cannot determine license info from $_[0]\n";
+ return 'unknown';
+ }
}
sub _extract_bugtracker {
- my @links = $_[0] =~ m#L<(\Qhttp://rt.cpan.org/\E[^>]+)>#g;
+ my @links = $_[0] =~ m#L<(
+ \Qhttp://rt.cpan.org/\E[^>]+|
+ \Qhttp://github.com/\E[\w_]+/[\w_]+/issues|
+ \Qhttp://code.google.com/p/\E[\w_\-]+/issues/list
+ )>#gx;
my %links;
@links{@links}=();
@links=keys %links;
@@ -485,7 +509,7 @@
return 0;
}
if ( @links > 1 ) {
- warn "Found more than on rt.cpan.org link in $_[0]\n";
+ warn "Found more than one bugtracker link in $_[0]\n";
return 0;
}
Modified: trunk/libclass-accessor-grouped-perl/inc/Module/Install/Win32.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libclass-accessor-grouped-perl/inc/Module/Install/Win32.pm?rev=56944&op=diff
==============================================================================
--- trunk/libclass-accessor-grouped-perl/inc/Module/Install/Win32.pm (original)
+++ trunk/libclass-accessor-grouped-perl/inc/Module/Install/Win32.pm Mon Apr 26 07:53:33 2010
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '0.91';
+ $VERSION = '0.94';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
Modified: trunk/libclass-accessor-grouped-perl/inc/Module/Install/WriteAll.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libclass-accessor-grouped-perl/inc/Module/Install/WriteAll.pm?rev=56944&op=diff
==============================================================================
--- trunk/libclass-accessor-grouped-perl/inc/Module/Install/WriteAll.pm (original)
+++ trunk/libclass-accessor-grouped-perl/inc/Module/Install/WriteAll.pm Mon Apr 26 07:53:33 2010
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '0.91';;
+ $VERSION = '0.94';;
@ISA = qw{Module::Install::Base};
$ISCORE = 1;
}
Modified: trunk/libclass-accessor-grouped-perl/lib/Class/Accessor/Grouped.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libclass-accessor-grouped-perl/lib/Class/Accessor/Grouped.pm?rev=56944&op=diff
==============================================================================
--- trunk/libclass-accessor-grouped-perl/lib/Class/Accessor/Grouped.pm (original)
+++ trunk/libclass-accessor-grouped-perl/lib/Class/Accessor/Grouped.pm Mon Apr 26 07:53:33 2010
@@ -7,8 +7,29 @@
use MRO::Compat;
use Sub::Name ();
-our $VERSION = '0.09002';
+our $VERSION = '0.09003';
$VERSION = eval $VERSION;
+
+# Class::XSAccessor is segfaulting on win32, so be careful
+# Win32 users can set $hasXS to try to use it anyway
+
+our $hasXS;
+
+sub _hasXS {
+
+ if (not defined $hasXS) {
+ $hasXS = 0;
+
+ if ($^O ne 'MSWin32') {
+ eval {
+ require Class::XSAccessor;
+ $hasXS = 1;
+ };
+ }
+ }
+
+ return $hasXS;
+}
=head1 NAME
@@ -84,6 +105,7 @@
my $full_alias = join('::', $class, $alias);
if ( $hasXS && $group eq 'simple' ) {
+ require Class::XSAccessor;
Class::XSAccessor::newxs_accessor("${class}::${name}", $field, 0);
Class::XSAccessor::newxs_accessor("${class}::${alias}", $field, 0);
@@ -438,29 +460,16 @@
return @{mro::get_linear_isa($class)};
};
-# This is now a hard, rather than optional dep. Since we dep on Sub::Name, we no
-# longer care about not using XS modules.
-
-# Class::XSAccessor is segfaulting in some places, so removing for now.
-{
- our $hasXS;
-
- sub _hasXS { 0 }
-
-# sub _hasXS {
-# return $hasXS if defined $hasXS;
-#
-# $hasXS = 0;
-# eval {
-# require Class::XSAccessor;
-# $hasXS = 1;
-# };
-#
-# return $hasXS;
-# }
-}
-
1;
+
+=head1 Performance
+
+You can speed up accessors of type 'simple' by installing L<Class::XSAccessor>.
+Note however that the use of this module is disabled by default on Win32
+systems, as it causes yet unresolved segfaults. If you are a Win32 user, and
+want to try this module with L<Class::XSAccessor>, set
+C<$Class::Accessor::Grouped::hasXS> to a true value B<before> registering
+your accessors (e.g. in a C<BEGIN> block)
=head1 AUTHORS
@@ -473,7 +482,7 @@
=head1 COPYRIGHT & LICENSE
-Copyright (c) 2006-2009 Matt S. Trout <mst at shadowcatsystems.co.uk>
+Copyright (c) 2006-2010 Matt S. Trout <mst at shadowcatsystems.co.uk>
This program is free software; you can redistribute it and/or modify
it under the same terms as perl itself.
More information about the Pkg-perl-cvs-commits
mailing list