diff options
| author | Steve Hay <SteveHay@planit.com> | 2009-10-10 12:24:52 +0100 |
|---|---|---|
| committer | Steve Hay <SteveHay@planit.com> | 2009-10-11 03:12:06 +0100 |
| commit | 551c793ccd7e5d2e1bf93b1a3b33a4be3862ff39 (patch) | |
| tree | 7bc73efe4d91a87b9529843037a7af67bc1b24ff /cpan/ExtUtils-Manifest | |
| parent | 3698b7bef83ed184c1d1ade0884d06e9133b6944 (diff) | |
| download | perl-551c793ccd7e5d2e1bf93b1a3b33a4be3862ff39.tar.gz | |
Upgrade to ExtUtils-Manifest-1.57
Diffstat (limited to 'cpan/ExtUtils-Manifest')
| -rw-r--r-- | cpan/ExtUtils-Manifest/lib/ExtUtils/MANIFEST.SKIP | 19 | ||||
| -rw-r--r-- | cpan/ExtUtils-Manifest/lib/ExtUtils/Manifest.pm | 22 |
2 files changed, 32 insertions, 9 deletions
diff --git a/cpan/ExtUtils-Manifest/lib/ExtUtils/MANIFEST.SKIP b/cpan/ExtUtils-Manifest/lib/ExtUtils/MANIFEST.SKIP index 885fedcedb..e50a7b390f 100644 --- a/cpan/ExtUtils-Manifest/lib/ExtUtils/MANIFEST.SKIP +++ b/cpan/ExtUtils-Manifest/lib/ExtUtils/MANIFEST.SKIP @@ -7,6 +7,12 @@ \B\.git\b \B\.gitignore\b \b_darcs\b +\B\.cvsignore$ + +# Avoid VMS specific MakeMaker generated files +\bDescrip.MMS$ +\bDESCRIP.MMS$ +\bdescrip.mms$ # Avoid Makemaker generated and utility files. \bMANIFEST\.bak @@ -20,6 +26,10 @@ # Avoid Module::Build generated and utility files. \bBuild$ \b_build/ +\bBuild.bat$ +\bBuild.COM$ +\bBUILD.COM$ +\bbuild.com$ # Avoid temp and backup files. ~$ @@ -27,6 +37,15 @@ \#$ \b\.# \.bak$ +\.tmp$ +\.# +\.rej$ + +# Avoid OS-specific files/dirs +# Mac OSX metadata +\B\.DS_Store +# Mac OSX SMB mount metadata files +\B\._ # Avoid Devel::Cover files. \bcover_db\b diff --git a/cpan/ExtUtils-Manifest/lib/ExtUtils/Manifest.pm b/cpan/ExtUtils-Manifest/lib/ExtUtils/Manifest.pm index 7281421cc5..df621d5f43 100644 --- a/cpan/ExtUtils-Manifest/lib/ExtUtils/Manifest.pm +++ b/cpan/ExtUtils-Manifest/lib/ExtUtils/Manifest.pm @@ -13,7 +13,7 @@ use vars qw($VERSION @ISA @EXPORT_OK $Is_MacOS $Is_VMS $Is_VMS_mode $Is_VMS_lc $Is_VMS_nodot $Debug $Verbose $Quiet $MANIFEST $DEFAULT_MSKIP); -$VERSION = '1.56'; +$VERSION = '1.57'; @ISA=('Exporter'); @EXPORT_OK = qw(mkmanifest manicheck filecheck fullcheck skipcheck @@ -268,7 +268,7 @@ sub skipcheck { my @skipped = (); foreach my $file (_sort keys %$found){ if (&$matches($file)){ - warn "Skipping $file\n"; + warn "Skipping $file\n" unless $Quiet; push @skipped, $file; next; } @@ -409,13 +409,17 @@ sub maniskip { local(*M, $_); open M, "< $mfile" or open M, "< $DEFAULT_MSKIP" or return sub {0}; while (<M>){ - chomp; - s/\r//; - next if /^#/; - next if /^\s*$/; - s/^'//; - s/'$//; - push @skip, _macify($_); + chomp; + s/\r//; + $_ =~ qr{^\s*(?:(?:'([^\\']*(?:\\.[^\\']*)*)')|([^#\s]\S*))?(?:(?:\s*)|(?:\s+(.*?)\s*))$}; + #my $comment = $3; + my $filename = $2; + if ( defined($1) ) { + $filename = $1; + $filename =~ s/\\(['\\])/$1/g; + } + next if (not defined($filename) or not $filename); + push @skip, _macify($filename); } close M; return sub {0} unless (scalar @skip > 0); |