From c53846a22a48781ea2e692b7b8facaab359f9b2e Mon Sep 17 00:00:00 2001 From: Daniel Bovensiepen Date: Tue, 15 Apr 2014 18:28:16 +0800 Subject: merge @mattn's win-compatibility --- doc/language/generator.rb | 9 ++++++--- doc/language/mrbdoc/lib/mrbdoc_docu.rb | 2 +- doc/language/mrbdoc/mrbdoc.rb | 1 + 3 files changed, 8 insertions(+), 4 deletions(-) (limited to 'doc') diff --git a/doc/language/generator.rb b/doc/language/generator.rb index a94e8011b..c5bab1f84 100755 --- a/doc/language/generator.rb +++ b/doc/language/generator.rb @@ -6,7 +6,10 @@ c_dir = File.dirname(__FILE__) MRUBY_ROOT = File.expand_path("#{c_dir}/../..") DOC_DIR = File.expand_path(c_dir) -cmd = "#{DOC_DIR}/mrbdoc/mrbdoc.rb #{MRUBY_ROOT} #{DOC_DIR}" -PTY.spawn(cmd) do |i,o,pid| - i.each { |l| print l } +cmd = "ruby #{DOC_DIR}/mrbdoc/mrbdoc.rb #{MRUBY_ROOT} #{DOC_DIR} false" +IO.popen(cmd, "r+") do |io| + io.close_write + while line = io.gets + puts line + end end diff --git a/doc/language/mrbdoc/lib/mrbdoc_docu.rb b/doc/language/mrbdoc/lib/mrbdoc_docu.rb index b2f45851e..4dc20a5a3 100644 --- a/doc/language/mrbdoc/lib/mrbdoc_docu.rb +++ b/doc/language/mrbdoc/lib/mrbdoc_docu.rb @@ -10,7 +10,7 @@ class MRBDoc private def write dir, cfg - File.open(File.expand_path('Core.md', dir), 'w+') do |io| + File.open(File.expand_path('Core.md', dir), 'wb+') do |io| print_core_classes(io, cfg) print_core_modules(io, cfg) end diff --git a/doc/language/mrbdoc/mrbdoc.rb b/doc/language/mrbdoc/mrbdoc.rb index 5a8e4641a..cafdf112a 100755 --- a/doc/language/mrbdoc/mrbdoc.rb +++ b/doc/language/mrbdoc/mrbdoc.rb @@ -8,6 +8,7 @@ require 'mrbdoc_docu' MRUBY_ROOT = ARGV[0] DOC_ROOT = ARGV[1] _WRITE_LINE_NO = ARGV[2] +STDOUT.sync = true raise ArgumentError.new 'mruby root missing!' if MRUBY_ROOT.nil? raise ArgumentError.new 'doc root missing!' if DOC_ROOT.nil? -- cgit v1.2.3