[Rt-commit] r7760 - in rtir/branches/2.3-EXPERIMENTAL: .
inc/Module/Install
ruz at bestpractical.com
ruz at bestpractical.com
Thu May 3 17:31:45 EDT 2007
Author: ruz
Date: Thu May 3 17:31:44 2007
New Revision: 7760
Modified:
rtir/branches/2.3-EXPERIMENTAL/ (props changed)
rtir/branches/2.3-EXPERIMENTAL/inc/Module/Install.pm
rtir/branches/2.3-EXPERIMENTAL/inc/Module/Install/AutoInstall.pm
rtir/branches/2.3-EXPERIMENTAL/inc/Module/Install/Base.pm
rtir/branches/2.3-EXPERIMENTAL/inc/Module/Install/Can.pm
rtir/branches/2.3-EXPERIMENTAL/inc/Module/Install/Fetch.pm
rtir/branches/2.3-EXPERIMENTAL/inc/Module/Install/Include.pm
rtir/branches/2.3-EXPERIMENTAL/inc/Module/Install/Makefile.pm
rtir/branches/2.3-EXPERIMENTAL/inc/Module/Install/Metadata.pm
rtir/branches/2.3-EXPERIMENTAL/inc/Module/Install/Win32.pm
rtir/branches/2.3-EXPERIMENTAL/inc/Module/Install/WriteAll.pm
Log:
r1938 at cubic-pc: cubic | 2007-05-04 01:27:09 +0400
* update M::I
Modified: rtir/branches/2.3-EXPERIMENTAL/inc/Module/Install.pm
==============================================================================
--- rtir/branches/2.3-EXPERIMENTAL/inc/Module/Install.pm (original)
+++ rtir/branches/2.3-EXPERIMENTAL/inc/Module/Install.pm Thu May 3 17:31:44 2007
@@ -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.64';
+ $VERSION = '0.65';
}
# Whether or not inc::Module::Install is actually loaded, the
Modified: rtir/branches/2.3-EXPERIMENTAL/inc/Module/Install/AutoInstall.pm
==============================================================================
--- rtir/branches/2.3-EXPERIMENTAL/inc/Module/Install/AutoInstall.pm (original)
+++ rtir/branches/2.3-EXPERIMENTAL/inc/Module/Install/AutoInstall.pm Thu May 3 17:31:44 2007
@@ -6,7 +6,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.64';
+ $VERSION = '0.65';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
Modified: rtir/branches/2.3-EXPERIMENTAL/inc/Module/Install/Base.pm
==============================================================================
--- rtir/branches/2.3-EXPERIMENTAL/inc/Module/Install/Base.pm (original)
+++ rtir/branches/2.3-EXPERIMENTAL/inc/Module/Install/Base.pm Thu May 3 17:31:44 2007
@@ -1,7 +1,7 @@
#line 1
package Module::Install::Base;
-$VERSION = '0.64';
+$VERSION = '0.65';
# Suspend handler for "redefined" warnings
BEGIN {
Modified: rtir/branches/2.3-EXPERIMENTAL/inc/Module/Install/Can.pm
==============================================================================
--- rtir/branches/2.3-EXPERIMENTAL/inc/Module/Install/Can.pm (original)
+++ rtir/branches/2.3-EXPERIMENTAL/inc/Module/Install/Can.pm Thu May 3 17:31:44 2007
@@ -11,7 +11,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.64';
+ $VERSION = '0.65';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
Modified: rtir/branches/2.3-EXPERIMENTAL/inc/Module/Install/Fetch.pm
==============================================================================
--- rtir/branches/2.3-EXPERIMENTAL/inc/Module/Install/Fetch.pm (original)
+++ rtir/branches/2.3-EXPERIMENTAL/inc/Module/Install/Fetch.pm Thu May 3 17:31:44 2007
@@ -6,7 +6,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.64';
+ $VERSION = '0.65';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
Modified: rtir/branches/2.3-EXPERIMENTAL/inc/Module/Install/Include.pm
==============================================================================
--- rtir/branches/2.3-EXPERIMENTAL/inc/Module/Install/Include.pm (original)
+++ rtir/branches/2.3-EXPERIMENTAL/inc/Module/Install/Include.pm Thu May 3 17:31:44 2007
@@ -6,7 +6,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.64';
+ $VERSION = '0.65';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
Modified: rtir/branches/2.3-EXPERIMENTAL/inc/Module/Install/Makefile.pm
==============================================================================
--- rtir/branches/2.3-EXPERIMENTAL/inc/Module/Install/Makefile.pm (original)
+++ rtir/branches/2.3-EXPERIMENTAL/inc/Module/Install/Makefile.pm Thu May 3 17:31:44 2007
@@ -7,7 +7,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.64';
+ $VERSION = '0.65';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
@@ -136,9 +136,13 @@
. "but we need version >= $perl_version";
}
+ $args->{INSTALLDIRS} = $self->installdirs;
+
my %args = map { ( $_ => $args->{$_} ) } grep {defined($args->{$_})} keys %$args;
- if ($self->admin->preop) {
- $args{dist} = $self->admin->preop;
+
+ my $user_preop = delete $args{dist}->{PREOP};
+ if (my $preop = $self->admin->preop($user_preop)) {
+ $args{dist} = $preop;
}
my $mm = ExtUtils::MakeMaker::WriteMakefile(%args);
@@ -205,4 +209,4 @@
__END__
-#line 334
+#line 338
Modified: rtir/branches/2.3-EXPERIMENTAL/inc/Module/Install/Metadata.pm
==============================================================================
--- rtir/branches/2.3-EXPERIMENTAL/inc/Module/Install/Metadata.pm (original)
+++ rtir/branches/2.3-EXPERIMENTAL/inc/Module/Install/Metadata.pm Thu May 3 17:31:44 2007
@@ -6,14 +6,14 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.64';
+ $VERSION = '0.65';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
my @scalar_keys = qw{
name module_name abstract author version license
- distribution_type perl_version tests
+ distribution_type perl_version tests installdirs
};
my @tuple_keys = qw{
@@ -56,6 +56,11 @@
};
}
+sub install_as_core { $_[0]->installdirs('perl') }
+sub install_as_cpan { $_[0]->installdirs('site') }
+sub install_as_site { $_[0]->installdirs('site') }
+sub install_as_vendor { $_[0]->installdirs('vendor') }
+
sub sign {
my $self = shift;
return $self->{'values'}{'sign'} if defined wantarray and !@_;
@@ -279,9 +284,11 @@
if (
$self->_slurp($file) =~ m/
- =head \d \s+
- (?:licen[cs]e|licensing|copyright|legal)\b
- (.*?)
+ (
+ =head \d \s+
+ (?:licen[cs]e|licensing|copyright|legal)\b
+ .*?
+ )
(=head\\d.*|=cut.*|)
\z
/ixms
@@ -298,6 +305,7 @@
'LGPL' => 'lgpl',
'BSD' => 'bsd',
'Artistic' => 'artistic',
+ 'MIT' => 'MIT',
);
while ( my ( $pattern, $license ) = splice( @phrases, 0, 2 ) ) {
$pattern =~ s{\s+}{\\s+}g;
Modified: rtir/branches/2.3-EXPERIMENTAL/inc/Module/Install/Win32.pm
==============================================================================
--- rtir/branches/2.3-EXPERIMENTAL/inc/Module/Install/Win32.pm (original)
+++ rtir/branches/2.3-EXPERIMENTAL/inc/Module/Install/Win32.pm Thu May 3 17:31:44 2007
@@ -6,7 +6,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.64';
+ $VERSION = '0.65';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
Modified: rtir/branches/2.3-EXPERIMENTAL/inc/Module/Install/WriteAll.pm
==============================================================================
--- rtir/branches/2.3-EXPERIMENTAL/inc/Module/Install/WriteAll.pm (original)
+++ rtir/branches/2.3-EXPERIMENTAL/inc/Module/Install/WriteAll.pm Thu May 3 17:31:44 2007
@@ -6,7 +6,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.64';
+ $VERSION = '0.65';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
More information about the Rt-commit
mailing list