From 7534b29e2660175a74728b21fe87baf3b500d968 Mon Sep 17 00:00:00 2001
From: Josh Holtrop <jholtrop@gmail.com>
Date: Wed, 17 May 2017 09:34:19 -0400
Subject: [PATCH] add Environment#wait_for_threaded_commands, use from
 #run_builder if delayed execution is not allowed

---
 lib/rscons/environment.rb | 30 ++++++++++++++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/lib/rscons/environment.rb b/lib/rscons/environment.rb
index d8d2a3f..21b1851 100644
--- a/lib/rscons/environment.rb
+++ b/lib/rscons/environment.rb
@@ -1,6 +1,7 @@
 require "fileutils"
 require "set"
 require "shellwords"
+require "thwait"
 
 module Rscons
   # The Environment class is the main programmatic interface to Rscons. It
@@ -563,8 +564,10 @@ module Rscons
         else
           # Delayed command execution is not allowed, so we need to execute
           # the command and finalize the builder now.
-          # TODO
-          #rv = builder.finalize()
+          tc = wait_for_threaded_commands(which: [rv])
+          rv = builder.finalize(
+            command_status: tc.thread.value,
+            builder_info: tc.builder_info)
           call_build_hooks[:post] if rv
         end
       else
@@ -775,6 +778,29 @@ module Rscons
       @threaded_commands << tc
     end
 
+    # Wait for threaded commands to complete.
+    #
+    # @param options [Hash]
+    #   Options.
+    # @option options [Set<ThreadedCommand>, Array<ThreadedCommand>] :which
+    #   Which {ThreadedCommand} objects to wait for. If not specified, this
+    #   method will wait for any.
+    #
+    # @return [ThreadedCommand]
+    #   The {ThreadedCommand} object that is finished.
+    def wait_for_threaded_commands(options = {})
+      raise "No threaded commands to wait for" if @threaded_commands.empty?
+      options[:which] ||= @threaded_commands
+      threads = options[:which].map(&:thread)
+      tw = ThreadsWait.new(*threads)
+      finished_thread = tw.next_wait
+      threaded_command = @threaded_commands.find do |tc|
+        tc.thread == finished_thread
+      end
+      @threaded_commands.delete(threaded_command)
+      threaded_command
+    end
+
     # Return a string representation of a command.
     #
     # @param command [Array<String>]