require 'rake/rdoctask' if failed to require 'rdoc/task'
fixes a regression introduced by b921679d0d
require 'rdoc/task' fails if the system RDoc version is below 2.4.2 (e.g. CRuby 1.8.7)
This commit is contained in:
parent
41eac9b3f6
commit
24b28a2a0c
7
Rakefile
7
Rakefile
|
@ -1,6 +1,11 @@
|
|||
#!/usr/bin/env rake
|
||||
|
||||
require 'rdoc/task'
|
||||
|
||||
begin
|
||||
require 'rdoc/task'
|
||||
rescue LoadError
|
||||
require 'rake/rdoctask'
|
||||
end
|
||||
require 'net/http'
|
||||
|
||||
$:.unshift File.expand_path('..', __FILE__)
|
||||
|
|
|
@ -4,8 +4,11 @@ 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 'rake/rdoctask'
|
||||
end
|
||||
|
||||
RDoc::Task.new(:rdoc) do |rdoc|
|
||||
rdoc.rdoc_dir = 'rdoc'
|
||||
|
|
|
@ -1,4 +1,8 @@
|
|||
require 'rdoc/task'
|
||||
begin
|
||||
require 'rdoc/task'
|
||||
rescue LoadError
|
||||
require 'rake/rdoctask'
|
||||
end
|
||||
|
||||
# Monkey-patch to remove redoc'ing and clobber descriptions to cut down on rake -T noise
|
||||
class RDocTaskWithoutDescriptions < RDoc::Task
|
||||
|
|
|
@ -97,7 +97,12 @@ module RailtiesTest
|
|||
assert !$ran_block
|
||||
require 'rake'
|
||||
require 'rake/testtask'
|
||||
require 'rdoc/task'
|
||||
begin
|
||||
require 'rdoc/task'
|
||||
rescue LoadError
|
||||
require 'rake/rdoctask'
|
||||
end
|
||||
|
||||
|
||||
AppTemplate::Application.load_tasks
|
||||
assert $ran_block
|
||||
|
|
|
@ -237,7 +237,11 @@ module RailtiesTest
|
|||
|
||||
boot_rails
|
||||
require 'rake'
|
||||
require 'rdoc/task'
|
||||
begin
|
||||
require 'rdoc/task'
|
||||
rescue LoadError
|
||||
require 'rake/rdoctask'
|
||||
end
|
||||
require 'rake/testtask'
|
||||
Rails.application.load_tasks
|
||||
Rake::Task[:foo].invoke
|
||||
|
|
Loading…
Reference in New Issue