diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-29 03:29:53 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-29 03:29:53 +0000 |
commit | f226c386308b749cd44dd02b1100a65ad588484b (patch) | |
tree | 2f6d4d6e12dd79b14c9377ed9c372925ac034eeb /lib/rake | |
parent | 7dd1a098a6db52ff628cb504303726ccddf945df (diff) | |
download | ruby-f226c386308b749cd44dd02b1100a65ad588484b.tar.gz |
* 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')
-rw-r--r-- | lib/rake/win32.rb | 42 |
1 files changed, 11 insertions, 31 deletions
diff --git a/lib/rake/win32.rb b/lib/rake/win32.rb index eadc585a3f..96f66d6957 100644 --- a/lib/rake/win32.rb +++ b/lib/rake/win32.rb @@ -1,54 +1,34 @@ module Rake - + # Win 32 interface methods for Rake. Windows specific functionality # will be placed here to collect that knowledge in one spot. module Win32 - - # Error indicating a problem in locating the home directory on a - # Win32 system. - class Win32HomeError < RuntimeError - end - class << self # True if running on a windows system. def windows? - Config::CONFIG['host_os'] =~ /mswin/ + # assume other DOSish systems are extinct. + File::ALT_SEPARATOR == '\\' end + end - # Run a command line on windows. - def rake_system(*cmd) - if cmd.size == 1 - system("call #{cmd}") - else - system(*cmd) - end - end - + class << self # The standard directory containing system wide rake files on # Win 32 systems. Try the following environment variables (in # order): # # * APPDATA + # * HOME # * HOMEDRIVE + HOMEPATH # * USERPROFILE # - # If the above are not defined, the return nil. + # If the above are not defined, retruns the personal folder. def win32_system_dir #:nodoc: win32_shared_path = ENV['APPDATA'] - if win32_shared_path.nil? && ENV['HOMEDRIVE'] && ENV['HOMEPATH'] - win32_shared_path = ENV['HOMEDRIVE'] + ENV['HOMEPATH'] + if !win32_shared_path or win32_shared_path.empty? + win32_shared_path = '~' end - win32_shared_path ||= ENV['USERPROFILE'] - raise Win32HomeError, "Unable to determine home path environment variable." if - win32_shared_path.nil? or win32_shared_path.empty? - normalize(File.join(win32_shared_path, 'Rake')) + File.expand_path('Rake', win32_shared_path) end - - # Normalize a win32 path so that the slashes are all forward slashes. - def normalize(path) - path.gsub(/\\/, '/') - end - - end + end if windows? end end |