[Jifty-commit] r1017 - in jifty/trunk/inc/Module: .
jifty-commit at lists.jifty.org
jifty-commit at lists.jifty.org
Sun May 7 01:22:11 EDT 2006
Author: audreyt
Date: Sun May 7 01:22:09 2006
New Revision: 1017
Modified:
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:
* Update the inc tree to 0.62 for various fixes,
in particular improved share_dir compatibility.
Modified: jifty/trunk/inc/Module/Install.pm
==============================================================================
--- jifty/trunk/inc/Module/Install.pm (original)
+++ jifty/trunk/inc/Module/Install.pm Sun May 7 01:22:09 2006
@@ -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.61';
+ $VERSION = '0.62';
}
# Whether or not inc::Module::Install is actually loaded, the
@@ -116,7 +116,7 @@
my %seen;
foreach my $obj ( @exts ) {
while (my ($method, $glob) = each %{ref($obj) . '::'}) {
- next unless exists &{ref($obj).'::'.$method};
+ next unless $obj->can($method);
next if $method =~ /^_/;
next if $method eq uc($method);
$seen{$method}++;
Modified: jifty/trunk/inc/Module/Install/AutoInstall.pm
==============================================================================
--- jifty/trunk/inc/Module/Install/AutoInstall.pm (original)
+++ jifty/trunk/inc/Module/Install/AutoInstall.pm Sun May 7 01:22:09 2006
@@ -1,12 +1,15 @@
#line 1
package Module::Install::AutoInstall;
+use strict;
use Module::Install::Base;
- at ISA = qw{Module::Install::Base};
-
-$VERSION = '0.61';
-use strict;
+use vars qw{$VERSION $ISCORE @ISA};
+BEGIN {
+ $VERSION = '0.62';
+ $ISCORE = 1;
+ @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 Sun May 7 01:22:09 2006
@@ -1,7 +1,7 @@
#line 1
package Module::Install::Base;
-$VERSION = '0.61';
+$VERSION = '0.62';
# Suspend handler for "redefined" warnings
BEGIN {
Modified: jifty/trunk/inc/Module/Install/Can.pm
==============================================================================
--- jifty/trunk/inc/Module/Install/Can.pm (original)
+++ jifty/trunk/inc/Module/Install/Can.pm Sun May 7 01:22:09 2006
@@ -9,13 +9,13 @@
use File::Spec ();
use ExtUtils::MakeMaker ();
-use vars qw{$VERSION @ISA};
+use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.61';
+ $VERSION = '0.62';
+ $ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
-
# check if we can load some module
### Upgrade this to not have to load the module if possible
sub can_use {
Modified: jifty/trunk/inc/Module/Install/Fetch.pm
==============================================================================
--- jifty/trunk/inc/Module/Install/Fetch.pm (original)
+++ jifty/trunk/inc/Module/Install/Fetch.pm Sun May 7 01:22:09 2006
@@ -4,9 +4,10 @@
use strict;
use Module::Install::Base;
-use vars qw{$VERSION @ISA};
+use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.61';
+ $VERSION = '0.62';
+ $ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
Modified: jifty/trunk/inc/Module/Install/Include.pm
==============================================================================
--- jifty/trunk/inc/Module/Install/Include.pm (original)
+++ jifty/trunk/inc/Module/Install/Include.pm Sun May 7 01:22:09 2006
@@ -1,12 +1,15 @@
#line 1
package Module::Install::Include;
+use strict;
use Module::Install::Base;
- at ISA = qw(Module::Install::Base);
-
-$VERSION = '0.61';
-use strict;
+use vars qw{$VERSION $ISCORE @ISA};
+BEGIN {
+ $VERSION = '0.62';
+ $ISCORE = 1;
+ @ISA = qw{Module::Install::Base};
+}
sub include {
shift()->admin->include(@_);
Modified: jifty/trunk/inc/Module/Install/Makefile.pm
==============================================================================
--- jifty/trunk/inc/Module/Install/Makefile.pm (original)
+++ jifty/trunk/inc/Module/Install/Makefile.pm Sun May 7 01:22:09 2006
@@ -5,9 +5,10 @@
use Module::Install::Base;
use ExtUtils::MakeMaker ();
-use vars qw{$VERSION @ISA};
+use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.61';
+ $VERSION = '0.62';
+ $ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
@@ -168,6 +169,15 @@
$makefile =~ s/^(FULLPERL = .*)/$1 "-Iinc"/m;
$makefile =~ s/^(PERL = .*)/$1 "-Iinc"/m;
+ # Module::Install will never be used to build the Core Perl
+ # Sometimes PERL_LIB and PERL_ARCHLIB get written anyway, which breaks
+ # PREFIX/PERL5LIB, and thus, install_share. Blank them if they exist
+ $makefile =~ s/^PERL_LIB = .+/PERL_LIB =/m;
+ #$makefile =~ s/^PERL_ARCHLIB = .+/PERL_ARCHLIB =/m;
+
+ # Perl 5.005 mentions PERL_LIB explicitly, so we have to remove that as well.
+ $makefile =~ s/("?)-I\$\(PERL_LIB\)\1//g;
+
# XXX - This is currently unused; not sure if it breaks other MM-users
# $makefile =~ s/^pm_to_blib\s+:\s+/pm_to_blib :: /mg;
@@ -195,4 +205,4 @@
__END__
-#line 324
+#line 334
Modified: jifty/trunk/inc/Module/Install/Metadata.pm
==============================================================================
--- jifty/trunk/inc/Module/Install/Metadata.pm (original)
+++ jifty/trunk/inc/Module/Install/Metadata.pm Sun May 7 01:22:09 2006
@@ -1,12 +1,15 @@
#line 1
package Module::Install::Metadata;
+use strict 'vars';
use Module::Install::Base;
- at ISA = qw{Module::Install::Base};
-
-$VERSION = '0.61';
-use strict 'vars';
+use vars qw{$VERSION $ISCORE @ISA};
+BEGIN {
+ $VERSION = '0.62';
+ $ISCORE = 1;
+ @ISA = qw{Module::Install::Base};
+}
my @scalar_keys = qw{
name module_name abstract author version license
@@ -235,11 +238,13 @@
^
use \s*
v?
- ([\d\.]+)
+ ([\d_\.]+)
\s* ;
/ixms
)
{
+ my $v = $1;
+ $v =~ s{_}{}g;
$self->perl_version($1);
}
else {
Modified: jifty/trunk/inc/Module/Install/Scripts.pm
==============================================================================
--- jifty/trunk/inc/Module/Install/Scripts.pm (original)
+++ jifty/trunk/inc/Module/Install/Scripts.pm Sun May 7 01:22:09 2006
@@ -5,10 +5,11 @@
use Module::Install::Base;
use File::Basename ();
-use vars qw{$VERSION @ISA};
+use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.61';
- @ISA = qw(Module::Install::Base);
+ $VERSION = '0.62';
+ $ISCORE = 1;
+ @ISA = qw{Module::Install::Base};
}
sub prompt_script {
Modified: jifty/trunk/inc/Module/Install/Share.pm
==============================================================================
--- jifty/trunk/inc/Module/Install/Share.pm (original)
+++ jifty/trunk/inc/Module/Install/Share.pm Sun May 7 01:22:09 2006
@@ -1,32 +1,40 @@
#line 1
package Module::Install::Share;
+use strict;
+use Module::Install::Base;
+
+use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.61';
+ $VERSION = '0.62';
+ $ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
-use strict;
-use Module::Install::Base;
-
sub install_share {
- my ($self, $dir) = @_;
+ my ($self, $dir) = @_;
- if ( ! defined $dir ) {
- die "Cannot find the 'share' directory" unless -d 'share';
- $dir = 'share';
- }
+ if ( ! defined $dir ) {
+ die "Cannot find the 'share' directory" unless -d 'share';
+ $dir = 'share';
+ }
- $self->postamble(<<"END_MAKEFILE");
+ $self->postamble(<<"END_MAKEFILE");
config ::
\t\$(NOECHO) \$(MOD_INSTALL) \\
\t\t\"$dir\" \$(INST_AUTODIR)
END_MAKEFILE
+
+ # The above appears to behave incorrectly when used with old versions
+ # of ExtUtils::Install (known-bad on RHEL 3, with 5.8.0)
+ # So when we need to install a share directory, make sure we add a
+ # dependency on a moderately new version of ExtUtils::MakeMaker.
+ $self->build_requires( 'ExtUtils::MakeMaker' => '6.11' );
}
1;
__END__
-#line 90
+#line 98
Modified: jifty/trunk/inc/Module/Install/Win32.pm
==============================================================================
--- jifty/trunk/inc/Module/Install/Win32.pm (original)
+++ jifty/trunk/inc/Module/Install/Win32.pm Sun May 7 01:22:09 2006
@@ -4,9 +4,10 @@
use strict;
use Module::Install::Base;
-use vars qw{$VERSION @ISA};
+use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.61';
+ $VERSION = '0.62';
+ $ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
Modified: jifty/trunk/inc/Module/Install/WriteAll.pm
==============================================================================
--- jifty/trunk/inc/Module/Install/WriteAll.pm (original)
+++ jifty/trunk/inc/Module/Install/WriteAll.pm Sun May 7 01:22:09 2006
@@ -1,12 +1,15 @@
#line 1
package Module::Install::WriteAll;
+use strict;
use Module::Install::Base;
- at ISA = qw(Module::Install::Base);
-
-$VERSION = '0.61';
-use strict;
+use vars qw{$VERSION $ISCORE @ISA};
+BEGIN {
+ $VERSION = '0.62';
+ $ISCORE = 1;
+ @ISA = qw{Module::Install::Base};
+}
sub WriteAll {
my $self = shift;
More information about the Jifty-commit
mailing list