1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* ext/extmk.rb: negate default of --without-ext.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@17077 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2008-06-10 09:12:19 +00:00
parent dd6f7fbaef
commit 6f8bf830b4
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
Tue Jun 10 18:12:17 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/extmk.rb: negate default of --without-ext.
Tue Jun 10 17:43:35 2008 Yukihiro Matsumoto <matz@ruby-lang.org> Tue Jun 10 17:43:35 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
* array.c (rb_ary_shuffle_bang): update RDoc. [ruby-dev:35034] * array.c (rb_ary_shuffle_bang): update RDoc. [ruby-dev:35034]

4
ext/extmk.rb
View File

@ -399,13 +399,15 @@ if $extension
else else
withes, withouts = %w[--with --without].collect {|w| withes, withouts = %w[--with --without].collect {|w|
if not (w = %w[-extensions -ext].collect {|o|arg_config(w+o)}).any? if not (w = %w[-extensions -ext].collect {|o|arg_config(w+o)}).any?
proc {false} nil
elsif (w = w.grep(String)).empty? elsif (w = w.grep(String)).empty?
proc {true} proc {true}
else else
proc {|c1| w.collect {|o| o.split(/,/)}.flatten.any?(&c1)} proc {|c1| w.collect {|o| o.split(/,/)}.flatten.any?(&c1)}
end end
} }
withes ||= proc {false}
withouts ||= proc {true}
cond = proc {|ext, *| cond = proc {|ext, *|
cond1 = proc {|n| File.fnmatch(n, ext)} cond1 = proc {|n| File.fnmatch(n, ext)}
withes.call(cond1) or !withouts.call(cond1) withes.call(cond1) or !withouts.call(cond1)