summaryrefslogtreecommitdiff
path: root/lib/rake.rb
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-01-29 03:29:53 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-01-29 03:29:53 +0000
commitf226c386308b749cd44dd02b1100a65ad588484b (patch)
tree2f6d4d6e12dd79b14c9377ed9c372925ac034eeb /lib/rake.rb
parent7dd1a098a6db52ff628cb504303726ccddf945df (diff)
* lib/rake.rb (FileUtils#rake_system): no longer needs workaround
on Windows. [ruby-core:21339] * lib/rake/win32.rb (Rake::Win32#rake_system): ditto. * lib/rake/win32.rb (Rake::Win32#win32_system_dir): no longer needs environment variables other than APPDATA now. * lib/rake.rb (Rake::Application#standard_system_dir): uses platfrom specific definition on Windows system. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@21871 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rake.rb')
-rwxr-xr-xlib/rake.rb18
1 files changed, 9 insertions, 9 deletions
diff --git a/lib/rake.rb b/lib/rake.rb
index a0685b4..d46c49d 100755
--- a/lib/rake.rb
+++ b/lib/rake.rb
@@ -983,11 +983,7 @@ module FileUtils
end
def rake_system(*cmd)
- if Rake::Win32.windows?
- Rake::Win32.rake_system(*cmd)
- else
- system(*cmd)
- end
+ system(*cmd)
end
private :rake_system
@@ -2364,8 +2360,6 @@ module Rake
begin
if ENV['RAKE_SYSTEM']
ENV['RAKE_SYSTEM']
- elsif Win32.windows?
- Win32.win32_system_dir
else
standard_system_dir
end
@@ -2373,8 +2367,14 @@ module Rake
end
# The standard directory containing system wide rake files.
- def standard_system_dir #:nodoc:
- File.join(File.expand_path('~'), '.rake')
+ if Win32.windows?
+ def standard_system_dir #:nodoc:
+ Win32.win32_system_dir
+ end
+ else
+ def standard_system_dir #:nodoc:
+ File.expand_path('.rake', '~')
+ end
end
private :standard_system_dir