[Bps-public-commit] r16696 - in Prophet/branches/init-and-clone: inc/Module inc/Module/Install
jesse at bestpractical.com
jesse at bestpractical.com
Thu Nov 6 01:52:36 EST 2008
Author: jesse
Date: Thu Nov 6 01:52:36 2008
New Revision: 16696
Modified:
Prophet/branches/init-and-clone/ (props changed)
Prophet/branches/init-and-clone/inc/Module/Install.pm
Prophet/branches/init-and-clone/inc/Module/Install/AutoInstall.pm
Prophet/branches/init-and-clone/inc/Module/Install/Base.pm
Prophet/branches/init-and-clone/inc/Module/Install/Can.pm
Prophet/branches/init-and-clone/inc/Module/Install/Fetch.pm
Prophet/branches/init-and-clone/inc/Module/Install/Include.pm
Prophet/branches/init-and-clone/inc/Module/Install/Makefile.pm
Prophet/branches/init-and-clone/inc/Module/Install/Metadata.pm
Prophet/branches/init-and-clone/inc/Module/Install/Win32.pm
Prophet/branches/init-and-clone/inc/Module/Install/WriteAll.pm
Log:
r49322 at 31b: jesse | 2008-11-06 04:15:05 +0900
* M::I bump
Modified: Prophet/branches/init-and-clone/inc/Module/Install.pm
==============================================================================
--- Prophet/branches/init-and-clone/inc/Module/Install.pm (original)
+++ Prophet/branches/init-and-clone/inc/Module/Install.pm Thu Nov 6 01:52:36 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.76';
+ $VERSION = '0.77';
*inc::Module::Install::VERSION = *VERSION;
@inc::Module::Install::ISA = __PACKAGE__;
@@ -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,6 +341,9 @@
close FH or die "close($_[0]): $!";
}
+# _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+)\.?//;
Modified: Prophet/branches/init-and-clone/inc/Module/Install/AutoInstall.pm
==============================================================================
--- Prophet/branches/init-and-clone/inc/Module/Install/AutoInstall.pm (original)
+++ Prophet/branches/init-and-clone/inc/Module/Install/AutoInstall.pm Thu Nov 6 01:52:36 2008
@@ -6,7 +6,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.76';
+ $VERSION = '0.77';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
Modified: Prophet/branches/init-and-clone/inc/Module/Install/Base.pm
==============================================================================
--- Prophet/branches/init-and-clone/inc/Module/Install/Base.pm (original)
+++ Prophet/branches/init-and-clone/inc/Module/Install/Base.pm Thu Nov 6 01:52:36 2008
@@ -1,7 +1,7 @@
#line 1
package Module::Install::Base;
-$VERSION = '0.76';
+$VERSION = '0.77';
# Suspend handler for "redefined" warnings
BEGIN {
Modified: Prophet/branches/init-and-clone/inc/Module/Install/Can.pm
==============================================================================
--- Prophet/branches/init-and-clone/inc/Module/Install/Can.pm (original)
+++ Prophet/branches/init-and-clone/inc/Module/Install/Can.pm Thu Nov 6 01:52:36 2008
@@ -11,7 +11,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.76';
+ $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: Prophet/branches/init-and-clone/inc/Module/Install/Fetch.pm
==============================================================================
--- Prophet/branches/init-and-clone/inc/Module/Install/Fetch.pm (original)
+++ Prophet/branches/init-and-clone/inc/Module/Install/Fetch.pm Thu Nov 6 01:52:36 2008
@@ -6,7 +6,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.76';
+ $VERSION = '0.77';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
Modified: Prophet/branches/init-and-clone/inc/Module/Install/Include.pm
==============================================================================
--- Prophet/branches/init-and-clone/inc/Module/Install/Include.pm (original)
+++ Prophet/branches/init-and-clone/inc/Module/Install/Include.pm Thu Nov 6 01:52:36 2008
@@ -6,7 +6,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.76';
+ $VERSION = '0.77';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
Modified: Prophet/branches/init-and-clone/inc/Module/Install/Makefile.pm
==============================================================================
--- Prophet/branches/init-and-clone/inc/Module/Install/Makefile.pm (original)
+++ Prophet/branches/init-and-clone/inc/Module/Install/Makefile.pm Thu Nov 6 01:52:36 2008
@@ -7,7 +7,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.76';
+ $VERSION = '0.77';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
@@ -181,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);
@@ -248,4 +250,4 @@
__END__
-#line 377
+#line 379
Modified: Prophet/branches/init-and-clone/inc/Module/Install/Metadata.pm
==============================================================================
--- Prophet/branches/init-and-clone/inc/Module/Install/Metadata.pm (original)
+++ Prophet/branches/init-and-clone/inc/Module/Install/Metadata.pm Thu Nov 6 01:52:36 2008
@@ -6,7 +6,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.76';
+ $VERSION = '0.77';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
@@ -175,6 +175,12 @@
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 ) {
@@ -213,6 +219,9 @@
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.
# If there is a matching .pod, use that instead
@@ -424,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,
Modified: Prophet/branches/init-and-clone/inc/Module/Install/Win32.pm
==============================================================================
--- Prophet/branches/init-and-clone/inc/Module/Install/Win32.pm (original)
+++ Prophet/branches/init-and-clone/inc/Module/Install/Win32.pm Thu Nov 6 01:52:36 2008
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '0.76';
+ $VERSION = '0.77';
@ISA = qw{Module::Install::Base};
$ISCORE = 1;
}
Modified: Prophet/branches/init-and-clone/inc/Module/Install/WriteAll.pm
==============================================================================
--- Prophet/branches/init-and-clone/inc/Module/Install/WriteAll.pm (original)
+++ Prophet/branches/init-and-clone/inc/Module/Install/WriteAll.pm Thu Nov 6 01:52:36 2008
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '0.76';
+ $VERSION = '0.77';
@ISA = qw{Module::Install::Base};
$ISCORE = 1;
}
More information about the Bps-public-commit
mailing list