X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FExtUtils%2FManifest.pm;h=806657946a05d5ee688dde0da6711120c889d04a;hb=8c7f0036c6170bb0e341d84874bdb51f472a6afb;hp=2d4d7e3e19630a9701099691966e589467fa8004;hpb=0e3309e278a56ec53ae7e503c90865065734f801;p=p5sagit%2Fp5-mst-13.2.git diff --git a/lib/ExtUtils/Manifest.pm b/lib/ExtUtils/Manifest.pm index 2d4d7e3..8066579 100644 --- a/lib/ExtUtils/Manifest.pm +++ b/lib/ExtUtils/Manifest.pm @@ -69,34 +69,35 @@ sub manifind { $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; } sub fullcheck { - _manicheck(3); + _manicheck({check_files => 1, check_MANIFEST => 1}); } sub manicheck { - return @{(_manicheck(1))[0]}; + return @{(_manicheck({check_files => 1}))[0]}; } sub filecheck { - return @{(_manicheck(2))[1]}; + return @{(_manicheck({check_MANIFEST => 1}))[1]}; } sub skipcheck { - _manicheck(6); + _manicheck({check_MANIFEST => 1, warn_on_skip => 1}); } sub _manicheck { - my($arg) = @_; + my($p) = @_; my $read = maniread(); my $found = manifind(); my $file; my $dosnames=(defined(&Dos::UseLFN) && Dos::UseLFN()==0); my(@missfile,@missentry); - if ($arg & 1){ + if ($p->{check_files}){ foreach $file (sort keys %$read){ warn "Debug: manicheck checking from $MANIFEST $file\n" if $Debug; if ($dosnames){ @@ -110,13 +111,12 @@ sub _manicheck { } } } - if ($arg & 2){ + if ($p->{check_MANIFEST}){ $read ||= {}; my $matches = _maniskip(); - my $skipwarn = $arg & 4; foreach $file (sort keys %$found){ if (&$matches($file)){ - warn "Skipping $file\n" if $skipwarn; + warn "Skipping $file\n" if $p->{warn_on_skip}; next; } warn "Debug: manicheck checking from disk $file\n" if $Debug; @@ -158,7 +158,8 @@ sub maniread { if (@pieces > 2) { $base = shift(@pieces) . '.' . join('_',@pieces); } my $okfile = "$dir$base"; warn "Debug: Illegal name $file changed to $okfile\n" if $Debug; - $file = "\L$okfile"; + $file = $okfile; + $file = lc($file) unless $file =~ /^MANIFEST/i; } $read->{$file} = $comment;