summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordave <dave@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-02-23 21:17:26 +0000
committerdave <dave@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-02-23 21:17:26 +0000
commitdc03b05a7e8461793963346bc73964dbc675b605 (patch)
tree24ff708857f82e7fe91140dd923aa4e3e81ad696
parent74d704c2635484a12a47aeb2fbcf4c5f48cdbebd (diff)
Check opdir _before_ parsing files
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5816 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--lib/rdoc/rdoc.rb9
2 files changed, 10 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 184e05f4e2..62aefa1020 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Feb 24 06:16:22 2004 Dave Thomas <dave@pragprog.com>
+
+ * lib/rdoc/rdoc.rb (RDoc::RDoc::document): Now create op dir _before_
+ parsing files.
+
Tue Feb 24 06:08:47 2004 Dave Thomas <dave@pragprog.com>
* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_constant):
diff --git a/lib/rdoc/rdoc.rb b/lib/rdoc/rdoc.rb
index 215826c4f3..24e268a8f5 100644
--- a/lib/rdoc/rdoc.rb
+++ b/lib/rdoc/rdoc.rb
@@ -235,6 +235,10 @@ module RDoc
options = Options.instance
options.parse(argv, GENERATORS)
+ unless options.all_one_file
+ setup_output_dir(options.op_dir)
+ end
+
file_info = parse_files(options)
gen = options.generator
@@ -250,10 +254,7 @@ module RDoc
pwd = Dir.pwd
- unless options.all_one_file
- setup_output_dir(options.op_dir)
- Dir.chdir(options.op_dir)
- end
+ Dir.chdir(options.op_dir) unless options.all_one_file
begin
Diagram.new(file_info, options).draw if options.diagram