[Jifty-commit] r582 - jifty/trunk jifty/trunk/inc/Module
jifty/trunk/lib
jifty-commit at lists.jifty.org
jifty-commit at lists.jifty.org
Mon Feb 13 23:05:27 EST 2006
Author: jesse
Date: Mon Feb 13 23:05:24 2006
New Revision: 582
Modified:
/ (props changed)
jifty/trunk/ (props changed)
jifty/trunk/META.yml
jifty/trunk/inc/Module/AutoInstall.pm
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
jifty/trunk/lib/Jifty.pm
Log:
r23705 at truegrounds: jesse | 2006-02-13 23:03:07 -0500
* Version bump
Modified: jifty/trunk/META.yml
==============================================================================
--- jifty/trunk/META.yml (original)
+++ jifty/trunk/META.yml Mon Feb 13 23:05:24 2006
@@ -1,5 +1,5 @@
distribution_type: module
-generated_by: Module::Install version 0.550
+generated_by: Module::Install version 0.520
license: unknown
name: Jifty
no_index:
Modified: jifty/trunk/inc/Module/AutoInstall.pm
==============================================================================
--- jifty/trunk/inc/Module/AutoInstall.pm (original)
+++ jifty/trunk/inc/Module/AutoInstall.pm Mon Feb 13 23:05:24 2006
@@ -1,4 +1,4 @@
-#line 1 "inc/Module/AutoInstall.pm - /usr/lib/perl5/site_perl/5.8.7/Module/AutoInstall.pm"
+#line 1 "inc/Module/AutoInstall.pm - /usr/local/share/perl/5.8.7/Module/AutoInstall.pm"
package Module::AutoInstall;
$Module::AutoInstall::VERSION = '1.01';
Modified: jifty/trunk/inc/Module/Install.pm
==============================================================================
--- jifty/trunk/inc/Module/Install.pm (original)
+++ jifty/trunk/inc/Module/Install.pm Mon Feb 13 23:05:24 2006
@@ -1,4 +1,4 @@
-#line 1 "/home/chmrr/work/rt/local/jifty/inc/Module/Install.pm - /usr/lib/perl5/site_perl/5.8.7/Module/Install.pm"
+#line 1 "/home/jesse/svk/jifty.org/jifty/trunk/inc/Module/Install.pm - /usr/local/share/perl/5.8.7/Module/Install.pm"
package Module::Install;
use 5.004;
@@ -6,7 +6,7 @@
use vars qw{$VERSION};
BEGIN {
# Don't forget to update Module::Install::Admin too!
- $VERSION = '0.55';
+ $VERSION = '0.52';
}
# 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 Mon Feb 13 23:05:24 2006
@@ -1,8 +1,6 @@
-#line 1 "inc/Module/Install/AutoInstall.pm - /usr/lib/perl5/site_perl/5.8.7/Module/Install/AutoInstall.pm"
+#line 1 "inc/Module/Install/AutoInstall.pm - /usr/local/share/perl/5.8.7/Module/Install/AutoInstall.pm"
package Module::Install::AutoInstall;
-
-use Module::Install::Base;
- at ISA = qw{Module::Install::Base};
+use Module::Install::Base; @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 Mon Feb 13 23:05:24 2006
@@ -1,13 +1,10 @@
-#line 1 "inc/Module/Install/Base.pm - /usr/lib/perl5/site_perl/5.8.7/Module/Install/Base.pm"
+#line 1 "inc/Module/Install/Base.pm - /usr/local/share/perl/5.8.7/Module/Install/Base.pm"
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 36
+#line 30
sub new {
my ($class, %args) = @_;
@@ -21,7 +18,7 @@
bless(\%args, $class);
}
-#line 56
+#line 48
sub AUTOLOAD {
my $self = shift;
@@ -31,18 +28,20 @@
goto &$autoload;
}
-#line 72
+#line 62
sub _top { $_[0]->{_top} }
-#line 85
+#line 73
sub admin {
- $_[0]->_top->{admin} or Module::Install::Base::FakeAdmin->new;
+ my $self = shift;
+ $self->_top->{admin} or Module::Install::Base::FakeAdmin->new;
}
sub is_admin {
- $_[0]->admin->VERSION;
+ my $self = shift;
+ $self->admin->VERSION;
}
sub DESTROY {}
@@ -51,16 +50,14 @@
my $Fake;
sub new { $Fake ||= bless(\@_, $_[0]) }
-
sub AUTOLOAD {}
-
sub DESTROY {}
+1;
+
# Restore warning handler
-BEGIN {
- $SIG{__WARN__} = $SIG{__WARN__}->();
-}
+BEGIN { $SIG{__WARN__} = $SIG{__WARN__}->() };
-1;
+__END__
-#line 134
+#line 120
Modified: jifty/trunk/inc/Module/Install/Can.pm
==============================================================================
--- jifty/trunk/inc/Module/Install/Can.pm (original)
+++ jifty/trunk/inc/Module/Install/Can.pm Mon Feb 13 23:05:24 2006
@@ -1,9 +1,6 @@
-#line 1 "inc/Module/Install/Can.pm - /usr/lib/perl5/site_perl/5.8.7/Module/Install/Can.pm"
+#line 1 "inc/Module/Install/Can.pm - /usr/local/share/perl/5.8.7/Module/Install/Can.pm"
package Module::Install::Can;
-
-use Module::Install::Base;
- at ISA = qw(Module::Install::Base);
-
+use Module::Install::Base; @ISA = qw(Module::Install::Base);
$VERSION = '0.01';
use strict;
@@ -56,14 +53,14 @@
if ($^O eq 'cygwin') {
require ExtUtils::MM_Cygwin;
require ExtUtils::MM_Win32;
- if ( ! defined(&ExtUtils::MM_Cygwin::maybe_command) ) {
+ if (!defined(&ExtUtils::MM_Cygwin::maybe_command)) {
*ExtUtils::MM_Cygwin::maybe_command = sub {
my ($self, $file) = @_;
- if ($file =~ m{^/cygdrive/}i and ExtUtils::MM_Win32->can('maybe_command')) {
+ if ($file =~ m{^/cygdrive/}i) {
ExtUtils::MM_Win32->maybe_command($file);
}
else {
- ExtUtils::MM_Unix->maybe_command($file);
+ $self->SUPER::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 Mon Feb 13 23:05:24 2006
@@ -1,8 +1,6 @@
-#line 1 "inc/Module/Install/Fetch.pm - /usr/lib/perl5/site_perl/5.8.7/Module/Install/Fetch.pm"
+#line 1 "inc/Module/Install/Fetch.pm - /usr/local/share/perl/5.8.7/Module/Install/Fetch.pm"
package Module::Install::Fetch;
-
-use Module::Install::Base;
- at ISA = qw(Module::Install::Base);
+use Module::Install::Base; @ISA = qw(Module::Install::Base);
$VERSION = '0.01';
@@ -11,7 +9,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 Mon Feb 13 23:05:24 2006
@@ -1,8 +1,6 @@
-#line 1 "inc/Module/Install/Include.pm - /usr/lib/perl5/site_perl/5.8.7/Module/Install/Include.pm"
+#line 1 "inc/Module/Install/Include.pm - /usr/local/share/perl/5.8.7/Module/Install/Include.pm"
package Module::Install::Include;
-
-use Module::Install::Base;
- at ISA = qw(Module::Install::Base);
+use Module::Install::Base; @ISA = qw(Module::Install::Base);
sub include { +shift->admin->include(@_) };
sub include_deps { +shift->admin->include_deps(@_) };
Modified: jifty/trunk/inc/Module/Install/Makefile.pm
==============================================================================
--- jifty/trunk/inc/Module/Install/Makefile.pm (original)
+++ jifty/trunk/inc/Module/Install/Makefile.pm Mon Feb 13 23:05:24 2006
@@ -1,8 +1,6 @@
-#line 1 "inc/Module/Install/Makefile.pm - /usr/lib/perl5/site_perl/5.8.7/Module/Install/Makefile.pm"
+#line 1 "inc/Module/Install/Makefile.pm - /usr/local/share/perl/5.8.7/Module/Install/Makefile.pm"
package Module::Install::Makefile;
-
-use Module::Install::Base;
- at ISA = qw(Module::Install::Base);
+use Module::Install::Base; @ISA = qw(Module::Install::Base);
$VERSION = '0.01';
@@ -156,4 +154,4 @@
__END__
-#line 288
+#line 286
Modified: jifty/trunk/inc/Module/Install/Metadata.pm
==============================================================================
--- jifty/trunk/inc/Module/Install/Metadata.pm (original)
+++ jifty/trunk/inc/Module/Install/Metadata.pm Mon Feb 13 23:05:24 2006
@@ -1,12 +1,14 @@
-#line 1 "inc/Module/Install/Metadata.pm - /usr/lib/perl5/site_perl/5.8.7/Module/Install/Metadata.pm"
+#line 1 "inc/Module/Install/Metadata.pm - /usr/local/share/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};
-
-$VERSION = '0.06';
-use strict 'vars';
+use vars qw($VERSION @ISA);
+BEGIN {
+ $VERSION = '0.06';
+ @ISA = 'Module::Install::Base';
+}
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 Mon Feb 13 23:05:24 2006
@@ -1,11 +1,7 @@
-#line 1 "inc/Module/Install/Scripts.pm - /usr/lib/perl5/site_perl/5.8.7/Module/Install/Scripts.pm"
+#line 1 "inc/Module/Install/Scripts.pm - /usr/local/share/perl/5.8.7/Module/Install/Scripts.pm"
package Module::Install::Scripts;
-
-use Module::Install::Base;
- at ISA = qw(Module::Install::Base);
-
+use Module::Install::Base; @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 Mon Feb 13 23:05:24 2006
@@ -1,31 +1,30 @@
-#line 1 "inc/Module/Install/Share.pm - /usr/lib/perl5/site_perl/5.8.7/Module/Install/Share.pm"
+#line 1 "inc/Module/Install/Share.pm - /usr/local/share/perl/5.8.7/Module/Install/Share.pm"
package Module::Install::Share;
use Module::Install::Base;
@ISA = qw(Module::Install::Base);
-$VERSION = '0.02';
+$VERSION = '0.01';
use strict;
sub install_share {
- my ($self, $dir) = @_;
+ my $self = shift;
+ my $dir = shift;
if ( ! defined $dir ) {
die "Cannot find the 'share' directory" unless -d 'share';
$dir = 'share';
}
- $self->postamble(<<"END_MAKEFILE");
+ $self->postamble(<<".");
config ::
\t\$(NOECHO) \$(MOD_INSTALL) \\
-\t\t\"$dir\" \$(INST_AUTODIR)
+\t\t\"$dir\" \$(INST_ARCHAUTODIR)
-END_MAKEFILE
+.
}
-1;
-
__END__
-#line 65
+#line 62
Modified: jifty/trunk/inc/Module/Install/Win32.pm
==============================================================================
--- jifty/trunk/inc/Module/Install/Win32.pm (original)
+++ jifty/trunk/inc/Module/Install/Win32.pm Mon Feb 13 23:05:24 2006
@@ -1,8 +1,6 @@
-#line 1 "inc/Module/Install/Win32.pm - /usr/lib/perl5/site_perl/5.8.7/Module/Install/Win32.pm"
+#line 1 "inc/Module/Install/Win32.pm - /usr/local/share/perl/5.8.7/Module/Install/Win32.pm"
package Module::Install::Win32;
-
-use Module::Install::Base;
- at ISA = qw(Module::Install::Base);
+use Module::Install::Base; @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 Mon Feb 13 23:05:24 2006
@@ -1,8 +1,6 @@
-#line 1 "inc/Module/Install/WriteAll.pm - /usr/lib/perl5/site_perl/5.8.7/Module/Install/WriteAll.pm"
+#line 1 "inc/Module/Install/WriteAll.pm - /usr/local/share/perl/5.8.7/Module/Install/WriteAll.pm"
package Module::Install::WriteAll;
-
-use Module::Install::Base;
- at ISA = qw(Module::Install::Base);
+use Module::Install::Base; @ISA = qw(Module::Install::Base);
sub WriteAll {
my $self = shift;
Modified: jifty/trunk/lib/Jifty.pm
==============================================================================
--- jifty/trunk/lib/Jifty.pm (original)
+++ jifty/trunk/lib/Jifty.pm Mon Feb 13 23:05:24 2006
@@ -3,7 +3,7 @@
package Jifty;
-our $VERSION = '0.51228';
+our $VERSION = '0.60213';
=head1 NAME
More information about the Jifty-commit
mailing list