diff options
| -rw-r--r-- | railties/CHANGELOG | 5 | ||||
| -rw-r--r-- | railties/environments/boot.rb | 9 |
2 files changed, 11 insertions, 3 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG index a11e96d097..a9358f9c1a 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,3 +1,8 @@ +*SVN* + +* Don't clean RAILS_ROOT on windows + + *0.14.1* (October 19th, 2005) * Remove trailing '/' from RAILS_ROOT [Nicholas Seckar] diff --git a/railties/environments/boot.rb b/railties/environments/boot.rb index 9715482cfc..b829644d1f 100644 --- a/railties/environments/boot.rb +++ b/railties/environments/boot.rb @@ -1,7 +1,10 @@ unless defined?(RAILS_ROOT) -require 'pathname' - root_path = Pathname.new(File.join(File.dirname(__FILE__), '..')) - RAILS_ROOT = root_path.cleanpath.to_s + root_path = File.join(File.dirname(__FILE__), '..') + unless RUBY_PLATFORM =~ /mswin32/ + require 'pathname' + root_path = Pathname.new(root_path).cleanpath.to_s + end + RAILS_ROOT = root_path end if File.directory?("#{RAILS_ROOT}/vendor/rails") |