Skip to content

Commit

Permalink
fixing rake
Browse files Browse the repository at this point in the history
git-svn-id: http://svn.macosforge.org/repository/ruby/MacRuby/trunk@237 23306eb0-4c56-4727-a40e-e92c0eb68959
  • Loading branch information
lrz committed May 29, 2008
1 parent 4495e6a commit a092776
Showing 1 changed file with 12 additions and 13 deletions.
25 changes: 12 additions & 13 deletions lib/rake.rb
Expand Up @@ -1088,8 +1088,9 @@ def rake_check_options(options, *optdecl)
# other objects.

include RakeFileUtils
private(*FileUtils.instance_methods(false))
private(*RakeFileUtils.instance_methods(false))
# FIXME: this doesn't work in MacRuby yet
#private(*FileUtils.instance_methods(false))
#private(*RakeFileUtils.instance_methods(false))

######################################################################
module Rake
Expand Down Expand Up @@ -1167,23 +1168,21 @@ class FileList
# Now do the delegation.
DELEGATING_METHODS.each_with_index do |sym, i|
if SPECIAL_RETURN.include?(sym)
ln = __LINE__+1
class_eval %{
def #{sym}(*args, &block)
class_eval do
define_method(sym) do |*args, &block|
resolve
result = @items.send(:#{sym}, *args, &block)
result = @items.send(sym, *args, &block)
FileList.new.import(result)
end
}, __FILE__, ln
end
else
ln = __LINE__+1
class_eval %{
def #{sym}(*args, &block)
class_eval do
define_method(sym) do |*args, &block|
resolve
result = @items.send(:#{sym}, *args, &block)
result = @items.send(sym, *args, &block)
result.object_id == @items.object_id ? self : result
end
}, __FILE__, ln
end
end
end
end

Expand Down

0 comments on commit a092776

Please sign in to comment.