diff options
Diffstat (limited to 'lib/ExtUtils/Manifest.pm')
| -rw-r--r-- | lib/ExtUtils/Manifest.pm | 93 |
1 files changed, 65 insertions, 28 deletions
diff --git a/lib/ExtUtils/Manifest.pm b/lib/ExtUtils/Manifest.pm index 4d9a5de245..f276a1f885 100644 --- a/lib/ExtUtils/Manifest.pm +++ b/lib/ExtUtils/Manifest.pm @@ -10,16 +10,16 @@ use strict; our ($VERSION,@ISA,@EXPORT_OK, $Is_MacOS,$Is_VMS, - $Debug,$Verbose,$Quiet,$MANIFEST,$found,$DEFAULT_MSKIP); + $Debug,$Verbose,$Quiet,$MANIFEST,$DEFAULT_MSKIP); -$VERSION = 1.35_00; +$VERSION = 1.37_01; @ISA=('Exporter'); @EXPORT_OK = ('mkmanifest', 'manicheck', 'fullcheck', 'filecheck', 'skipcheck', 'maniread', 'manicopy'); $Is_MacOS = $^O eq 'MacOS'; $Is_VMS = $^O eq 'VMS'; -if ($Is_VMS) { require File::Basename } +require VMS::Filespec if $Is_VMS; $Debug = $ENV{PERL_MM_MANIFEST_DEBUG} || 0; $Verbose = 1; @@ -40,14 +40,19 @@ sub mkmanifest { local *M; rename $MANIFEST, "$MANIFEST.bak" unless $manimiss; open M, ">$MANIFEST" or die "Could not open $MANIFEST: $!"; - my $matches = _maniskip(); + my $skip = _maniskip(); my $found = manifind(); my($key,$val,$file,%all); %all = (%$found, %$read); $all{$MANIFEST} = ($Is_VMS ? "$MANIFEST\t\t" : '') . 'This list of files' if $manimiss; # add new MANIFEST to known file list foreach $file (sort keys %all) { - next if &$matches($file); + if ($skip->($file)) { + # Policy: only remove files if they're listed in MANIFEST.SKIP. + # Don't remove files just because they don't exist. + warn "Removed from $MANIFEST: $file\n" if $Verbose and exists $read->{$file}; + next; + } if ($Verbose){ warn "Added to $MANIFEST: $file\n" unless exists $read->{$file}; } @@ -62,16 +67,44 @@ sub mkmanifest { close M; } +# Geez, shouldn't this use File::Spec or File::Basename or something? +# Why so careful about dependencies? +sub clean_up_filename { + my $filename = shift; + $filename =~ s|^\./||; + $filename =~ s/^:([^:]+)$/$1/ if $Is_MacOS; + return $filename; +} + sub manifind { - local $found = {}; - find(sub {return if -d $_; - (my $name = $File::Find::name) =~ s|^\./||; - $name =~ s/^:([^:]+)$/$1/ if $Is_MacOS; - warn "Debug: diskfile $name\n" if $Debug; - $name =~ s#(.*)\.$#\L$1# if $Is_VMS; - $name = uc($name) if /^MANIFEST/i && $Is_VMS; - $found->{$name} = "";}, $Is_MacOS ? ":" : "."); - $found; + my $p = shift || {}; + my $skip = _maniskip(warn => $p->{warn_on_skip}); + my $found = {}; + + my $wanted = sub { + my $name = clean_up_filename($File::Find::name); + warn "Debug: diskfile $name\n" if $Debug; + return if $skip->($name) or -d $name; + + if( $Is_VMS ) { + $name =~ s#(.*)\.$#\L$1#; + $name = uc($name) if $name =~ /^MANIFEST(\.SKIP)?$/i; + } + $found->{$name} = ""; + }; + + # We have to use "$File::Find::dir/$_" in preprocess, because + # $File::Find::name is unavailable. + # Also, it's okay to use / here, because MANIFEST files use Unix-style + # paths. + find({wanted => $wanted, + preprocess => + sub {grep {!$skip->( clean_up_filename("$File::Find::dir/$_") )} @_}, + no_chdir => 1, + }, + $Is_MacOS ? ":" : "."); + + return $found; } sub fullcheck { @@ -93,7 +126,8 @@ sub skipcheck { sub _manicheck { my($p) = @_; my $read = maniread(); - my $found = manifind(); + my $found = manifind($p); + my $file; my $dosnames=(defined(&Dos::UseLFN) && Dos::UseLFN()==0); my(@missfile,@missentry); @@ -151,6 +185,7 @@ sub maniread { $file =~ s/\\([0-3][0-7][0-7])/sprintf("%c", oct($1))/ge; } elsif ($Is_VMS) { + require File::Basename; my($base,$dir) = File::Basename::fileparse($file); # Resolve illegal file specifications in the same way as tar $dir =~ tr/./_/; @@ -159,7 +194,7 @@ sub maniread { my $okfile = "$dir$base"; warn "Debug: Illegal name $file changed to $okfile\n" if $Debug; $file = $okfile; - $file = lc($file) unless $file =~ /^MANIFEST/i; + $file = lc($file) unless $file =~ /^MANIFEST(\.SKIP)?$/; } $read->{$file} = $comment; @@ -170,12 +205,12 @@ sub maniread { # returns an anonymous sub that decides if an argument matches sub _maniskip { - my ($mfile) = @_; - my $matches = sub {0}; + my (%args) = @_; + my @skip ; - $mfile ||= "$MANIFEST.SKIP"; + my $mfile ||= "$MANIFEST.SKIP"; local *M; - open M, $mfile or open M, $DEFAULT_MSKIP or return $matches; + open M, $mfile or open M, $DEFAULT_MSKIP or return sub {0}; while (<M>){ chomp; next if /^#/; @@ -183,14 +218,16 @@ sub _maniskip { push @skip, _macify($_); } close M; - my $opts = $Is_VMS ? 'oi ' : 'o '; - my $sub = "\$matches = " - . "sub { my(\$arg)=\@_; return 1 if " - . join (" || ", (map {s!/!\\/!g; "\$arg =~ m/$_/$opts"} @skip), 0) - . " }"; - eval $sub; - print "Debug: $sub\n" if $Debug; - $matches; + my $opts = $Is_VMS ? '(?i)' : ''; + + # Make sure each entry is isolated in its own parentheses, in case + # any of them contain alternations + my $regex = join '|', map "(?:$_)", @skip; + + return ($args{warn} + ? sub { $_[0] =~ qr{$opts$regex} && warn "Skipping $_[0]\n" } + : sub { $_[0] =~ qr{$opts$regex} } + ); } sub manicopy { |