From 05adf524c6905eb5ac448e473cc64baa3571fd51 Mon Sep 17 00:00:00 2001 From: Akira Matsuda Date: Thu, 26 May 2011 01:37:34 +0900 Subject: Ensure RDoc::Task exists even if 'rdoc/task' was not required --- railties/lib/rails/generators/rails/plugin_new/templates/Rakefile | 2 ++ railties/lib/rails/tasks/documentation.rake | 2 ++ 2 files changed, 4 insertions(+) (limited to 'railties/lib') diff --git a/railties/lib/rails/generators/rails/plugin_new/templates/Rakefile b/railties/lib/rails/generators/rails/plugin_new/templates/Rakefile index 0e4c712acb..b28a842731 100755 --- a/railties/lib/rails/generators/rails/plugin_new/templates/Rakefile +++ b/railties/lib/rails/generators/rails/plugin_new/templates/Rakefile @@ -7,7 +7,9 @@ end begin require 'rdoc/task' rescue LoadError + require 'rdoc/rdoc' require 'rake/rdoctask' + RDoc::Task = Rake::RDocTask end RDoc::Task.new(:rdoc) do |rdoc| diff --git a/railties/lib/rails/tasks/documentation.rake b/railties/lib/rails/tasks/documentation.rake index 59305322b7..79255d1f56 100644 --- a/railties/lib/rails/tasks/documentation.rake +++ b/railties/lib/rails/tasks/documentation.rake @@ -1,7 +1,9 @@ begin require 'rdoc/task' rescue LoadError + require 'rdoc/rdoc' require 'rake/rdoctask' + RDoc::Task = Rake::RDocTask end # Monkey-patch to remove redoc'ing and clobber descriptions to cut down on rake -T noise -- cgit v1.2.3