diff options
| author | zzak <zzakscott@gmail.com> | 2023-03-04 22:24:01 +0900 |
|---|---|---|
| committer | git <svn-admin@ruby-lang.org> | 2023-05-06 07:39:24 +0000 |
| commit | 8b2884c0b51e4733c09ecbb388ca1b236bad738b (patch) | |
| tree | 220d66663e79698fd81e02cee29c03ac4ded0e81 /lib | |
| parent | 40438fc4d35738cad32d2bb7a0426ee2b1e32ade (diff) | |
| download | ruby-8b2884c0b51e4733c09ecbb388ca1b236bad738b.tar.gz | |
[ruby/rdoc] Isolate root dir if specified
This ensures only files from the root directory are chosen, in order to allow a clean build from outside the source directory.
https://github.com/ruby/rdoc/commit/f3b389aa9e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/rdoc/options.rb | 5 | ||||
| -rw-r--r-- | lib/rdoc/rdoc.rb | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/lib/rdoc/options.rb b/lib/rdoc/options.rb index eed0f6b39b..6ee29fd071 100644 --- a/lib/rdoc/options.rb +++ b/lib/rdoc/options.rb @@ -565,9 +565,10 @@ class RDoc::Options @op_dir ||= 'doc' - @rdoc_include << "." if @rdoc_include.empty? root = @root.to_s - @rdoc_include << root unless @rdoc_include.include?(root) + if @rdoc_include.empty? || !@rdoc_include.include?(root) + @rdoc_include << root + end @exclude = self.exclude diff --git a/lib/rdoc/rdoc.rb b/lib/rdoc/rdoc.rb index 7e17b71d6b..2da6d9b575 100644 --- a/lib/rdoc/rdoc.rb +++ b/lib/rdoc/rdoc.rb @@ -119,7 +119,7 @@ class RDoc::RDoc # +files+. def gather_files files - files = ["."] if files.empty? + files = [@options.root.to_s] if files.empty? file_list = normalized_file_list files, true, @options.exclude |