Author: dagolden
Date: Mon Nov 23 21:05:52 2009
New Revision: 13589
Modified:
Module-Build/trunk/Changes
Module-Build/trunk/lib/Module/Build/Base.pm
Module-Build/trunk/t/mymeta.t
Log:
cleanup auto-generated MANIFEST.SKIP files
Modified: Module-Build/trunk/Changes
==============================================================================
--- Module-Build/trunk/Changes (original)
+++ Module-Build/trunk/Changes Mon Nov 23 21:05:52 2009
@@ -10,8 +10,8 @@
- Fix compilation error in Module::Build::Platform::VMS (RT#51766)
[David Golden]
- - Don't generate a MANIFEST.SKIP during distclean [reported by Zefram,
- fixed by David Golden]
+ - Don't generate a MANIFEST.SKIP during distclean and add any generated
+ MANIFEST.SKIP to cleanup list [reported by Zefram, fixed by David Golden]
- Module::Build::ModuleInfo version parsing would fail if a module sets
its $VERSION from another module, but the other module is not installed.
Modified: Module-Build/trunk/lib/Module/Build/Base.pm
==============================================================================
--- Module-Build/trunk/lib/Module/Build/Base.pm (original)
+++ Module-Build/trunk/lib/Module/Build/Base.pm Mon Nov 23 21:05:52 2009
@@ -3862,7 +3862,7 @@
$content .= <<'EOF';
# Avoid configuration metadata file
-^MYMETA\.$
+^MYMETA\.
# Avoid Module::Build generated and utility files.
\bBuild$
@@ -3871,6 +3871,7 @@
\bBuild.COM$
\bBUILD.COM$
\bbuild.com$
+^MANIFEST\.SKIP
# Avoid archives of this distribution
EOF
@@ -3889,8 +3890,9 @@
my $maniskip = 'MANIFEST.SKIP';
if ( ! -e $maniskip ) {
- $self->log_warn("File '$maniskip' does not exist: Creating a default
'$maniskip'\n");
+ $self->log_warn("File '$maniskip' does not exist: Creating a temporary
'$maniskip'\n");
$self->_write_default_maniskip($maniskip);
+ $self->add_to_cleanup($maniskip);
}
else {
# MYMETA must not be added to MANIFEST, so always confirm the skip
Modified: Module-Build/trunk/t/mymeta.t
==============================================================================
--- Module-Build/trunk/t/mymeta.t (original)
+++ Module-Build/trunk/t/mymeta.t Mon Nov 23 21:05:52 2009
@@ -2,7 +2,8 @@
use strict;
use lib 't/lib';
-use MBTest tests => 3;
+use MBTest;
+plan tests => 7;
blib_load('Module::Build');
@@ -28,3 +29,21 @@
#########################
+{
+ my $output = stdout_stderr_of sub { $dist->run_build('distcheck') };
+ like($output, qr/Creating a temporary 'MANIFEST.SKIP'/,
+ "MANIFEST.SKIP created for distcheck"
+ );
+ unlike($output, qr/MYMETA/,
+ "MYMETA not flagged by distcheck"
+ );
+}
+
+
+{
+ my $output = stdout_stderr_of sub { $dist->run_build('distclean') };
+ ok( ! -f 'MYMETA.yml', "No MYMETA.yml after distclean" );
+ ok( ! -f 'MANIFEST.SKIP', "No MANIFEST.SKIP after distclean" );
+}
+
+
