r26234 - in /branches/upstream/libmodule-scandeps-perl/current: ./ inc/Module/ inc/Module/Install/ lib/Module/ script/ t/
ansgar-guest at users.alioth.debian.org
ansgar-guest at users.alioth.debian.org
Sat Oct 25 16:40:47 UTC 2008
Author: ansgar-guest
Date: Sat Oct 25 16:40:44 2008
New Revision: 26234
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=26234
Log:
[svn-upgrade] Integrating new upstream version, libmodule-scandeps-perl (0.86)
Added:
branches/upstream/libmodule-scandeps-perl/current/t/13-static_prefork_test.t
Modified:
branches/upstream/libmodule-scandeps-perl/current/AUTHORS
branches/upstream/libmodule-scandeps-perl/current/Changes
branches/upstream/libmodule-scandeps-perl/current/MANIFEST
branches/upstream/libmodule-scandeps-perl/current/META.yml
branches/upstream/libmodule-scandeps-perl/current/inc/Module/Install.pm
branches/upstream/libmodule-scandeps-perl/current/inc/Module/Install/Base.pm
branches/upstream/libmodule-scandeps-perl/current/inc/Module/Install/Can.pm
branches/upstream/libmodule-scandeps-perl/current/inc/Module/Install/Fetch.pm
branches/upstream/libmodule-scandeps-perl/current/inc/Module/Install/Makefile.pm
branches/upstream/libmodule-scandeps-perl/current/inc/Module/Install/Metadata.pm
branches/upstream/libmodule-scandeps-perl/current/inc/Module/Install/Win32.pm
branches/upstream/libmodule-scandeps-perl/current/inc/Module/Install/WriteAll.pm
branches/upstream/libmodule-scandeps-perl/current/lib/Module/ScanDeps.pm
branches/upstream/libmodule-scandeps-perl/current/script/scandeps.pl
Modified: branches/upstream/libmodule-scandeps-perl/current/AUTHORS
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmodule-scandeps-perl/current/AUTHORS?rev=26234&op=diff
==============================================================================
--- branches/upstream/libmodule-scandeps-perl/current/AUTHORS (original)
+++ branches/upstream/libmodule-scandeps-perl/current/AUTHORS Sat Oct 25 16:40:44 2008
@@ -29,6 +29,7 @@
Jouke Visser (JOUKE)
Malcolm Nooning
Marcus Rueckert
+Mark Stosberg (MARKSTOS)
Markus Jansen
Matt S Trout (MSTROUT)
Matt Sergeant (MSERGEANT)
Modified: branches/upstream/libmodule-scandeps-perl/current/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmodule-scandeps-perl/current/Changes?rev=26234&op=diff
==============================================================================
--- branches/upstream/libmodule-scandeps-perl/current/Changes (original)
+++ branches/upstream/libmodule-scandeps-perl/current/Changes Sat Oct 25 16:40:44 2008
@@ -1,3 +1,17 @@
+[Changes for 0.86 - 2008-10-23]
+* Fix the 'use prefork "Foo"' static detection.
+* Fix the detection of any of the module-loader modules such as
+ prefork, autouse, etc. if invoked as 'use prefork"Foo"' (note
+ the lack of a space).
+* Slightly refactor the loader-module scanning. (see above)
+* Support for "use maybe 'foo';"
+* Use (arch|priv)libexp instead of (arch|priv)lib
+ in scandeps.pl (Mark Stosberg)
+* Update to Module::Install 0.77
+
+[Changes for 0.85 - 2008-08-01]
+* Add special case for Net::Server.
+
[Changes for 0.84 - 2008-05-13]
* Add special case for Class::MethodMaker.
Modified: branches/upstream/libmodule-scandeps-perl/current/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmodule-scandeps-perl/current/MANIFEST?rev=26234&op=diff
==============================================================================
--- branches/upstream/libmodule-scandeps-perl/current/MANIFEST (original)
+++ branches/upstream/libmodule-scandeps-perl/current/MANIFEST Sat Oct 25 16:40:44 2008
@@ -8,6 +8,7 @@
inc/Module/Install/Metadata.pm
inc/Module/Install/Win32.pm
inc/Module/Install/WriteAll.pm
+lib/Module/.ScanDeps.pm.swp
lib/Module/ScanDeps.pm
lib/Module/ScanDeps/DataFeed.pm
Makefile.PL
@@ -20,6 +21,7 @@
t/10-case-insensitive-keys.t
t/11-finds-shared-lib.t
t/12-ScanFileRE.t
+t/13-static_prefork_test.t
t/2-static_functional_interface_fake.t
t/3-static_oo_interface_real.t
t/4-static_functional_interface_options_fake.t
Modified: branches/upstream/libmodule-scandeps-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmodule-scandeps-perl/current/META.yml?rev=26234&op=diff
==============================================================================
--- branches/upstream/libmodule-scandeps-perl/current/META.yml (original)
+++ branches/upstream/libmodule-scandeps-perl/current/META.yml Sat Oct 25 16:40:44 2008
@@ -5,11 +5,11 @@
build_requires:
Test::More: 0
distribution_type: module
-generated_by: 'Module::Install version 0.72'
+generated_by: 'Module::Install version 0.77'
license: perl
meta-spec:
- url: http://module-build.sourceforge.net/META-spec-v1.3.html
- version: 1.3
+ url: http://module-build.sourceforge.net/META-spec-v1.4.html
+ version: 1.4
name: Module-ScanDeps
no_index:
directory:
@@ -21,4 +21,6 @@
Module::Build::ModuleInfo: 0
perl: 5.6.0
version: 0
-version: 0.84
+resources:
+ license: http://dev.perl.org/licenses/
+version: 0.86
Modified: branches/upstream/libmodule-scandeps-perl/current/inc/Module/Install.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmodule-scandeps-perl/current/inc/Module/Install.pm?rev=26234&op=diff
==============================================================================
--- branches/upstream/libmodule-scandeps-perl/current/inc/Module/Install.pm (original)
+++ branches/upstream/libmodule-scandeps-perl/current/inc/Module/Install.pm Sat Oct 25 16:40:44 2008
@@ -30,7 +30,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.72';
+ $VERSION = '0.77';
*inc::Module::Install::VERSION = *VERSION;
@inc::Module::Install::ISA = __PACKAGE__;
@@ -85,7 +85,7 @@
# Build.PL was formerly supported, but no longer is due to excessive
# difficulty in implementing every single feature twice.
-if ( $0 =~ /Build.PL$/i or -f 'Build.PL' ) { die <<"END_DIE" }
+if ( $0 =~ /Build.PL$/i ) { die <<"END_DIE" }
Module::Install no longer supports Build.PL.
@@ -125,8 +125,10 @@
goto &$code unless $cwd eq $pwd;
}
$$sym =~ /([^:]+)$/ or die "Cannot autoload $who - $sym";
- unshift @_, ( $self, $1 );
- goto &{$self->can('call')} unless uc($1) eq $1;
+ unless ( uc($1) eq $1 ) {
+ unshift @_, ( $self, $1 );
+ goto &{$self->can('call')};
+ }
};
}
@@ -339,7 +341,10 @@
close FH or die "close($_[0]): $!";
}
-sub _version {
+# _version is for processing module versions (eg, 1.03_05) not
+# Perl versions (eg, 5.8.1).
+
+sub _version ($) {
my $s = shift || 0;
$s =~ s/^(\d+)\.?//;
my $l = $1 || 0;
@@ -348,6 +353,17 @@
return $l + 0;
}
+# Cloned from Params::Util::_CLASS
+sub _CLASS ($) {
+ (
+ defined $_[0]
+ and
+ ! ref $_[0]
+ and
+ $_[0] =~ m/^[^\W\d]\w*(?:::\w+)*$/s
+ ) ? $_[0] : undef;
+}
+
1;
# Copyright 2008 Adam Kennedy.
Modified: branches/upstream/libmodule-scandeps-perl/current/inc/Module/Install/Base.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmodule-scandeps-perl/current/inc/Module/Install/Base.pm?rev=26234&op=diff
==============================================================================
--- branches/upstream/libmodule-scandeps-perl/current/inc/Module/Install/Base.pm (original)
+++ branches/upstream/libmodule-scandeps-perl/current/inc/Module/Install/Base.pm Sat Oct 25 16:40:44 2008
@@ -1,7 +1,7 @@
#line 1
package Module::Install::Base;
-$VERSION = '0.72';
+$VERSION = '0.77';
# Suspend handler for "redefined" warnings
BEGIN {
@@ -45,6 +45,8 @@
$_[0]->_top->{admin} or Module::Install::Base::FakeAdmin->new;
}
+#line 101
+
sub is_admin {
$_[0]->admin->VERSION;
}
@@ -67,4 +69,4 @@
1;
-#line 138
+#line 146
Modified: branches/upstream/libmodule-scandeps-perl/current/inc/Module/Install/Can.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmodule-scandeps-perl/current/inc/Module/Install/Can.pm?rev=26234&op=diff
==============================================================================
--- branches/upstream/libmodule-scandeps-perl/current/inc/Module/Install/Can.pm (original)
+++ branches/upstream/libmodule-scandeps-perl/current/inc/Module/Install/Can.pm Sat Oct 25 16:40:44 2008
@@ -11,7 +11,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.72';
+ $VERSION = '0.77';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
@@ -39,6 +39,7 @@
return $_cmd if (-x $_cmd or $_cmd = MM->maybe_command($_cmd));
for my $dir ((split /$Config::Config{path_sep}/, $ENV{PATH}), '.') {
+ next if $dir eq '';
my $abs = File::Spec->catfile($dir, $_[1]);
return $abs if (-x $abs or $abs = MM->maybe_command($abs));
}
@@ -79,4 +80,4 @@
__END__
-#line 157
+#line 158
Modified: branches/upstream/libmodule-scandeps-perl/current/inc/Module/Install/Fetch.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmodule-scandeps-perl/current/inc/Module/Install/Fetch.pm?rev=26234&op=diff
==============================================================================
--- branches/upstream/libmodule-scandeps-perl/current/inc/Module/Install/Fetch.pm (original)
+++ branches/upstream/libmodule-scandeps-perl/current/inc/Module/Install/Fetch.pm Sat Oct 25 16:40:44 2008
@@ -6,7 +6,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.72';
+ $VERSION = '0.77';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
Modified: branches/upstream/libmodule-scandeps-perl/current/inc/Module/Install/Makefile.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmodule-scandeps-perl/current/inc/Module/Install/Makefile.pm?rev=26234&op=diff
==============================================================================
--- branches/upstream/libmodule-scandeps-perl/current/inc/Module/Install/Makefile.pm (original)
+++ branches/upstream/libmodule-scandeps-perl/current/inc/Module/Install/Makefile.pm Sat Oct 25 16:40:44 2008
@@ -7,7 +7,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.72';
+ $VERSION = '0.77';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
@@ -36,9 +36,9 @@
sub makemaker_args {
my $self = shift;
- my $args = ($self->{makemaker_args} ||= {});
- %$args = ( %$args, @_ ) if @_;
- $args;
+ my $args = ( $self->{makemaker_args} ||= {} );
+ %$args = ( %$args, @_ );
+ return $args;
}
# For mm args that take multiple space-seperated args,
@@ -116,7 +116,13 @@
# Make sure we have a new enough
require ExtUtils::MakeMaker;
- $self->configure_requires( 'ExtUtils::MakeMaker' => $ExtUtils::MakeMaker::VERSION );
+
+ # MakeMaker can complain about module versions that include
+ # 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->configure_requires( 'ExtUtils::MakeMaker' => $ExtUtils::MakeMaker::VERSION =~ /^(\d+\.\d+)/ );
# Generate the
my $args = $self->makemaker_args;
@@ -175,7 +181,9 @@
my $user_preop = delete $args{dist}->{PREOP};
if (my $preop = $self->admin->preop($user_preop)) {
- $args{dist} = $preop;
+ foreach my $key ( keys %$preop ) {
+ $args{dist}->{$key} = $preop->{$key};
+ }
}
my $mm = ExtUtils::MakeMaker::WriteMakefile(%args);
@@ -242,4 +250,4 @@
__END__
-#line 371
+#line 379
Modified: branches/upstream/libmodule-scandeps-perl/current/inc/Module/Install/Metadata.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmodule-scandeps-perl/current/inc/Module/Install/Metadata.pm?rev=26234&op=diff
==============================================================================
--- branches/upstream/libmodule-scandeps-perl/current/inc/Module/Install/Metadata.pm (original)
+++ branches/upstream/libmodule-scandeps-perl/current/inc/Module/Install/Metadata.pm Sat Oct 25 16:40:44 2008
@@ -6,7 +6,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.72';
+ $VERSION = '0.77';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
@@ -17,9 +17,7 @@
abstract
author
version
- license
distribution_type
- perl_version
tests
installdirs
};
@@ -30,13 +28,21 @@
requires
recommends
bundles
+ resources
};
-sub Meta { shift }
-sub Meta_ScalarKeys { @scalar_keys }
-sub Meta_TupleKeys { @tuple_keys }
-
-foreach my $key (@scalar_keys) {
+my @resource_keys = qw{
+ homepage
+ bugtracker
+ repository
+};
+
+sub Meta { shift }
+sub Meta_ScalarKeys { @scalar_keys }
+sub Meta_TupleKeys { @tuple_keys }
+sub Meta_ResourceKeys { @resource_keys }
+
+foreach my $key ( @scalar_keys ) {
*$key = sub {
my $self = shift;
return $self->{values}{$key} if defined wantarray and !@_;
@@ -45,12 +51,30 @@
};
}
+foreach my $key ( @resource_keys ) {
+ *$key = sub {
+ my $self = shift;
+ unless ( @_ ) {
+ return () unless $self->{values}{resources};
+ return map { $_->[1] }
+ grep { $_->[0] eq $key }
+ @{ $self->{values}{resources} };
+ }
+ return $self->{values}{resources}{$key} unless @_;
+ my $uri = shift or die(
+ "Did not provide a value to $key()"
+ );
+ $self->resources( $key => $uri );
+ return 1;
+ };
+}
+
sub requires {
my $self = shift;
while ( @_ ) {
my $module = shift or last;
my $version = shift || 0;
- push @{ $self->{values}->{requires} }, [ $module, $version ];
+ push @{ $self->{values}{requires} }, [ $module, $version ];
}
$self->{values}{requires};
}
@@ -60,7 +84,7 @@
while ( @_ ) {
my $module = shift or last;
my $version = shift || 0;
- push @{ $self->{values}->{build_requires} }, [ $module, $version ];
+ push @{ $self->{values}{build_requires} }, [ $module, $version ];
}
$self->{values}{build_requires};
}
@@ -70,7 +94,7 @@
while ( @_ ) {
my $module = shift or last;
my $version = shift || 0;
- push @{ $self->{values}->{configure_requires} }, [ $module, $version ];
+ push @{ $self->{values}{configure_requires} }, [ $module, $version ];
}
$self->{values}{configure_requires};
}
@@ -80,7 +104,7 @@
while ( @_ ) {
my $module = shift or last;
my $version = shift || 0;
- push @{ $self->{values}->{recommends} }, [ $module, $version ];
+ push @{ $self->{values}{recommends} }, [ $module, $version ];
}
$self->{values}{recommends};
}
@@ -90,9 +114,31 @@
while ( @_ ) {
my $module = shift or last;
my $version = shift || 0;
- push @{ $self->{values}->{bundles} }, [ $module, $version ];
+ push @{ $self->{values}{bundles} }, [ $module, $version ];
}
$self->{values}{bundles};
+}
+
+# Resource handling
+my %lc_resource = map { $_ => 1 } qw{
+ homepage
+ license
+ bugtracker
+ repository
+};
+
+sub resources {
+ my $self = shift;
+ while ( @_ ) {
+ my $name = shift or last;
+ my $value = shift or next;
+ if ( $name eq lc $name and ! $lc_resource{$name} ) {
+ die("Unsupported reserved lowercase resource '$name'");
+ }
+ $self->{values}{resources} ||= [];
+ push @{ $self->{values}{resources} }, [ $name, $value ];
+ }
+ $self->{values}{resources};
}
# Aliases for build_requires that will have alternative
@@ -108,30 +154,73 @@
sub sign {
my $self = shift;
- return $self->{'values'}{'sign'} if defined wantarray and ! @_;
- $self->{'values'}{'sign'} = ( @_ ? $_[0] : 1 );
+ return $self->{values}{sign} if defined wantarray and ! @_;
+ $self->{values}{sign} = ( @_ ? $_[0] : 1 );
return $self;
}
sub dynamic_config {
my $self = shift;
unless ( @_ ) {
- warn "You MUST provide an explicit true/false value to dynamic_config, skipping\n";
+ warn "You MUST provide an explicit true/false value to dynamic_config\n";
return $self;
}
$self->{values}{dynamic_config} = $_[0] ? 1 : 0;
- return $self;
+ return 1;
+}
+
+sub perl_version {
+ my $self = shift;
+ return $self->{values}{perl_version} unless @_;
+ my $version = shift or die(
+ "Did not provide a value to perl_version()"
+ );
+
+ # Convert triple-part versions (eg, 5.6.1 or 5.8.9) to
+ # numbers (eg, 5.006001 or 5.008009).
+
+ $version =~ s/^(\d+)\.(\d+)\.(\d+)$/sprintf("%d.%03d%03d",$1,$2,$3)/e;
+
+ $version =~ s/_.+$//;
+ $version = $version + 0; # Numify
+ unless ( $version >= 5.005 ) {
+ die "Module::Install only supports 5.005 or newer (use ExtUtils::MakeMaker)\n";
+ }
+ $self->{values}{perl_version} = $version;
+ return 1;
+}
+
+sub license {
+ my $self = shift;
+ return $self->{values}{license} unless @_;
+ my $license = shift or die(
+ 'Did not provide a value to license()'
+ );
+ $self->{values}{license} = $license;
+
+ # Automatically fill in license URLs
+ if ( $license eq 'perl' ) {
+ $self->resources( license => 'http://dev.perl.org/licenses/' );
+ }
+
+ return 1;
}
sub all_from {
my ( $self, $file ) = @_;
unless ( defined($file) ) {
- my $name = $self->name
- or die "all_from called with no args without setting name() first";
+ my $name = $self->name or die(
+ "all_from called with no args without setting name() first"
+ );
$file = join('/', 'lib', split(/-/, $name)) . '.pm';
$file =~ s{.*/}{} unless -e $file;
- die "all_from: cannot find $file from $name" unless -e $file;
+ unless ( -e $file ) {
+ die("all_from cannot find $file from $name");
+ }
+ }
+ unless ( -f $file ) {
+ die("The path '$file' does not exist, or is not a file");
}
# Some methods pull from POD instead of code.
@@ -210,8 +299,8 @@
while ( my ( $name, $mods ) = splice( @_, 0, 2 ) ) {
$self->feature( $name, @$mods );
}
- return $self->{values}->{features}
- ? @{ $self->{values}->{features} }
+ return $self->{values}{features}
+ ? @{ $self->{values}{features} }
: ();
}
@@ -267,22 +356,25 @@
);
}
+# Add both distribution and module name
sub name_from {
- my $self = shift;
+ my ($self, $file) = @_;
if (
- Module::Install::_read($_[0]) =~ m/
+ Module::Install::_read($file) =~ m/
^ \s*
package \s*
([\w:]+)
\s* ;
/ixms
) {
- my $name = $1;
+ my ($name, $module_name) = ($1, $1);
$name =~ s{::}{-}g;
$self->name($name);
+ unless ( $self->module_name ) {
+ $self->module_name($module_name);
+ }
} else {
- die "Cannot determine name from $_[0]\n";
- return;
+ die("Cannot determine name from $file\n");
}
}
@@ -291,7 +383,7 @@
if (
Module::Install::_read($_[0]) =~ m/
^
- use \s*
+ (?:use|require) \s*
v?
([\d_\.]+)
\s* ;
@@ -341,8 +433,12 @@
my $license_text = $1;
my @phrases = (
'under the same (?:terms|license) as perl itself' => 'perl', 1,
+ 'GNU general public license' => 'gpl', 1,
'GNU public license' => 'gpl', 1,
+ 'GNU lesser general public license' => 'lgpl', 1,
'GNU lesser public license' => 'lgpl', 1,
+ 'GNU library general public license' => 'lgpl', 1,
+ 'GNU library public license' => 'lgpl', 1,
'BSD license' => 'bsd', 1,
'Artistic license' => 'artistic', 1,
'GPL' => 'gpl', 1,
@@ -356,7 +452,7 @@
$pattern =~ s{\s+}{\\s+}g;
if ( $license_text =~ /\b$pattern\b/i ) {
if ( $osi and $license_text =~ /All rights reserved/i ) {
- warn "LEGAL WARNING: 'All rights reserved' may invalidate Open Source licenses. Consider removing it.";
+ print "WARNING: 'All rights reserved' in copyright may invalidate Open Source license.\n";
}
$self->license($license);
return 1;
@@ -366,6 +462,24 @@
warn "Cannot determine license info from $_[0]\n";
return 'unknown';
+}
+
+sub bugtracker_from {
+ my $self = shift;
+ my $content = Module::Install::_read($_[0]);
+ my @links = $content =~ m/L\<(http\:\/\/rt\.cpan\.org\/[^>]+)\>/g;
+ unless ( @links ) {
+ warn "Cannot determine bugtracker info from $_[0]\n";
+ return 0;
+ }
+ if ( @links > 1 ) {
+ warn "Found more than on rt.cpan.org link in $_[0]\n";
+ return 0;
+ }
+
+ # Set the bugtracker
+ bugtracker( $links[0] );
+ return 1;
}
sub install_script {
@@ -378,7 +492,7 @@
} elsif ( -d 'script' and -f "script/$_" ) {
push @$exe, "script/$_";
} else {
- die "Cannot find script '$_'";
+ die("Cannot find script '$_'");
}
}
}
Modified: branches/upstream/libmodule-scandeps-perl/current/inc/Module/Install/Win32.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmodule-scandeps-perl/current/inc/Module/Install/Win32.pm?rev=26234&op=diff
==============================================================================
--- branches/upstream/libmodule-scandeps-perl/current/inc/Module/Install/Win32.pm (original)
+++ branches/upstream/libmodule-scandeps-perl/current/inc/Module/Install/Win32.pm Sat Oct 25 16:40:44 2008
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '0.72';
+ $VERSION = '0.77';
@ISA = qw{Module::Install::Base};
$ISCORE = 1;
}
Modified: branches/upstream/libmodule-scandeps-perl/current/inc/Module/Install/WriteAll.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmodule-scandeps-perl/current/inc/Module/Install/WriteAll.pm?rev=26234&op=diff
==============================================================================
--- branches/upstream/libmodule-scandeps-perl/current/inc/Module/Install/WriteAll.pm (original)
+++ branches/upstream/libmodule-scandeps-perl/current/inc/Module/Install/WriteAll.pm Sat Oct 25 16:40:44 2008
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '0.72';
+ $VERSION = '0.77';
@ISA = qw{Module::Install::Base};
$ISCORE = 1;
}
Modified: branches/upstream/libmodule-scandeps-perl/current/lib/Module/ScanDeps.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmodule-scandeps-perl/current/lib/Module/ScanDeps.pm?rev=26234&op=diff
==============================================================================
--- branches/upstream/libmodule-scandeps-perl/current/lib/Module/ScanDeps.pm (original)
+++ branches/upstream/libmodule-scandeps-perl/current/lib/Module/ScanDeps.pm Sat Oct 25 16:40:44 2008
@@ -4,7 +4,7 @@
use strict;
use vars qw( $VERSION @EXPORT @EXPORT_OK $CurrentPackage @IncludeLibs $ScanFileRE );
-$VERSION = '0.84';
+$VERSION = '0.86';
@EXPORT = qw( scan_deps scan_deps_runtime );
@EXPORT_OK = qw( scan_line scan_chunk add_deps scan_deps_runtime path_to_inc_name );
@@ -330,6 +330,7 @@
'MIME/Decoder.pm' => 'sub',
'Net/DNS/RR.pm' => 'sub',
'Net/FTP.pm' => 'sub',
+ 'Net/Server.pm' => 'sub',
'Net/SSH/Perl.pm' => 'sub',
'PDF/API2/Resource/Font.pm' => 'sub',
'PDF/API2/Basic/TTF/Font.pm' => sub {
@@ -340,10 +341,10 @@
POE/Kernel.pm POE/Session.pm
) ],
'POE/Kernel.pm' => sub {
- _glob_in_inc('POE/XS/Resource', 1),
- _glob_in_inc('POE/Resource', 1),
- _glob_in_inc('POE/XS/Loop', 1),
- _glob_in_inc('POE/Loop', 1),
+ _glob_in_inc('POE/XS/Resource', 1),
+ _glob_in_inc('POE/Resource', 1),
+ _glob_in_inc('POE/XS/Loop', 1),
+ _glob_in_inc('POE/Loop', 1),
},
'Parse/AFP.pm' => 'sub',
'Parse/Binary.pm' => 'sub',
@@ -370,7 +371,7 @@
},
'Template.pm' => 'sub',
'Term/ReadLine.pm' => 'sub',
- 'Test/Deep.pm' => 'sub',
+ 'Test/Deep.pm' => 'sub',
'Tk.pm' => sub {
$SeenTk = 1;
qw( Tk/FileSelect.pm Encode/Unicode.pm );
@@ -435,8 +436,8 @@
return 'pod/perldiag.pod';
},
'threads/shared.pm' => [qw( attributes.pm )],
- # anybody using threads::shared is likely to declare variables
- # with attribute :shared
+ # anybody using threads::shared is likely to declare variables
+ # with attribute :shared
'utf8.pm' => [
'utf8_heavy.pl', do {
my $dir = 'unicore';
@@ -709,7 +710,7 @@
}
}
- if (my ($autouse) = /^\s*use\s+autouse\s+(["'].*?["']|\w+)/)
+ if (my ($autouse) = /^\s*use\s+autouse\s+(["'].*?["']|\w+)/)
{
$autouse =~ s/["']//g;
$autouse =~ s{::}{/}g;
@@ -734,6 +735,25 @@
return sort keys %found;
}
+# short helper for scan_chunk
+sub _typical_module_loader_chunk {
+ local $_ = shift;
+ my $loader = shift;
+ my $loader_file = $loader;
+ $loader_file =~ s/::/\//;
+ $loader_file .= ".pm";
+ $loader = quotemeta($loader);
+
+ if (/^\s* use \s+ $loader \b \s* (.*)/sx) {
+ return [
+ $loader_file,
+ map { s{::}{/}g; "$_.pm" }
+ grep { length and !/^q[qw]?$/ } split(/[^\w:]+/, $1)
+ ];
+ }
+ return();
+}
+
sub scan_chunk {
my $chunk = shift;
@@ -741,31 +761,18 @@
my $module = eval {
$_ = $chunk;
- return [ 'base.pm',
- map { s{::}{/}g; "$_.pm" }
- grep { length and !/^q[qw]?$/ } split(/[^\w:]+/, $1) ]
- if /^\s* use \s+ base \s+ (.*)/sx;
-
- return [ 'prefork.pm',
- map { s{::}{/}g; "$_.pm" }
- grep { length and !/^q[qw]?$/ } split(/[^\w:]+/, $1) ]
-
- if /^\s* use \s+ base \s+ (.*)/sx;
+ # TODO: There's many more of these "loader" type modules on CPAN!
+ # scan for the typical module-loader modules
+ foreach my $loader (qw(base prefork POE encoding maybe)) {
+ my $retval = _typical_module_loader_chunk($_, $loader);
+ return $retval if $retval;
+ }
+
return [ 'Class/Autouse.pm',
map { s{::}{/}g; "$_.pm" }
grep { length and !/^:|^q[qw]?$/ } split(/[^\w:]+/, $1) ]
- if /^\s* use \s+ Class::Autouse \s+ (.*)/sx
+ if /^\s* use \s+ Class::Autouse \b \s* (.*)/sx
or /^\s* Class::Autouse \s* -> \s* autouse \s* (.*)/sx;
-
- return [ 'POE.pm',
- map { s{::}{/}g; "POE/$_.pm" }
- grep { length and !/^q[qw]?$/ } split(/[^\w:]+/, $1) ]
- if /^\s* use \s+ POE \s+ (.*)/sx;
-
- return [ 'encoding.pm',
- map { _find_encoding($_) }
- grep { length and !/^q[qw]?$/ } split(/[^\w:-]+/, $1) ]
- if /^\s* use \s+ encoding \s+ (.*)/sx;
return $1 if /(?:^|\s)(?:use|no|require)\s+([\w:\.\-\\\/\"\']+)/;
return $1
@@ -928,8 +935,7 @@
type => $type );
}
}
- }
-
+ } # end for modules
return $rv;
}
Modified: branches/upstream/libmodule-scandeps-perl/current/script/scandeps.pl
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmodule-scandeps-perl/current/script/scandeps.pl?rev=26234&op=diff
==============================================================================
--- branches/upstream/libmodule-scandeps-perl/current/script/scandeps.pl (original)
+++ branches/upstream/libmodule-scandeps-perl/current/script/scandeps.pl Sat Oct 25 16:40:44 2008
@@ -63,8 +63,8 @@
next if $skip{$name};
- my $privPath = "$Config::Config{privlib}/$key";
- my $archPath = "$Config::Config{archlib}/$key";
+ my $privPath = "$Config::Config{privlibexp}/$key";
+ my $archPath = "$Config::Config{archlibexp}/$key";
$privPath =~ s|\\|\/|og;
$archPath =~ s|\\|\/|og;
if ($mod->{file} eq $privPath
Added: branches/upstream/libmodule-scandeps-perl/current/t/13-static_prefork_test.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmodule-scandeps-perl/current/t/13-static_prefork_test.t?rev=26234&op=file
==============================================================================
--- branches/upstream/libmodule-scandeps-perl/current/t/13-static_prefork_test.t (added)
+++ branches/upstream/libmodule-scandeps-perl/current/t/13-static_prefork_test.t Sat Oct 25 16:40:44 2008
@@ -1,0 +1,49 @@
+#!/usr/bin/perl
+
+use strict;
+use warnings;
+
+use lib 't';
+BEGIN {
+ require Test::More;
+ if (not eval "require prefork; 1;" or $@) {
+ Test::More->import(skip_all => "This test requires prefork.pm which is not installed. Skipping.");
+ exit(0);
+ }
+ else {
+ # Mwuahahaha!
+ delete $INC{"prefork.pm"};
+ %prefork:: = ();
+ }
+}
+use Test::More qw(no_plan); # no_plan because the number of objects in the dependency tree (and hence the number of tests) can change
+use Utils;
+
+my $rv;
+my $root;
+
+##############################################################
+# Tests compilation of Module::ScanDeps
+##############################################################
+BEGIN { use_ok( 'Module::ScanDeps' ); }
+
+##############################################################
+# Tests static dependency scanning with the prefork module.
+# This was broken until Module::ScanDeps 0.85
+##############################################################
+$root = $0;
+
+use prefork "Shell";
+use prefork"less";
+
+my @deps = qw(
+ Carp.pm Config.pm Exporter.pm
+ Test/More.pm strict.pm vars.pm
+ prefork.pm Shell.pm less.pm
+);
+
+# Functional i/f
+$rv = scan_deps($root);
+generic_scandeps_rv_test($rv, [$0], \@deps);
+
+__END__
More information about the Pkg-perl-cvs-commits
mailing list