summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-04-03 06:09:37 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-04-03 06:09:37 +0000
commitf01510d074913ac7c62843d661a905ffc265af69 (patch)
tree337aa5c52fb3185273bfbce0d107293aeb54f269
parent6decf411c6f8fd6778d8d4326a8dd8a0e2c09dcd (diff)
* common.mk (rdoc): no force-update, and add RDOCFLAGS.
* lib/rdoc/options.rb (RDoc#parse): no-force-update option. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27205 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--common.mk2
-rw-r--r--lib/rdoc/options.rb2
3 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index fc543a662f8..52528c9279a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sat Apr 3 15:09:30 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * common.mk (rdoc): no force-update, and add RDOCFLAGS.
+
+ * lib/rdoc/options.rb (RDoc#parse): no-force-update option.
+
Sat Apr 3 10:51:10 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* random.c (random_rand): raise ArgumentError on nil, as the
diff --git a/common.mk b/common.mk
index d5aca8f05af..bad3d307c00 100644
--- a/common.mk
+++ b/common.mk
@@ -352,7 +352,7 @@ post-install-doc::
rdoc: main PHONY
@echo Generating RDoc documentation
- $(XRUBY) "$(srcdir)/bin/rdoc" --all --ri --op "$(RDOCOUT)" "$(srcdir)"
+ $(XRUBY) "$(srcdir)/bin/rdoc" --no-force-update --all --ri --op "$(RDOCOUT)" $(RDOCFLAGS) "$(srcdir)"
nodoc: PHONY
what-where-doc: no-install-doc
diff --git a/lib/rdoc/options.rb b/lib/rdoc/options.rb
index e4616f2aed8..f67241bc038 100644
--- a/lib/rdoc/options.rb
+++ b/lib/rdoc/options.rb
@@ -193,7 +193,7 @@ Usage: #{opt.program_name} [options] [names...]
opt.separator nil
- opt.on("--force-update", "-U",
+ opt.on("--[no-]force-update", "-U",
"Forces rdoc to scan all sources even if",
"newer than the flag file.") do |value|
@force_update = value