Run set load path so others can do boot and get path

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2429 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
rails · Sep 30, 2005 · 11de947 · 11de947
1 parent 241b842
commit 11de947
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/railties/environments/boot.rb b/railties/environments/boot.rb
@@ -1,8 +1,10 @@
-RAILS_ROOT = File.join(File.dirname(__FILE__), '..')
+RAILS_ROOT = File.join(File.dirname(__FILE__), '..') unless defined?(RAILS_ROOT)
 
-unless File.directory?("#{RAILS_ROOT}/vendor/rails")
+if File.directory?("#{RAILS_ROOT}/vendor/rails")
+  require "#{RAILS_ROOT}/vendor/rails/railties/lib/initializer"
+else
   require 'rubygems'
   require 'initializer'
-else
+end
-  require "#{RAILS_ROOT}/vendor/rails/railties/lib/initializer"
+
-end
+Rails::Initializer.run(:set_load_path)
diff --git a/railties/fresh_rakefile b/railties/fresh_rakefile
@@ -2,7 +2,6 @@
 # for example lib/tasks/switchtower.rake, and they will automatically be available to Rake.
 
 require(File.join(File.dirname(__FILE__), 'config', 'boot'))
-Rails::Initializer.run(:set_load_path)
 
 require 'rake'
 require 'rake/testtask'