diff options
| author | Jamis Buck <jamis@37signals.com> | 2005-10-19 13:47:45 +0000 |
|---|---|---|
| committer | Jamis Buck <jamis@37signals.com> | 2005-10-19 13:47:45 +0000 |
| commit | b437eee41d38188f10f11e041b82d7def0a20629 (patch) | |
| tree | 3680e419dab5287a3744791389f8a0cf09549295 /railties | |
| parent | 83dc37b91057cc96f35c0b55b6e79a76072b2ab5 (diff) | |
| download | rails-b437eee41d38188f10f11e041b82d7def0a20629.tar.gz rails-b437eee41d38188f10f11e041b82d7def0a20629.tar.bz2 rails-b437eee41d38188f10f11e041b82d7def0a20629.zip | |
Don't clean RAILS_ROOT on windows
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2685 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'railties')
| -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") |