From: Nicholas Clark Date: Tue, 10 Feb 2009 09:36:47 +0000 (+0000) Subject: All extensions are at the top level, so no longer any need to recurse. X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=1f8a0b38638b171cf789a9f44cc9e8cd38bbf4d3;p=p5sagit%2Fp5-mst-13.2.git All extensions are at the top level, so no longer any need to recurse. --- diff --git a/Configure b/Configure index 0d72a68..a549650 100755 --- a/Configure +++ b/Configure @@ -21612,8 +21612,7 @@ nonxs_extensions='' : some additional extensions into the source tree and expect them : to be built. -: Function to recursively find available extensions, ignoring DynaLoader -: NOTE: recursion limit of 10 to prevent runaway in case of symlink madness +: Function to find available extensions, ignoring DynaLoader find_extensions=' for xxx in *; do case "$xxx" in @@ -21622,17 +21621,9 @@ find_extensions=' this_ext=`echo $xxx | $sed -e s/-/\\\//g`; leaf=`echo $xxx | $sed -e s/.*-//`; if $test -f $xxx/$leaf.xs -o -f $xxx/$leaf.c; then - known_extensions="$known_extensions $1$this_ext"; - elif $test -f $xxx/Makefile.PL; then - nonxs_extensions="$nonxs_extensions $1$this_ext"; - else - if $test -d $xxx -a $# -lt 10; then - set $1$xxx/ $*; - cd "$xxx"; - eval $find_extensions; - cd ..; - shift; - fi; + known_extensions="$known_extensions $this_ext"; + elif $test -d $xxx; then + nonxs_extensions="$nonxs_extensions $this_ext"; fi ;; esac; diff --git a/win32/FindExt.pm b/win32/FindExt.pm index 7ceb1ac..7bf9d52 100644 --- a/win32/FindExt.pm +++ b/win32/FindExt.pm @@ -32,7 +32,7 @@ sub set_static_extensions { sub scan_ext { my $dir = shift; - find_ext("$dir/", ''); + find_ext("$dir/"); extensions(); } @@ -63,31 +63,25 @@ sub is_static return $ext{$_[0]} eq 'static' } -# Function to recursively find available extensions, ignoring DynaLoader -# NOTE: recursion limit of 10 to prevent runaway in case of symlink madness +# Function to find available extensions, ignoring DynaLoader sub find_ext { my $ext_dir = shift; - my $prefix = shift; - opendir my $dh, "$ext_dir$prefix"; + opendir my $dh, "$ext_dir"; while (defined (my $item = readdir $dh)) { next if $item =~ /^\.\.?$/; next if $item eq "DynaLoader"; - my $this_ext = my $this_ext_dir = "$prefix$item"; + next unless -d "$ext_dir$item"; + my $this_ext = $item; my $leaf = $item; $this_ext =~ s!-!/!g; $leaf =~ s/.*-//; - if (-f "$ext_dir$this_ext_dir/$leaf.xs" || -f "$ext_dir$this_ext_dir/$leaf.c" ) { + if (-f "$ext_dir$item/$leaf.xs" || -f "$ext_dir$item/$leaf.c" ) { $ext{$this_ext} = $static{$this_ext} ? 'static' : 'dynamic'; - } elsif (-f "$ext_dir$this_ext_dir/Makefile.PL") { - $ext{$this_ext} = 'nonxs'; } else { - # It's not actually an extension. So recurse into it. - if (-d "$ext_dir$this_ext_dir" && $prefix =~ tr#/## < 10) { - find_ext($ext_dir, "$this_ext_dir/"); - } + $ext{$this_ext} = 'nonxs'; } $ext{$this_ext} = 'known' if $ext{$this_ext} && $item =~ $no; }