diff options
| author | Akira Matsuda <ronnie@dio.jp> | 2011-05-26 01:37:34 +0900 |
|---|---|---|
| committer | Akira Matsuda <ronnie@dio.jp> | 2011-05-26 01:37:34 +0900 |
| commit | 05adf524c6905eb5ac448e473cc64baa3571fd51 (patch) | |
| tree | d445009e8f0ec9bd2b946d914b7ba00395930ba8 /railties/lib/rails | |
| parent | ee46bb73d44338b7dfb8976cc59d742b9394148a (diff) | |
| download | rails-05adf524c6905eb5ac448e473cc64baa3571fd51.tar.gz rails-05adf524c6905eb5ac448e473cc64baa3571fd51.tar.bz2 rails-05adf524c6905eb5ac448e473cc64baa3571fd51.zip | |
Ensure RDoc::Task exists even if 'rdoc/task' was not required
Diffstat (limited to 'railties/lib/rails')
| -rwxr-xr-x | railties/lib/rails/generators/rails/plugin_new/templates/Rakefile | 2 | ||||
| -rw-r--r-- | railties/lib/rails/tasks/documentation.rake | 2 |
2 files changed, 4 insertions, 0 deletions
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 |