From e6357f3baa465412c521e7d4b527c868f73ec62e Mon Sep 17 00:00:00 2001 From: take-cheeze Date: Tue, 4 Sep 2018 16:16:25 +0900 Subject: Fix indent. --- minirake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/minirake b/minirake index ad8276a6d..2c93502f2 100755 --- a/minirake +++ b/minirake @@ -590,7 +590,7 @@ class RakeApp wait_process(count + 1) if !$rake_fiber_table.empty? && exited.empty? end - end +end if __FILE__ == $0 then RakeApp.new.run -- cgit v1.2.3 From 901dccb2df17cd6ebd5b9e5c7ef2734af54f0588 Mon Sep 17 00:00:00 2001 From: take-cheeze Date: Tue, 4 Sep 2018 16:16:33 +0900 Subject: Avoid root fiber initialization for CRuby workaround. closes #4085. --- minirake | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/minirake b/minirake index 2c93502f2..86c42c999 100755 --- a/minirake +++ b/minirake @@ -6,12 +6,10 @@ require 'getoptlong' require 'fileutils' -require 'fiber' $rake_fiber_table = {} $rake_jobs = 1 $rake_failed = [] -$rake_root_fiber = Fiber.current class String def ext(newext='') @@ -111,9 +109,13 @@ module MiniRake if needed? @running = true - return Fiber.new do + if $rake_root_fiber + return Fiber.new do + self.execute + $rake_root_fiber.transfer + end + else self.execute - $rake_root_fiber.transfer end end @@ -308,7 +310,7 @@ module MiniRake def sh(cmd) puts cmd if $verbose - if $rake_jobs == 1 || Fiber.current == $rake_root_fiber + if !$rake_root_fiber || Fiber.current == $rake_root_fiber system(cmd) or fail "Command Failed: [#{cmd}]" return end @@ -480,6 +482,12 @@ class RakeApp # Run the +rake+ application. def run handle_options + + if $rake_root_fiber + require 'fiber' + $rake_root_fiber = Fiber.current + end + begin here = Dir.pwd while ! have_rakefile -- cgit v1.2.3