summaryrefslogtreecommitdiffstats
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
commit8746014723b558bce383b447dce1013af0194ce0 (patch)
tree32ddf9e589063097571b675f74db14855164e95b
parentb344686c4a52d4562ade53ea292cecb384b0b82c (diff)
downloadruby-8746014723b558bce383b447dce1013af0194ce0.tar.gz
ruby-8746014723b558bce383b447dce1013af0194ce0.tar.xz
ruby-8746014723b558bce383b447dce1013af0194ce0.zip
Check opdir _before_ parsing files
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@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 85041fe56..ee1e598ed 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 215826c4f..24e268a8f 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