From 3d05d38ef655f0ffcbe51fc3c3fdcca1685e831f Mon Sep 17 00:00:00 2001 From: yugui Date: Thu, 29 Jan 2009 17:12:32 +0000 Subject: merges r21871 from trunk into ruby_1_9_1. * 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: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@21879 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/rake.rb | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'lib/rake.rb') diff --git a/lib/rake.rb b/lib/rake.rb index a0685b4ab..d46c49d52 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 -- cgit