ruby-changes:5573
From: nobu <ko1@a...>
Date: Tue, 10 Jun 2008 18:17:41 +0900 (JST)
Subject: [ruby-changes:5573] Ruby:r17077 (ruby_1_8, trunk): * ext/extmk.rb: negate default of --without-ext.
nobu 2008-06-10 18:12:19 +0900 (Tue, 10 Jun 2008) New Revision: 17077 Modified files: branches/ruby_1_8/ChangeLog branches/ruby_1_8/ext/extmk.rb trunk/ChangeLog trunk/ext/extmk.rb Log: * ext/extmk.rb: negate default of --without-ext. http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/ext/extmk.rb?r1=17077&r2=17076&diff_format=u http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/ChangeLog?r1=17077&r2=17076&diff_format=u http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=17077&r2=17076&diff_format=u http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ext/extmk.rb?r1=17077&r2=17076&diff_format=u Index: ChangeLog =================================================================== --- ChangeLog (revision 17076) +++ ChangeLog (revision 17077) @@ -1,3 +1,7 @@ +Tue Jun 10 18:12:17 2008 Nobuyoshi Nakada <nobu@r...> + + * ext/extmk.rb: negate default of --without-ext. + Tue Jun 10 17:43:35 2008 Yukihiro Matsumoto <matz@r...> * array.c (rb_ary_shuffle_bang): update RDoc. [ruby-dev:35034] Index: ext/extmk.rb =================================================================== --- ext/extmk.rb (revision 17076) +++ ext/extmk.rb (revision 17077) @@ -399,13 +399,15 @@ else withes, withouts = %w[--with --without].collect {|w| if not (w = %w[-extensions -ext].collect {|o|arg_config(w+o)}).any? - proc {false} + nil elsif (w = w.grep(String)).empty? proc {true} else proc {|c1| w.collect {|o| o.split(/,/)}.flatten.any?(&c1)} end } + withes ||= proc {false} + withouts ||= proc {true} cond = proc {|ext, *| cond1 = proc {|n| File.fnmatch(n, ext)} withes.call(cond1) or !withouts.call(cond1) Index: ruby_1_8/ext/extmk.rb =================================================================== --- ruby_1_8/ext/extmk.rb (revision 17076) +++ ruby_1_8/ext/extmk.rb (revision 17077) @@ -408,13 +408,15 @@ else withes, withouts = %w[--with --without].collect {|w| if not (w = %w[-extensions -ext].collect {|opt|arg_config(w+opt)}).any? - proc {false} + nil elsif (w = w.grep(String)).empty? proc {true} else proc {|c1| w.collect {|opt| opt.split(/,/)}.flatten.any?(&c1)} end } + withes ||= proc {false} + withouts ||= proc {true} cond = proc {|ext| cond1 = proc {|n| File.fnmatch(n, ext, File::FNM_PATHNAME)} withes.call(cond1) or !withouts.call(cond1) Index: ruby_1_8/ChangeLog =================================================================== --- ruby_1_8/ChangeLog (revision 17076) +++ ruby_1_8/ChangeLog (revision 17077) @@ -1,3 +1,7 @@ +Tue Jun 10 18:12:17 2008 Nobuyoshi Nakada <nobu@r...> + + * ext/extmk.rb: negate default of --without-ext. + Tue Jun 10 17:01:58 2008 wanabe <s.wanabe@g...> * util.c (ruby_strtod): ruby_strtod don't allow a trailing -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/