[Rt-commit] r5410 - in Number-RecordLocator: inc/Module inc/Module/Install

trs at bestpractical.com trs at bestpractical.com
Tue Jun 20 13:14:07 EDT 2006


Author: trs
Date: Tue Jun 20 13:14:06 2006
New Revision: 5410

Removed:
   Number-RecordLocator/Makefile
Modified:
   Number-RecordLocator/   (props changed)
   Number-RecordLocator/META.yml
   Number-RecordLocator/inc/Module/Install.pm
   Number-RecordLocator/inc/Module/Install/Base.pm
   Number-RecordLocator/inc/Module/Install/Can.pm
   Number-RecordLocator/inc/Module/Install/Fetch.pm
   Number-RecordLocator/inc/Module/Install/Makefile.pm
   Number-RecordLocator/inc/Module/Install/Metadata.pm
   Number-RecordLocator/inc/Module/Install/Win32.pm
   Number-RecordLocator/inc/Module/Install/WriteAll.pm

Log:
 r13264 at zot:  tom | 2006-06-20 13:10:03 -0400
 * Remove Makefile from versioning
 * Update Module::Install


Modified: Number-RecordLocator/META.yml
==============================================================================
--- Number-RecordLocator/META.yml	(original)
+++ Number-RecordLocator/META.yml	Tue Jun 20 13:14:06 2006
@@ -3,7 +3,7 @@
 build_requires: 
   Test::More: 0
 distribution_type: module
-generated_by: Module::Install version 0.61
+generated_by: Module::Install version 0.62
 license: perl
 name: Number-RecordLocator
 no_index: 

Modified: Number-RecordLocator/inc/Module/Install.pm
==============================================================================
--- Number-RecordLocator/inc/Module/Install.pm	(original)
+++ Number-RecordLocator/inc/Module/Install.pm	Tue Jun 20 13:14:06 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: Number-RecordLocator/inc/Module/Install/Base.pm
==============================================================================
--- Number-RecordLocator/inc/Module/Install/Base.pm	(original)
+++ Number-RecordLocator/inc/Module/Install/Base.pm	Tue Jun 20 13:14:06 2006
@@ -1,7 +1,7 @@
 #line 1
 package Module::Install::Base;
 
-$VERSION = '0.61';
+$VERSION = '0.62';
 
 # Suspend handler for "redefined" warnings
 BEGIN {

Modified: Number-RecordLocator/inc/Module/Install/Can.pm
==============================================================================
--- Number-RecordLocator/inc/Module/Install/Can.pm	(original)
+++ Number-RecordLocator/inc/Module/Install/Can.pm	Tue Jun 20 13:14:06 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: Number-RecordLocator/inc/Module/Install/Fetch.pm
==============================================================================
--- Number-RecordLocator/inc/Module/Install/Fetch.pm	(original)
+++ Number-RecordLocator/inc/Module/Install/Fetch.pm	Tue Jun 20 13:14:06 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: Number-RecordLocator/inc/Module/Install/Makefile.pm
==============================================================================
--- Number-RecordLocator/inc/Module/Install/Makefile.pm	(original)
+++ Number-RecordLocator/inc/Module/Install/Makefile.pm	Tue Jun 20 13:14:06 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: Number-RecordLocator/inc/Module/Install/Metadata.pm
==============================================================================
--- Number-RecordLocator/inc/Module/Install/Metadata.pm	(original)
+++ Number-RecordLocator/inc/Module/Install/Metadata.pm	Tue Jun 20 13:14:06 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: Number-RecordLocator/inc/Module/Install/Win32.pm
==============================================================================
--- Number-RecordLocator/inc/Module/Install/Win32.pm	(original)
+++ Number-RecordLocator/inc/Module/Install/Win32.pm	Tue Jun 20 13:14:06 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: Number-RecordLocator/inc/Module/Install/WriteAll.pm
==============================================================================
--- Number-RecordLocator/inc/Module/Install/WriteAll.pm	(original)
+++ Number-RecordLocator/inc/Module/Install/WriteAll.pm	Tue Jun 20 13:14:06 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 Rt-commit mailing list