diff options
author | Chris 'BinGOs' Williams <chris@bingosnet.co.uk> | 2010-06-29 15:14:15 +0100 |
---|---|---|
committer | Chris 'BinGOs' Williams <chris@bingosnet.co.uk> | 2010-06-29 16:11:56 +0100 |
commit | 40c9afb285aadac3203714fd5da54bc20a6a1535 (patch) | |
tree | d23e39509e0db36ad256db3cffa5843978ed1912 /cpan/Module-Build/lib/Module/Build/Base.pm | |
parent | 175dcccfb62b30facb2b6aa0185dde20a805b549 (diff) | |
download | perl-40c9afb285aadac3203714fd5da54bc20a6a1535.tar.gz |
Update Module-Build to CPAN version 0.3607
[DELTA]
0.3607 - Thu Apr 1 11:27:16 EDT 2010
Bug fixes:
- The 'dist' action now always ensures a clean dist directory before
creating the tarball [David Golden]
0.36_06 - Thu Apr 1 01:23:58 EDT 2010
Other:
- Migrated repository to git and updated META.yml to match
- Removed bugtracker URL (let search.cpan.org use default)
- Disabled SIGNATURE generation
0.3605 - Wed Mar 31 12:05:11 EDT 2010
- No changes from 0.36_04
0.36_04 - Tue Mar 16 21:41:41 EDT 2010
Bug fixes:
- Added missing newline to "Changing sharpbang" messages under verbose
output (RT#54474) [David Golden]
- Added 'beos' to list of Unix-like os types (RT#53876) [Nigel Horne]
- Sets $ENV{HOME} to a temporary directory during testing [David Golden]
- For VMS: fixed prefix handling plus other test fixes [Craig Berry]
- Support anonymous array of directories for c_source [Alberto Sim<C3><B5>es]
- Small POD formatting fix [James Keenan]
Diffstat (limited to 'cpan/Module-Build/lib/Module/Build/Base.pm')
-rw-r--r-- | cpan/Module-Build/lib/Module/Build/Base.pm | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/cpan/Module-Build/lib/Module/Build/Base.pm b/cpan/Module-Build/lib/Module/Build/Base.pm index 5bd8ec72a5..45205e8abf 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.3603'; +$VERSION = '0.3607'; $VERSION = eval $VERSION; BEGIN { require 5.00503 } @@ -2728,11 +2728,19 @@ sub process_support_files { my $p = $self->{properties}; return unless $p->{c_source}; - push @{$p->{include_dirs}}, $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|\+\+)?$')); + } - 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); } } @@ -2934,7 +2942,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"); + $self->log_verbose("Changing sharpbang in $file to $interpreter\n"); my $shb = ''; $shb .= $c->get('sharpbang')."$interpreter $arg\n" if $does_shbang; @@ -3513,7 +3521,8 @@ sub ACTION_pardist { sub ACTION_dist { my ($self) = @_; - $self->depends_on('distdir'); + # MUST dispatch() and not depends_ok() so we generate a clean distdir + $self->dispatch('distdir'); my $dist_dir = $self->dist_dir; @@ -4385,6 +4394,8 @@ 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) = @_; |