diff options
author | nahi <nahi@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-12-24 14:09:57 +0000 |
---|---|---|
committer | nahi <nahi@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-12-24 14:09:57 +0000 |
commit | 101929732344e023cebbe3e6edf3d08276bdac5b (patch) | |
tree | 72e62ba9f7e09f80cc1eca749562e63b36697489 /lib/rdoc | |
parent | ce0aa0af9107018bd5d7fcfe4fc5b27da1896342 (diff) |
Mon Dec 24 23:04:57 2007 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
* lib/ftools.rb: removed obsoleted lib. use fileutils instead (by eban).
* lib/rdoc/rdoc.rb, lib/rdoc/generators/*, lib/rake.rb: let it use
fileutils instead of ftools.
* lib/shell/command-processor.rb: removed unused references to ftools.
* lib/parsedate.rb: removed. see [ruby-core:12535], [ruby-dev:31969].
* lib/README: updated.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14610 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rdoc')
-rw-r--r-- | lib/rdoc/generators/html_generator.rb | 9 | ||||
-rw-r--r-- | lib/rdoc/generators/ri_generator.rb | 2 | ||||
-rw-r--r-- | lib/rdoc/generators/xml_generator.rb | 2 | ||||
-rw-r--r-- | lib/rdoc/rdoc.rb | 4 |
4 files changed, 7 insertions, 10 deletions
diff --git a/lib/rdoc/generators/html_generator.rb b/lib/rdoc/generators/html_generator.rb index 1f9b808e8d..4348703c30 100644 --- a/lib/rdoc/generators/html_generator.rb +++ b/lib/rdoc/generators/html_generator.rb @@ -34,7 +34,7 @@ # HTML is generated using the Template class. # -require 'ftools' +require 'fileutils' require 'rdoc/options' require 'rdoc/template' @@ -1025,7 +1025,7 @@ module Generators def create_source_code_file(code_body) meth_path = @html_class.path.sub(/\.html$/, '.src') - File.makedirs(meth_path) + FileUtils.mkdir_p(meth_path) file_path = File.join(meth_path, @seq) + ".html" template = TemplatePage.new(RDoc::Page::SRC_PAGE) @@ -1235,7 +1235,8 @@ module Generators # directory structure def gen_sub_directories - File.makedirs(FILE_DIR, CLASS_DIR) + FileUtils.mkdir_p(FILE_DIR) + FileUtils.mkdir_p(CLASS_DIR) rescue $stderr.puts $!.message exit 1 @@ -1289,7 +1290,7 @@ module Generators list.each do |item| if item.document_self op_file = item.path - File.makedirs(File.dirname(op_file)) + FileUtils.mkdir_p(File.dirname(op_file)) File.open(op_file, "w") { |file| item.write_on(file) } end end diff --git a/lib/rdoc/generators/ri_generator.rb b/lib/rdoc/generators/ri_generator.rb index c7d0bbd8f0..bf22bc8dba 100644 --- a/lib/rdoc/generators/ri_generator.rb +++ b/lib/rdoc/generators/ri_generator.rb @@ -34,8 +34,6 @@ # HTML is generated using the Template class. # -require 'ftools' - require 'rdoc/options' require 'rdoc/template' require 'rdoc/markup/simple_markup' diff --git a/lib/rdoc/generators/xml_generator.rb b/lib/rdoc/generators/xml_generator.rb index 8c1a76d62b..561a9ad694 100644 --- a/lib/rdoc/generators/xml_generator.rb +++ b/lib/rdoc/generators/xml_generator.rb @@ -1,6 +1,4 @@ -require 'ftools' - require 'rdoc/options' require 'rdoc/markup/simple_markup' require 'rdoc/markup/simple_markup/to_html' diff --git a/lib/rdoc/rdoc.rb b/lib/rdoc/rdoc.rb index 91f5611196..af4a822da1 100644 --- a/lib/rdoc/rdoc.rb +++ b/lib/rdoc/rdoc.rb @@ -15,7 +15,7 @@ require 'rdoc/options' require 'rdoc/diagram' require 'find' -require 'ftools' +require 'fileutils' require 'time' # We put rdoc stuff in the RDoc module to avoid namespace @@ -125,7 +125,7 @@ module RDoc last = (Time.parse(created) unless force rescue nil) end else - File.makedirs(op_dir) + FileUtils.mkdir_p(op_dir) end last end |