[svn:Module-Build] r10222 - Module-Build/trunk/lib/Module/Build

[ericwilhelm]

Author: ericwilhelm
Date: Sun Nov 11 11:27:03 2007
New Revision: 10222

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

Log:
lib/Module/Build/Base.pm       - create MI object with module_name too (if we 
have it)
lib/Module/Build/ModuleInfo.pm - allow explicit 'module' parameter


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 Sun Nov 11 11:27:03 2007
@@ -958,10 +958,13 @@
 
   return $p->{dist_version} if defined $p->{dist_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";
+  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";
     $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   Sun Nov 11 11:27:03 2007
@@ -73,7 +73,7 @@
   my %props = @_;
 
   my( %valid_props, @valid_props );
-  @valid_props = qw( collect_pod inc );
+  @valid_props = qw( collect_pod inc module );
   @[EMAIL PROTECTED] = delete( @[EMAIL PROTECTED] );
   warn "Unknown properties: @{[keys %props]}\n" if scalar( %props );