mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* ext/extmk.rb: Proc#call does not pass the block in 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@10894 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
3a2cf78faa
commit
12491fb966
2 changed files with 5 additions and 3 deletions
|
@ -1,10 +1,12 @@
|
||||||
Sat Sep 9 04:47:45 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
Sat Sep 9 04:54:42 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||||
|
|
||||||
* Makefile.in, win32/Makefile.sub (MINIRUBY): append MINIRUBYOPT.
|
* Makefile.in, win32/Makefile.sub (MINIRUBY): append MINIRUBYOPT.
|
||||||
|
|
||||||
* mkconfig.rb, ext/extmk.rb, lib/mkmf.rb, win32/mkexports.rb: suppress
|
* mkconfig.rb, ext/extmk.rb, lib/mkmf.rb, win32/mkexports.rb: suppress
|
||||||
warnings with $VERBOSE.
|
warnings with $VERBOSE.
|
||||||
|
|
||||||
|
* ext/extmk.rb: Proc#call does not pass the block in 1.8.
|
||||||
|
|
||||||
* win32/resource.rb: add more info.
|
* win32/resource.rb: add more info.
|
||||||
|
|
||||||
Fri Sep 8 10:03:59 2006 GOTOU Yuuzou <gotoyuzo@notwork.org>
|
Fri Sep 8 10:03:59 2006 GOTOU Yuuzou <gotoyuzo@notwork.org>
|
||||||
|
|
|
@ -373,12 +373,12 @@ else
|
||||||
elsif (w = w.grep(String)).empty?
|
elsif (w = w.grep(String)).empty?
|
||||||
proc {true}
|
proc {true}
|
||||||
else
|
else
|
||||||
w.collect {|opt| opt.split(/,/)}.flatten.method(:any?)
|
proc {|c1| w.collect {|opt| opt.split(/,/)}.flatten.any?(&c1)}
|
||||||
end
|
end
|
||||||
}
|
}
|
||||||
cond = proc {|ext|
|
cond = proc {|ext|
|
||||||
cond1 = proc {|n| File.fnmatch(n, ext, File::FNM_PATHNAME)}
|
cond1 = proc {|n| File.fnmatch(n, ext, File::FNM_PATHNAME)}
|
||||||
withes.call(&cond1) or !withouts.call(&cond1)
|
withes.call(cond1) or !withouts.call(cond1)
|
||||||
}
|
}
|
||||||
exts |= Dir.glob("#{ext_prefix}/*/**/extconf.rb").collect {|d|
|
exts |= Dir.glob("#{ext_prefix}/*/**/extconf.rb").collect {|d|
|
||||||
d = File.dirname(d)
|
d = File.dirname(d)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue