diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-09-15 14:00:34 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-09-15 14:00:34 +0000 |
commit | 80710d427da93052c74fea1fd9ea93159e0265b3 (patch) | |
tree | f768218dfc234fdd18ea50fff2c567db79fbd521 /lib/rake | |
parent | d6693a42337d5f324251d0faccd29f0e685148e8 (diff) |
Revert r32944 and r33092.
Those commits break tests on Windows and no response.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33276 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rake')
-rw-r--r-- | lib/rake/application.rb | 1 | ||||
-rw-r--r-- | lib/rake/dsl_definition.rb | 8 | ||||
-rw-r--r-- | lib/rake/version.rb | 2 |
3 files changed, 4 insertions, 7 deletions
diff --git a/lib/rake/application.rb b/lib/rake/application.rb index 2079fb9be6..a4954f27e7 100644 --- a/lib/rake/application.rb +++ b/lib/rake/application.rb @@ -348,7 +348,6 @@ module Rake ], ['--rakelibdir', '--rakelib', '-R RAKELIBDIR', "Auto-import any .rake files in RAKELIBDIR. (default is 'rakelib')", - # HACK Use File::PATH_SEPARATOR lambda { |value| options.rakelib = value.split(':') } ], ['--require', '-r MODULE', "Require MODULE before executing rakefile.", diff --git a/lib/rake/dsl_definition.rb b/lib/rake/dsl_definition.rb index 6d9a6b88f3..3294f9e6c0 100644 --- a/lib/rake/dsl_definition.rb +++ b/lib/rake/dsl_definition.rb @@ -144,12 +144,10 @@ module Rake Rake.application.add_import(fn) end end - end - DeprecatedCommands = Object.new.extend(DSL) - module DeprecatedObjectDSL # :nodoc: + Commands = Object.new.extend DSL DSL.private_instance_methods(false).each do |name| line = __LINE__+1 class_eval %{ @@ -162,8 +160,8 @@ module Rake end $stderr.puts "WARNING: DSL method \#{self.class}##{name} called at \#{caller.first}" end - Rake::DeprecatedCommands.send(:#{name}, *args, &block) - end + Rake::DeprecatedObjectDSL::Commands.send(:#{name}, *args, &block) + end private :#{name} }, __FILE__, line end diff --git a/lib/rake/version.rb b/lib/rake/version.rb index 6c43493df9..3afad7f25a 100644 --- a/lib/rake/version.rb +++ b/lib/rake/version.rb @@ -1,5 +1,5 @@ module Rake - VERSION = '0.9.2.2' + VERSION = '0.9.2.1' module Version # :nodoc: all MAJOR, MINOR, BUILD = VERSION.split '.' |