From b437eee41d38188f10f11e041b82d7def0a20629 Mon Sep 17 00:00:00 2001 From: Jamis Buck Date: Wed, 19 Oct 2005 13:47:45 +0000 Subject: Don't clean RAILS_ROOT on windows git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2685 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- railties/environments/boot.rb | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'railties/environments') 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") -- cgit v1.2.3