From c28a45ad8bb72896d84285158e7f5dc728933062 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Wed, 21 Oct 2009 11:12:30 -0200
Subject: Fix rake dev and update vendored Thor.

Signed-off-by: Yehuda Katz <wycats@gmail.com>
---
 railties/Rakefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'railties/Rakefile')

diff --git a/railties/Rakefile b/railties/Rakefile
index 0ba5ca10c2..ebac90a403 100644
--- a/railties/Rakefile
+++ b/railties/Rakefile
@@ -6,7 +6,8 @@ require 'rake/gempackagetask'
 require 'date'
 require 'rbconfig'
 
-require File.join(File.dirname(__FILE__), 'lib/rails', 'version')
+$LOAD_PATH.unshift "#{File.dirname(__FILE__)}/lib"
+require 'rails'
 
 PKG_BUILD       = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
 PKG_NAME        = ENV['PKG_NAME'] || 'rails'
@@ -81,7 +82,6 @@ end
 # Run application generator -------------------------------------------------------------
 
 task :create_rails do
-  $LOAD_PATH.unshift "#{File.dirname(__FILE__)}/lib"
   require 'rails/generators'
   require 'rails/generators/rails/app/app_generator'
   Rails::Generators::AppGenerator.start [ File.basename(PKG_DESTINATION), "--quiet" ],
-- 
cgit v1.2.3