Skip to content

Commit

Permalink
* common.mk: Added --pages-dir to rdoc creation. Now doc/ items show
Browse files Browse the repository at this point in the history
  up at top-level.
* .document:  Moved doc/* entries to doc/.document
* doc/.document:  ditto


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38312 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information
drbrain committed Dec 11, 2012
1 parent b65b75b commit 52d4a46
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 5 deletions.
5 changes: 1 addition & 4 deletions .document
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,4 @@ README.EXT
README.EXT.ja
README.ja

doc/*.rdoc
doc/ChangeLog*
doc/NEWS-*

doc
7 changes: 7 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
Tue Dec 11 16:57:33 2012 Eric Hodel <drbrain@segment7.net>

* common.mk: Added --pages-dir to rdoc creation. Now doc/ items show
up at top-level.
* .document: Moved doc/* entries to doc/.document
* doc/.document: ditto

Tue Dec 11 16:44:37 2012 Eric Hodel <drbrain@segment7.net>

* lib/rdoc/options.rb: Added --page-dir option for moving pages in
Expand Down
2 changes: 1 addition & 1 deletion common.mk
Original file line number Diff line number Diff line change
Expand Up @@ -408,7 +408,7 @@ post-install-doc::

rdoc: PHONY main
@echo Generating RDoc documentation
$(Q) $(XRUBY) "$(srcdir)/bin/rdoc" --root "$(srcdir)" --encoding=UTF-8 --no-force-update --all --ri --op "$(RDOCOUT)" --debug $(RDOCFLAGS) "$(srcdir)"
$(Q) $(XRUBY) "$(srcdir)/bin/rdoc" --root "$(srcdir)" --page-dir "$(srcdir)/doc" --encoding=UTF-8 --no-force-update --all --ri --op "$(RDOCOUT)" --debug $(RDOCFLAGS) "$(srcdir)"

rdoc-coverage: PHONY main
@echo Generating RDoc coverage report
Expand Down
3 changes: 3 additions & 0 deletions doc/.document
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
*.rdoc
ChangeLog*
NEWS-*

0 comments on commit 52d4a46

Please sign in to comment.