Permalink
Browse files

Merge pull request #1508 from vijaydev/rake_rdoc_fixes_cherry_picks

Rake deprecation fixes - cherry picks
  • Loading branch information...
2 parents ae534f2 + f3fa66f commit 1bc159fbd288f0c2cce32fbf2df4721a1ac405e2 @josevalim josevalim committed Jun 6, 2011
@@ -4,8 +4,13 @@ begin
rescue LoadError
puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
end
-
-require 'rdoc/task'
+begin
+ require 'rdoc/task'
+rescue LoadError
+ require 'rdoc/rdoc'
+ require 'rake/rdoctask'
+ RDoc::Task = Rake::RDocTask
+end
RDoc::Task.new(:rdoc) do |rdoc|
rdoc.rdoc_dir = 'rdoc'
@@ -1,4 +1,10 @@
-require 'rdoc/task'
+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
class RDocTaskWithoutDescriptions < RDoc::Task

0 comments on commit 1bc159f

Please sign in to comment.