Skip to content

Commit b74df1e

Browse files
committed
Workaround bug #23751. Ensure rake runs w/o rdoc installed.
1 parent 5da2f9d commit b74df1e

File tree

5 files changed

+12
-3
lines changed

5 files changed

+12
-3
lines changed

History.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,15 @@
1313
* Removed support for --accessor, use regular documentation or
1414
the method directive instead. See RDoc::Parser::Ruby
1515
* Removed --ri-system as it is unused by Ruby's makefiles
16-
* Add method list to index.html
16+
* Added method list to index.html
1717

1818
* N Bug Fixes
1919
* nodoc'd classes no longer appear in the index. Bug #23751 by Clifford
2020
Heath.
2121
* Fix 1.9 compatibility issues. Bug #23815 by paddor.
2222
* Darkfish now respects --charset
23+
* RDoc no longer attempts to be lazy when building HTML. This is a
24+
workaround. Bug #23893 by Stefano Crocco.
2325
* RDoc doesn't crash with def (blah).foo() end
2426
* RDoc doesn't crash with #define functions
2527

Manifest.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,16 +98,21 @@ test/binary.dat
9898
test/test.ja.rdoc
9999
test/test.ja.txt
100100
test/test_attribute_manager.rb
101+
test/test_rdoc_any_method.rb
101102
test/test_rdoc_code_object.rb
103+
test/test_rdoc_constant.rb
102104
test/test_rdoc_context.rb
105+
test/test_rdoc_include.rb
103106
test/test_rdoc_markup.rb
104107
test/test_rdoc_markup_attribute_manager.rb
105108
test/test_rdoc_markup_to_html.rb
106109
test/test_rdoc_markup_to_html_crossref.rb
110+
test/test_rdoc_normal_module.rb
107111
test/test_rdoc_parser.rb
108112
test/test_rdoc_parser_c.rb
109113
test/test_rdoc_parser_perl.rb
110114
test/test_rdoc_parser_ruby.rb
115+
test/test_rdoc_require.rb
111116
test/test_rdoc_ri_attribute_formatter.rb
112117
test/test_rdoc_ri_default_display.rb
113118
test/test_rdoc_ri_driver.rb

Rakefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
require 'hoe'
22

3+
$rdoc_rakefile = true
4+
35
$:.unshift 'lib'
46
require 'rdoc'
57

lib/rdoc/generator/darkfish.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# vim: noet ts=2 sts=8 sw=2
33

44
require 'rubygems'
5-
gem 'rdoc', '>= 2.3'
5+
gem 'rdoc', '>= 2.4' if defined? $rdoc_rakefile
66

77
require 'pp'
88
require 'pathname'

lib/rdoc/options.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ def initialize # :nodoc:
141141
@image_format = 'png'
142142
@tab_width = 8
143143
@include_line_numbers = false
144-
@force_update = false
144+
@force_update = true
145145
@verbosity = 1
146146

147147
@webcvs = nil

0 commit comments

Comments
 (0)