From: Bob Aman <bobaman@google.com>
Date: Wed, 16 Nov 2011 12:11:10 +0000 (+0300)
Subject: Resolved deprecation issues with RDoc task.
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/a989f9ad51deb69d4c1822c6fe22e27d1e3c8e85?hp=8b6a103bbf970eb09bd496d7b0a4c0f0b4c318f7

Resolved deprecation issues with RDoc task.
---

diff --git a/tasks/rdoc.rake b/tasks/rdoc.rake
index 81b6076c7e..ef3e008031 100644
--- a/tasks/rdoc.rake
+++ b/tasks/rdoc.rake
@@ -1,12 +1,19 @@
-require 'rake/rdoctask'
+require 'rubygems'
+begin
+  # We prefer to use the RDoc gem over the site version.
+  gem 'rdoc'
+rescue Gem::LoadError
+end unless defined?(RDoc)
+
+require 'rdoc/task'
 
 namespace :doc do
   desc 'Generate RDoc documentation'
-  Rake::RDocTask.new do |rdoc|
+  RDoc::Task.new do |rdoc|
     rdoc.rdoc_dir = 'doc'
     rdoc.title    = "#{PKG_NAME}-#{PKG_VERSION} Documentation"
-    rdoc.options << '--line-numbers' << '--inline-source' <<
-      '--accessor' << 'cattr_accessor=object' << '--charset' << 'utf-8'
+    rdoc.options << '--line-numbers' << 'cattr_accessor=object' <<
+      '--charset' << 'utf-8'
     rdoc.template = "#{ENV['template']}.rb" if ENV['template']
     rdoc.rdoc_files.include('README.md', 'CHANGELOG', 'LICENSE')
     rdoc.rdoc_files.include('lib/**/*.rb')