Permalink
Browse files

Updated rdoc task and rdoc task initialization to fit the current rdo…

…c gem.
  • Loading branch information...
1 parent ef13dd1 commit 681eed26a18be222ec87fdb23cad910f314d8594 @apeiros committed Apr 16, 2010
Showing with 4 additions and 7 deletions.
  1. +0 −2 rake/initialize.rb
  2. +4 −5 rake/tasks/rdoc.rake
View
@@ -87,8 +87,6 @@
# Rdoc
Project.rdoc = SilverPlatter::Project::Description.new({
:options => %w[
- --inline-source
- --line-numbers
--charset utf-8
--tab-width 2
],
View
@@ -7,8 +7,7 @@
require 'rdoc'
-require 'rake/rdoctask'
-require 'rake/lib/rdocmarkdown'
+require 'rdoc/task'
@@ -23,7 +22,7 @@ namespace :doc do
task :coverage => :missing_project
task :ri => :missing_project
task :clobber_ri => :missing_project
- elsif !lib?('rake/rdoctask') then
+ elsif !lib?('rdoc/task') then
task :missing_rdoctask do
abort("Missing rake/rdoctask in Project to run the gem tasks")
end
@@ -45,10 +44,10 @@ namespace :doc do
Project.rdoc.options.push('-t', Project.rdoc.title)
Project.rdoc.__finalize__
- Rake::RDocTask.new do |rd|
+ RDoc::Task.new do |rd|
rd.main = Project.rdoc.main if Project.rdoc.main
rd.rdoc_files = Project.rdoc.files
- rd.rdoc_dir = Project.rdoc.output_dir
+ rd.rdoc_dir = Project.rdoc.output_dir if Project.rdoc.output_dir
rd.template = Project.rdoc.template if Project.rdoc.template
rd.options.concat(Project.rdoc.options)

0 comments on commit 681eed2

Please sign in to comment.