Skip to content

Commit

Permalink
- Default MANIFEST.SKIP not catching files in subdirs. Fixed by Ilya.
Browse files Browse the repository at this point in the history
    - Ilya fixed ExtUtils::Liblist->ext when called outside MakeMaker.


git-svn-id: http://svn.schwern.org/repos/CPAN/ExtUtils-MakeMaker/trunk@1083 8151f2b9-fde8-0310-94fd-f048d12aab9e
  • Loading branch information
schwern committed Dec 13, 2002
1 parent 73f7c90 commit e4d512d
Show file tree
Hide file tree
Showing 5 changed files with 43 additions and 7 deletions.
2 changes: 2 additions & 0 deletions Changes
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,8 @@
- J. D. Laub made MakeMaker honor $Config{installstyle}
- Renaming on OS/2 requires the target file to be removed.
Partially fixed by Ilya, should be applied universally later.
- Default MANIFEST.SKIP not catching files in subdirs. Fixed by Ilya.
- Ilya fixed ExtUtils::Liblist->ext when called outside MakeMaker.

6.05 Tue Aug 27 16:09:51 PDT 2002
- Output format of the hint file verbose diagnostic is now in
Expand Down
1 change: 1 addition & 0 deletions MANIFEST
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ t/Command.t
t/INST.t
t/INST_PREFIX.t
t/Installed.t
t/Liblist.t
t/MM_BeOS.t
t/MM_Cygwin.t
t/MM_NW5.t
Expand Down
3 changes: 2 additions & 1 deletion lib/ExtUtils/Liblist.pm
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,9 @@ sub lsdir {
shift;
my $rex = qr/$_[1]/;
opendir DIR, $_[0];
grep /$rex/, readdir DIR;
my @out = grep /$rex/, readdir DIR;
closedir DIR;
return @out;
}

__END__
Expand Down
12 changes: 6 additions & 6 deletions lib/ExtUtils/MANIFEST.SKIP
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
\B\.svn\b

# Avoid Makemaker generated and utility files.
^MANIFEST\.bak
^Makefile$
^blib/
^MakeMaker-\d
^pm_to_blib$
\bMANIFEST\.bak
\bMakefile$
\bblib/
\bMakeMaker-\d
\bpm_to_blib$

# Avoid temp and backup files.
~$
\.old$
\#$
^\.#
\b\.#
32 changes: 32 additions & 0 deletions t/Liblist.t
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
#!/usr/bin/perl -w

BEGIN {
if( $ENV{PERL_CORE} ) {
chdir 't' if -d 't';
unshift @INC, '../lib';
}
else {
unshift @INC, 't/lib';
}
}
chdir 't';

use strict;
use Test::More tests => 5;

BEGIN {
use_ok( 'ExtUtils::Liblist' );
}

{
my @warn;
local $SIG{__WARN__} = sub {push @warn, [@_]};

my @out = ExtUtils::Liblist->ext('-ln0tt43r3_perl');
is( @out, 4, 'enough output' );
unlike( $out[2], qr/-ln0tt43r3_perl/, 'bogus library not added' );
is( @warn, 1, 'had warning');
like($warn[0][0],
qr/\QNote (probably harmless): No library found for -ln0tt43r3_perl/,
'expected warning');
}

0 comments on commit e4d512d

Please sign in to comment.