[svn:Module-Build] r11762 - in Module-Build/trunk: . lib/Module/Build t

[ericwilhelm]

Author: ericwilhelm
Date: Thu Sep 11 22:42:38 2008
New Revision: 11762

Modified:
   Module-Build/trunk/Changes
   Module-Build/trunk/lib/Module/Build/Base.pm
   Module-Build/trunk/lib/Module/Build/ModuleInfo.pm
   Module-Build/trunk/t/moduleinfo.t

Log:
** revert r10222, r10224 **


Modified: Module-Build/trunk/Changes
==============================================================================
--- Module-Build/trunk/Changes  (original)
+++ Module-Build/trunk/Changes  Thu Sep 11 22:42:38 2008
@@ -1,5 +1,9 @@
 Revision history for Perl extension Module::Build.
 
+0.2808_03
+
+ - Backed-out incompatible Module::Finder change (first in 0.2808_02.)
+
 0.2808_03 - Mon Sep  1 14:43:27 PDT 2008
 
  - Made adjustments for the format changes of recent Test::Harness

Modified: Module-Build/trunk/lib/Module/Build/Base.pm
==============================================================================
--- Module-Build/trunk/lib/Module/Build/Base.pm (original)
+++ Module-Build/trunk/lib/Module/Build/Base.pm Thu Sep 11 22:42:38 2008
@@ -965,13 +965,10 @@
 
   return $p->{dist_version} if defined $p->{dist_version};
 
-  if(my $file = $self->dist_version_from) {
-    my $mod = $self->module_name;
-    $file = File::Spec->catfile(split(qr{/}, $file));
-
-    my $pm_info = Module::Build::ModuleInfo->new_from_file(
-      $file, (defined($mod) ? (module => $mod) : ())
-    ) or die "Can't find file '$file' to determine version";
+  if ( my $dist_version_from = $self->dist_version_from ) {
+    my $version_from = File::Spec->catfile( split( qr{/}, $dist_version_from ) 
);
+    my $pm_info = Module::Build::ModuleInfo->new_from_file( $version_from )
+      or die "Can't find file $version_from to determine version";
     $p->{dist_version} = $pm_info->version();
   }
 

Modified: Module-Build/trunk/lib/Module/Build/ModuleInfo.pm
==============================================================================
--- Module-Build/trunk/lib/Module/Build/ModuleInfo.pm   (original)
+++ Module-Build/trunk/lib/Module/Build/ModuleInfo.pm   Thu Sep 11 22:42:38 2008
@@ -73,7 +73,7 @@
   my %props = @_;
 
   my( %valid_props, @valid_props );
-  @valid_props = qw( collect_pod inc module );
+  @valid_props = qw( collect_pod inc );
   @[EMAIL PROTECTED] = delete( @[EMAIL PROTECTED] );
   warn "Unknown properties: @{[keys %props]}\n" if scalar( %props );
 

Modified: Module-Build/trunk/t/moduleinfo.t
==============================================================================
--- Module-Build/trunk/t/moduleinfo.t   (original)
+++ Module-Build/trunk/t/moduleinfo.t   Thu Sep 11 22:42:38 2008
@@ -4,7 +4,7 @@
 
 use strict;
 use lib $ENV{PERL_CORE} ? '../lib/Module/Build/t/lib' : 't/lib';
-use MBTest tests => 87;
+use MBTest tests => 82;
 
 use_ok 'Module::Build::ModuleInfo';
 ensure_blib('Module::Build::ModuleInfo');
@@ -324,20 +324,6 @@
   $i++;
 }
 
-# check the 'explicit module' usage of new_from_file()
-($i, $n) = (1, scalar(@scripts) - 3);
-foreach my $script (@scripts[3 .. $#scripts]) {
-  $dist->change_file('bin/simple.plx', $script);
-  $dist->regen;
-  $pm_info = Module::Build::ModuleInfo->new_from_file(
-    File::Spec->catfile('bin', 'simple.plx'),
-    module => '_private',
-  );
-
-  is($pm_info->version, '999', "correct script version ($i of $n)");
-  $i++;
-}
-
 
 # examine properties of a module: name, pod, etc
 $dist->change_file( 'lib/Simple.pm', <<'---' );