Revert "Update Module-Build to CPAN version 0.3607"

This reverts commit 8f4d46e2e6b66d00df1e347dab564fd9799c8d94.

Way too much breakage for me to sanely resolve. Will leave it to
Dave Golden to try and integrate it

Signed-off-by: Chris 'BinGOs' Williams <chris@bingosnet.co.uk>

1 files changed, 6 insertions, 17 deletions

diff --git a/cpan/Module-Build/lib/Module/Build/Base.pm b/cpan/Module-Build/lib/Module/Build/Base.pm
index 45205e8abf..5bd8ec72a5 100644
--- a/cpan/Module-Build/lib/Module/Build/Base.pm
+++ b/cpan/Module-Build/lib/Module/Build/Base.pm
@@ -4,7 +4,7 @@ package Module::Build::Base;
 
 use strict;
 use vars qw($VERSION);
-$VERSION = '0.3607';
+$VERSION = '0.3603';
 $VERSION = eval $VERSION;
 BEGIN { require 5.00503 }
 
@@ -2728,19 +2728,11 @@ sub process_support_files {
   my $p = $self->{properties};
   return unless $p->{c_source};
 
-  my $files;
-  if (ref($p->{c_source}) eq "ARRAY") {
-      push @{$p->{include_dirs}}, @{$p->{c_source}};
-      for my $path (@{$p->{c_source}}) {
-          push @$files, @{ $self->rscan_dir($path, file_qr('\.c(c|p|pp|xx|\+\+)?$')) };
-      }
-  } else {
-      push @{$p->{include_dirs}}, $p->{c_source};
-      $files = $self->rscan_dir($p->{c_source}, file_qr('\.c(c|p|pp|xx|\+\+)?$'));
-  }
+  push @{$p->{include_dirs}}, $p->{c_source};
 
+  my $files = $self->rscan_dir($p->{c_source}, file_qr('\.c(c|p|pp|xx|\+\+)?$'));
   foreach my $file (@$files) {
-      push @{$p->{objects}}, $self->compile_c($file);
+    push @{$p->{objects}}, $self->compile_c($file);
   }
 }
 
@@ -2942,7 +2934,7 @@ sub fix_shebang_line { # Adapted from fixin() in ExtUtils::MM_Unix 1.35
     next unless $cmd =~ /perl/i;
     my $interpreter = $self->{properties}{perl};
 
-    $self->log_verbose("Changing sharpbang in $file to $interpreter\n");
+    $self->log_verbose("Changing sharpbang in $file to $interpreter");
     my $shb = '';
     $shb .= $c->get('sharpbang')."$interpreter $arg\n" if $does_shbang;
 
@@ -3521,8 +3513,7 @@ sub ACTION_pardist {
 sub ACTION_dist {
   my ($self) = @_;
 
-  # MUST dispatch() and not depends_ok() so we generate a clean distdir
-  $self->dispatch('distdir');
+  $self->depends_on('distdir');
 
   my $dist_dir = $self->dist_dir;
 
@@ -4394,8 +4385,6 @@ sub find_dist_packages {
   return $self->find_packages_in_files(\@pm_files, \%dist_files);
 }
 
-# XXX Do not document this function; mst wrote it and now says the API is
-# stupid and needs to be fixed and it shouldn't become a public API until then
 sub find_packages_in_files {
   my ($self, $file_list, $filename_map) = @_;