[Jifty-commit] r558 - in jifty/trunk: . inc/Module
jifty-commit at lists.jifty.org
jifty-commit at lists.jifty.org
Wed Feb 8 19:15:32 EST 2006
Author: alexmv
Date: Wed Feb 8 19:15:29 2006
New Revision: 558
Modified:
jifty/trunk/ (props changed)
jifty/trunk/inc/Module/Install.pm
jifty/trunk/inc/Module/Install/AutoInstall.pm
jifty/trunk/inc/Module/Install/Base.pm
jifty/trunk/inc/Module/Install/Can.pm
jifty/trunk/inc/Module/Install/Fetch.pm
jifty/trunk/inc/Module/Install/Include.pm
jifty/trunk/inc/Module/Install/Makefile.pm
jifty/trunk/inc/Module/Install/Metadata.pm
jifty/trunk/inc/Module/Install/Scripts.pm
jifty/trunk/inc/Module/Install/Share.pm
jifty/trunk/inc/Module/Install/Win32.pm
jifty/trunk/inc/Module/Install/WriteAll.pm
Log:
r8981 at zoq-fot-pik: chmrr | 2006-02-08 19:08:55 -0500
* Module::Install bump
Modified: jifty/trunk/inc/Module/Install.pm
==============================================================================
--- jifty/trunk/inc/Module/Install.pm (original)
+++ jifty/trunk/inc/Module/Install.pm Wed Feb 8 19:15:29 2006
@@ -6,7 +6,7 @@
use vars qw{$VERSION};
BEGIN {
# Don't forget to update Module::Install::Admin too!
- $VERSION = '0.52';
+ $VERSION = '0.55';
}
# inc::Module::Install must be loaded first
Modified: jifty/trunk/inc/Module/Install/AutoInstall.pm
==============================================================================
--- jifty/trunk/inc/Module/Install/AutoInstall.pm (original)
+++ jifty/trunk/inc/Module/Install/AutoInstall.pm Wed Feb 8 19:15:29 2006
@@ -1,6 +1,8 @@
#line 1 "inc/Module/Install/AutoInstall.pm - /usr/lib/perl5/site_perl/5.8.7/Module/Install/AutoInstall.pm"
package Module::Install::AutoInstall;
-use Module::Install::Base; @ISA = qw(Module::Install::Base);
+
+use Module::Install::Base;
+ at ISA = qw{Module::Install::Base};
sub AutoInstall { $_[0] }
Modified: jifty/trunk/inc/Module/Install/Base.pm
==============================================================================
--- jifty/trunk/inc/Module/Install/Base.pm (original)
+++ jifty/trunk/inc/Module/Install/Base.pm Wed Feb 8 19:15:29 2006
@@ -2,9 +2,12 @@
package Module::Install::Base;
# Suspend handler for "redefined" warnings
-BEGIN { my $w = $SIG{__WARN__}; $SIG{__WARN__} = sub { $w } };
+BEGIN {
+ my $w = $SIG{__WARN__};
+ $SIG{__WARN__} = sub { $w };
+}
-#line 30
+#line 36
sub new {
my ($class, %args) = @_;
@@ -18,7 +21,7 @@
bless(\%args, $class);
}
-#line 48
+#line 56
sub AUTOLOAD {
my $self = shift;
@@ -28,20 +31,18 @@
goto &$autoload;
}
-#line 62
+#line 72
sub _top { $_[0]->{_top} }
-#line 73
+#line 85
sub admin {
- my $self = shift;
- $self->_top->{admin} or Module::Install::Base::FakeAdmin->new;
+ $_[0]->_top->{admin} or Module::Install::Base::FakeAdmin->new;
}
sub is_admin {
- my $self = shift;
- $self->admin->VERSION;
+ $_[0]->admin->VERSION;
}
sub DESTROY {}
@@ -50,14 +51,16 @@
my $Fake;
sub new { $Fake ||= bless(\@_, $_[0]) }
+
sub AUTOLOAD {}
-sub DESTROY {}
-1;
+sub DESTROY {}
# Restore warning handler
-BEGIN { $SIG{__WARN__} = $SIG{__WARN__}->() };
+BEGIN {
+ $SIG{__WARN__} = $SIG{__WARN__}->();
+}
-__END__
+1;
-#line 120
+#line 134
Modified: jifty/trunk/inc/Module/Install/Can.pm
==============================================================================
--- jifty/trunk/inc/Module/Install/Can.pm (original)
+++ jifty/trunk/inc/Module/Install/Can.pm Wed Feb 8 19:15:29 2006
@@ -1,6 +1,9 @@
#line 1 "inc/Module/Install/Can.pm - /usr/lib/perl5/site_perl/5.8.7/Module/Install/Can.pm"
package Module::Install::Can;
-use Module::Install::Base; @ISA = qw(Module::Install::Base);
+
+use Module::Install::Base;
+ at ISA = qw(Module::Install::Base);
+
$VERSION = '0.01';
use strict;
@@ -52,14 +55,15 @@
# Fix Cygwin bug on maybe_command();
if ($^O eq 'cygwin') {
require ExtUtils::MM_Cygwin;
- if (!defined(&ExtUtils::MM_Cygwin::maybe_command)) {
+ require ExtUtils::MM_Win32;
+ if ( ! defined(&ExtUtils::MM_Cygwin::maybe_command) ) {
*ExtUtils::MM_Cygwin::maybe_command = sub {
my ($self, $file) = @_;
- if ($file =~ m{^/cygdrive/}i) {
+ if ($file =~ m{^/cygdrive/}i and ExtUtils::MM_Win32->can('maybe_command')) {
ExtUtils::MM_Win32->maybe_command($file);
}
else {
- $self->SUPER::maybe_command($file);
+ ExtUtils::MM_Unix->maybe_command($file);
}
}
}
Modified: jifty/trunk/inc/Module/Install/Fetch.pm
==============================================================================
--- jifty/trunk/inc/Module/Install/Fetch.pm (original)
+++ jifty/trunk/inc/Module/Install/Fetch.pm Wed Feb 8 19:15:29 2006
@@ -1,6 +1,8 @@
#line 1 "inc/Module/Install/Fetch.pm - /usr/lib/perl5/site_perl/5.8.7/Module/Install/Fetch.pm"
package Module::Install::Fetch;
-use Module::Install::Base; @ISA = qw(Module::Install::Base);
+
+use Module::Install::Base;
+ at ISA = qw(Module::Install::Base);
$VERSION = '0.01';
@@ -9,7 +11,7 @@
my ($scheme, $host, $path, $file) =
$args{url} =~ m|^(\w+)://([^/]+)(.+)/(.+)| or return;
- if ($scheme eq 'http' and !eval { require LWP::Simple; 1 }) {
+ if ( $scheme eq 'http' and ! eval { require LWP::Simple; 1 } ) {
$args{url} = $args{ftp_url}
or (warn("LWP support unavailable!\n"), return);
($scheme, $host, $path, $file) =
Modified: jifty/trunk/inc/Module/Install/Include.pm
==============================================================================
--- jifty/trunk/inc/Module/Install/Include.pm (original)
+++ jifty/trunk/inc/Module/Install/Include.pm Wed Feb 8 19:15:29 2006
@@ -1,10 +1,12 @@
#line 1 "inc/Module/Install/Include.pm - /usr/lib/perl5/site_perl/5.8.7/Module/Install/Include.pm"
package Module::Install::Include;
-use Module::Install::Base; @ISA = qw(Module::Install::Base);
+
+use Module::Install::Base;
+ at ISA = qw(Module::Install::Base);
sub include { +shift->admin->include(@_) };
sub include_deps { +shift->admin->include_deps(@_) };
sub auto_include { +shift->admin->auto_include(@_) };
sub auto_include_deps { +shift->admin->auto_include_deps(@_) };
-
+sub auto_include_dependent_dists { +shift->admin->auto_include_dependent_dists(@_) }
1;
Modified: jifty/trunk/inc/Module/Install/Makefile.pm
==============================================================================
--- jifty/trunk/inc/Module/Install/Makefile.pm (original)
+++ jifty/trunk/inc/Module/Install/Makefile.pm Wed Feb 8 19:15:29 2006
@@ -1,6 +1,8 @@
#line 1 "inc/Module/Install/Makefile.pm - /usr/lib/perl5/site_perl/5.8.7/Module/Install/Makefile.pm"
package Module::Install::Makefile;
-use Module::Install::Base; @ISA = qw(Module::Install::Base);
+
+use Module::Install::Base;
+ at ISA = qw(Module::Install::Base);
$VERSION = '0.01';
@@ -154,4 +156,4 @@
__END__
-#line 286
+#line 288
Modified: jifty/trunk/inc/Module/Install/Metadata.pm
==============================================================================
--- jifty/trunk/inc/Module/Install/Metadata.pm (original)
+++ jifty/trunk/inc/Module/Install/Metadata.pm Wed Feb 8 19:15:29 2006
@@ -1,14 +1,12 @@
#line 1 "inc/Module/Install/Metadata.pm - /usr/lib/perl5/site_perl/5.8.7/Module/Install/Metadata.pm"
package Module::Install::Metadata;
-use strict 'vars';
use Module::Install::Base;
+ at ISA = qw{Module::Install::Base};
-use vars qw($VERSION @ISA);
-BEGIN {
- $VERSION = '0.06';
- @ISA = 'Module::Install::Base';
-}
+$VERSION = '0.06';
+
+use strict 'vars';
my @scalar_keys = qw{
name module_name abstract author version license
Modified: jifty/trunk/inc/Module/Install/Scripts.pm
==============================================================================
--- jifty/trunk/inc/Module/Install/Scripts.pm (original)
+++ jifty/trunk/inc/Module/Install/Scripts.pm Wed Feb 8 19:15:29 2006
@@ -1,7 +1,11 @@
#line 1 "inc/Module/Install/Scripts.pm - /usr/lib/perl5/site_perl/5.8.7/Module/Install/Scripts.pm"
package Module::Install::Scripts;
-use Module::Install::Base; @ISA = qw(Module::Install::Base);
+
+use Module::Install::Base;
+ at ISA = qw(Module::Install::Base);
+
$VERSION = '0.02';
+
use strict;
use File::Basename ();
Modified: jifty/trunk/inc/Module/Install/Share.pm
==============================================================================
--- jifty/trunk/inc/Module/Install/Share.pm (original)
+++ jifty/trunk/inc/Module/Install/Share.pm Wed Feb 8 19:15:29 2006
@@ -4,27 +4,28 @@
use Module::Install::Base;
@ISA = qw(Module::Install::Base);
-$VERSION = '0.01';
+$VERSION = '0.02';
use strict;
sub install_share {
- my $self = shift;
- my $dir = shift;
+ my ($self, $dir) = @_;
if ( ! defined $dir ) {
die "Cannot find the 'share' directory" unless -d 'share';
$dir = 'share';
}
- $self->postamble(<<".");
+ $self->postamble(<<"END_MAKEFILE");
config ::
\t\$(NOECHO) \$(MOD_INSTALL) \\
-\t\t\"$dir\" \$(INST_ARCHAUTODIR)
+\t\t\"$dir\" \$(INST_AUTODIR)
-.
+END_MAKEFILE
}
+1;
+
__END__
-#line 62
+#line 65
Modified: jifty/trunk/inc/Module/Install/Win32.pm
==============================================================================
--- jifty/trunk/inc/Module/Install/Win32.pm (original)
+++ jifty/trunk/inc/Module/Install/Win32.pm Wed Feb 8 19:15:29 2006
@@ -1,6 +1,8 @@
#line 1 "inc/Module/Install/Win32.pm - /usr/lib/perl5/site_perl/5.8.7/Module/Install/Win32.pm"
package Module::Install::Win32;
-use Module::Install::Base; @ISA = qw(Module::Install::Base);
+
+use Module::Install::Base;
+ at ISA = qw(Module::Install::Base);
$VERSION = '0.02';
Modified: jifty/trunk/inc/Module/Install/WriteAll.pm
==============================================================================
--- jifty/trunk/inc/Module/Install/WriteAll.pm (original)
+++ jifty/trunk/inc/Module/Install/WriteAll.pm Wed Feb 8 19:15:29 2006
@@ -1,6 +1,8 @@
#line 1 "inc/Module/Install/WriteAll.pm - /usr/lib/perl5/site_perl/5.8.7/Module/Install/WriteAll.pm"
package Module::Install::WriteAll;
-use Module::Install::Base; @ISA = qw(Module::Install::Base);
+
+use Module::Install::Base;
+ at ISA = qw(Module::Install::Base);
sub WriteAll {
my $self = shift;
More information about the Jifty-commit
mailing list