diff options
| author | James E Keenan <jkeenan@cpan.org> | 2014-07-15 18:54:47 -0400 |
|---|---|---|
| committer | James E Keenan <jkeenan@cpan.org> | 2014-07-15 18:54:47 -0400 |
| commit | 22b637e7406e1460b7adf0ddf74af76c6c7aac30 (patch) | |
| tree | 9c350bdd0924aaa6e35ff8d7f2fe5f09ba096a58 | |
| parent | 1f922d87031d19b508b27b35e56d92f35273ffeb (diff) | |
| parent | a6f8bc47159a176b40a20c874fc545270a452af8 (diff) | |
| download | perl-22b637e7406e1460b7adf0ddf74af76c6c7aac30.tar.gz | |
Merge branch '122300-extutils-manifest' into blead
| -rw-r--r-- | dist/ExtUtils-Manifest/lib/ExtUtils/MANIFEST.SKIP | 4 | ||||
| -rw-r--r-- | dist/ExtUtils-Manifest/lib/ExtUtils/Manifest.pm | 30 |
2 files changed, 18 insertions, 16 deletions
diff --git a/dist/ExtUtils-Manifest/lib/ExtUtils/MANIFEST.SKIP b/dist/ExtUtils-Manifest/lib/ExtUtils/MANIFEST.SKIP index bea687450f..725f84e3d1 100644 --- a/dist/ExtUtils-Manifest/lib/ExtUtils/MANIFEST.SKIP +++ b/dist/ExtUtils-Manifest/lib/ExtUtils/MANIFEST.SKIP @@ -40,6 +40,7 @@ \.tmp$ \.# \.rej$ +\..*\.sw.?$ # Avoid OS-specific files/dirs # Mac OSX metadata @@ -51,5 +52,8 @@ \bcover_db\b \bcovered\b +# Avoid prove files +\B\.prove$ + # Avoid MYMETA files ^MYMETA\. diff --git a/dist/ExtUtils-Manifest/lib/ExtUtils/Manifest.pm b/dist/ExtUtils-Manifest/lib/ExtUtils/Manifest.pm index 5bcd6d693a..165a15cc5a 100644 --- a/dist/ExtUtils-Manifest/lib/ExtUtils/Manifest.pm +++ b/dist/ExtUtils-Manifest/lib/ExtUtils/Manifest.pm @@ -8,24 +8,22 @@ use File::Find; use File::Spec; use Carp; use strict; +use warnings; -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); +use Exporter 5.57 'import'; -$VERSION = '1.63'; -@ISA=('Exporter'); -@EXPORT_OK = qw(mkmanifest +our $VERSION = '1.64'; +our @EXPORT_OK = qw(mkmanifest manicheck filecheck fullcheck skipcheck manifind maniread manicopy maniadd maniskip ); -$Is_MacOS = $^O eq 'MacOS'; -$Is_VMS = $^O eq 'VMS'; -$Is_VMS_mode = 0; -$Is_VMS_lc = 0; -$Is_VMS_nodot = 0; # No dots in dir names or double dots in files +our $Is_MacOS = $^O eq 'MacOS'; +our $Is_VMS = $^O eq 'VMS'; +our $Is_VMS_mode = 0; +our $Is_VMS_lc = 0; +our $Is_VMS_nodot = 0; # No dots in dir names or double dots in files if ($Is_VMS) { require VMS::Filespec if $Is_VMS; @@ -53,13 +51,13 @@ if ($Is_VMS) { $Is_VMS_nodot = 0 if ($vms_efs); } -$Debug = $ENV{PERL_MM_MANIFEST_DEBUG} || 0; -$Verbose = defined $ENV{PERL_MM_MANIFEST_VERBOSE} ? +our $Debug = $ENV{PERL_MM_MANIFEST_DEBUG} || 0; +our $Verbose = defined $ENV{PERL_MM_MANIFEST_VERBOSE} ? $ENV{PERL_MM_MANIFEST_VERBOSE} : 1; -$Quiet = 0; -$MANIFEST = 'MANIFEST'; +our $Quiet = 0; +our $MANIFEST = 'MANIFEST'; -$DEFAULT_MSKIP = File::Spec->catfile( dirname(__FILE__), "$MANIFEST.SKIP" ); +our $DEFAULT_MSKIP = File::Spec->catfile( dirname(__FILE__), "$MANIFEST.SKIP" ); =head1 NAME |