In perl.git, the branch maint-5.10 has been updated <http://perl5.git.perl.org/perl.git/commitdiff/76cb2a2982ebdbb3137ae56c2a667b47a83437c8?hp=f8317c58d6b2e50f8774407deb37f71d38986277>
- Log ----------------------------------------------------------------- commit 76cb2a2982ebdbb3137ae56c2a667b47a83437c8 Author: H.Merijn Brand <[email protected]> Date: Tue Jun 30 00:51:27 2009 +0200 Subject: Re: dual-life: IO 1.25 and Scalar-List-Utils-1.21 From: Andy Dougherty <[email protected]> Date: Mon, 29 Jun 2009 15:11:30 -0400 (EDT) Message-ID: <[email protected]> (cherry-picked from commit 75cdbdc152433e4bc6f06e7f9795d8b06558159d) M Configure commit 80af972964516c2f80edec1327a8f0adef948c2e Author: Robin Barker <[email protected]> Date: Mon Jun 29 15:05:18 2009 +0100 Stop buildtoc warning that perltoc.pod is missing whist it is building same. (cherry picked from commit 78fb583c0588329906d767eceec4c92fe2774964) M pod/buildtoc ----------------------------------------------------------------------- Summary of changes: Configure | 10 +++++++--- pod/buildtoc | 8 ++++++-- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/Configure b/Configure index ed36e69..792281f 100755 --- a/Configure +++ b/Configure @@ -25,7 +25,7 @@ # $Id: Head.U 6 2006-08-25 22:21:46Z rmanfredi $ # -# Generated on Wed Mar 25 17:28:24 CET 2009 [metaconfig 3.5 PL0] +# Generated on Tue Jun 30 00:49:36 CEST 2009 [metaconfig 3.5 PL0] # (with additional metaconfig patches by [email protected]) cat >c1$$ <<EOF @@ -21642,11 +21642,15 @@ find_extensions=' this_ext=`echo $xxx | $sed -e s/-/\\\//g`; leaf=`echo $xxx | $sed -e s/.*-//`; if $test -d File-Glob; then - if $test -f $xxx/$leaf.xs -o -f $xxx/$leaf.c; then + $ls -1 $xxx > $$.tmp; + if $contains "\.xs$" $$.tmp > /dev/null 2>&1; then + known_extensions="$known_extensions $this_ext"; + elif $contains "\.c$" $$.tmp; then known_extensions="$known_extensions $this_ext"; elif $test -d $xxx; then nonxs_extensions="$nonxs_extensions $this_ext"; - fi + fi; + $rm -f $$.tmp; else if $test -f $xxx/$leaf.xs -o -f $xxx/$leaf.c; then known_extensions="$known_extensions $1$this_ext"; diff --git a/pod/buildtoc b/pod/buildtoc index 7b770f2..cae3dfe 100644 --- a/pod/buildtoc +++ b/pod/buildtoc @@ -209,9 +209,13 @@ close MASTER; warn "$0: $i exists but is unknown by perl.pod\n" if !$perlpods{$i} && !exists $sources{$i}; } + my @BuildTargets = grep {defined} @Targets{keys %Build}; + my %BuildFiles; + @buildfil...@buildtargets} = @BuildTargets; + foreach my $i (sort keys %our_pods) { warn "$0: $i is known by buildtoc but does not exist\n" - unless $disk_pods{$i}; + unless $disk_pods{$i} or $BuildFiles{$i}; } foreach my $i (sort keys %manipods) { warn "$0: $i is known by ../MANIFEST but does not exist\n" @@ -221,7 +225,7 @@ close MASTER; } foreach my $i (sort keys %perlpods) { warn "$0: $i is known by perl.pod but does not exist\n" - unless $disk_pods{$i}; + unless $disk_pods{$i} or $BuildFiles{$i}; } } -- Perl5 Master Repository
