bake-toolkit 2.32.0 → 2.33.0

data/lib/common/cleanup.rb

@@ -1,10 +1,14 @@
-module Bake
-
-    def self.cleanup()
-      Blocks::ALL_BLOCKS.clear
-      Blocks::ALL_COMPILE_BLOCKS.clear
-      Blocks::CC2J.clear
-      Bake::IDEInterface.instance.set_abort(false)
-    end
-
-end
+require "blocks/block"
+
+module Bake
+
+    def self.cleanup()
+      Blocks::ALL_BLOCKS.clear
+      Blocks::ALL_COMPILE_BLOCKS.clear
+      Blocks::CC2J.clear
+      Bake::IDEInterface.instance.set_abort(false)
+      Blocks::Block.reset_block_counter
+      Blocks::Block.delayed_result
+    end
+
+end

data/lib/common/ext/dir.rb

@@ -0,0 +1,19 @@
+class Dir
+
+  @@mutex = Mutex.new
+
+  def self.glob_dir(pattern, dir)
+    result = nil
+    @@mutex.synchronize do
+      Dir.chdir(dir) do
+        result = Dir.glob(pattern)
+      end
+    end
+    return result
+  end
+
+  def self.mutex
+    @@mutex
+  end
+
+end

data/lib/common/ext/stdout.rb

@@ -1,45 +1,95 @@
-require 'stringio'
-
-class ThreadOut
-
-  def initialize(out)
-    @out = out
-  end
-
-  def write(stuff='')
-    if Thread.current[:stdout] then
-      Thread.current[:stdout].write stuff
-    else
-      @out.write stuff
-    end
-  end
-
-  def puts(stuff='')
-    if Thread.current[:stdout] then
-      Thread.current[:stdout].puts stuff
-    else
-      @out.puts stuff
-    end
-  end
-
-  def print(stuff='')
-    if Thread.current[:stdout] then
-      Thread.current[:stdout].puts stuff
-    else
-      @out.print stuff
-    end
-  end
-
-  def flush
-    if Thread.current[:stdout] then
-      Thread.current[:stdout].flush
-    else
-      @out.flush
-    end
-  end
-end
-
-STDOUT.sync = true
-STDERR.sync = true
-$stdout = ThreadOut.new(STDOUT)
-$stderr = ThreadOut.new(STDERR)
+require 'stringio'
+
+class ThreadOut
+
+  def initialize(out)
+    @out = out
+  end
+
+  def write(stuff='')
+    if Thread.current[:stdout] then
+      Thread.current[:stdout].write stuff
+    else
+      @out.write stuff
+    end
+  end
+
+  def puts(stuff='')
+    if Thread.current[:stdout] then
+      Thread.current[:stdout].puts stuff
+    else
+      @out.puts stuff
+    end
+  end
+
+  def print(stuff='')
+    if Thread.current[:stdout] then
+      Thread.current[:stdout].puts stuff
+    else
+      @out.print stuff
+    end
+  end
+
+  def flush
+    if Thread.current[:stdout] then
+      Thread.current[:stdout].flush
+    else
+      @out.flush
+    end
+  end
+end
+
+STDOUT.sync = true
+STDERR.sync = true
+$stdout = ThreadOut.new(STDOUT)
+$stderr = ThreadOut.new(STDERR)
+
+
+class SyncOut
+  def self.mutex
+    @@mutex ||= Mutex.new
+  end
+
+  def self.flushOutput
+    mutex.synchronize do
+      tmp = Thread.current[:stdout]
+      if tmp.string.length > 0
+        Thread.current[:stdout] = Thread.current[:tmpStdout]
+        puts tmp.string
+        tmp.reopen("")
+        Thread.current[:stdout] = tmp
+      end
+    end
+  end
+
+  def self.startStream
+    s = StringIO.new
+    Thread.current[:tmpStdout] = Thread.current[:stdout]
+    Thread.current[:stdout] = s
+  end
+
+  def self.stopStream(result)
+    s = Thread.current[:stdout]
+    Thread.current[:stdout] = Thread.current[:tmpStdout]
+    if s.string.length > 0
+      mutex.synchronize do
+        if !result && Bake.options.stopOnFirstError
+          @@errors << s.string
+        else
+          puts s.string
+        end
+      end
+    end
+  end
+
+  def self.flush_errors
+    puts @@errors unless @@errors.empty?
+    reset_errors
+  end
+
+  def self.reset_errors
+    @@errors = ""
+  end
+
+end
+

data/lib/common/process.rb

@@ -1,65 +1,65 @@
-module Bake
-
-  class ProcessHelper
-    @@pid = nil
-    @@rd = nil
-
-    def self.run(cmdLineArray, immediateOutput=false, force=true, outpipe=nil, exitCodeArray = [0])
-      rd, wr = IO.pipe
-      @@rd = rd if force
-      duppedCmdLineArray = cmdLineArray.dup
-      duppedCmdLineArray << { :err=>wr, :out=>(outpipe ? outpipe : wr) }
-      begin
-        pid = spawn(*duppedCmdLineArray)
-      rescue Exception => e
-        return [false, e.message]
-      end
-      @@pid = pid if force
-      wr.close
-      output = ""
-      begin
-        while not rd.eof?
-          tmp = rd.read(1)
-          if (tmp != nil)
-            tmp.encode!('UTF-8',  :invalid => :replace, :undef => :replace, :replace => '')
-            tmp.encode!('binary', :invalid => :replace, :undef => :replace, :replace => '')
-            output << tmp
-
-            print tmp if immediateOutput
-          end
-        end
-      rescue
-        # Seems to be a bug in ruby: sometimes there is a bad file descriptor on Windows instead of eof, which causes
-        # an exception on read(). However, this happens not before everything is read, so there is no practical difference
-        # how to "break" the loop.
-        # This problem occurs on Windows command shell and Cygwin.
-      end
-
-      begin
-        rd.close
-      rescue
-      end
-      pid, status = Process.wait2(pid)
-      @@pid = nil
-      @@rd = nil
-      return [false, output] if status.nil?
-      exitCodeArray = [0] if exitCodeArray.empty?
-      [(exitCodeArray.include?status.exitstatus), output]
-    end
-
-    def self.killProcess(force) # do not kill compile processes or implement rd and pid array if really needed
-      begin
-        @@rd.close
-      rescue Exception => e
-      end
-      begin
-        Process.kill("KILL",@@pid)
-      rescue Exception => e
-      end
-      @@rd = nil
-      @@pid = nil
-    end
-
-  end
-
+module Bake
+
+  class ProcessHelper
+    @@pid = nil
+    @@rd = nil
+
+    def self.run(cmdLineArray, immediateOutput=false, force=true, outpipe=nil, exitCodeArray = [0], dir = Dir.pwd)
+      rd, wr = IO.pipe
+      @@rd = rd if force
+      duppedCmdLineArray = cmdLineArray.dup
+      duppedCmdLineArray << { :chdir=>dir, :err=>wr, :out=>(outpipe ? outpipe : wr) }
+      begin
+        pid = spawn(*duppedCmdLineArray)
+      rescue Exception => e
+        return [false, e.message]
+      end
+      @@pid = pid if force
+      wr.close
+      output = ""
+      begin
+        while not rd.eof?
+          tmp = rd.read(1)
+          if (tmp != nil)
+            tmp.encode!('UTF-8',  :invalid => :replace, :undef => :replace, :replace => '')
+            tmp.encode!('binary', :invalid => :replace, :undef => :replace, :replace => '')
+            output << tmp
+
+            print tmp if immediateOutput
+          end
+        end
+      rescue
+        # Seems to be a bug in ruby: sometimes there is a bad file descriptor on Windows instead of eof, which causes
+        # an exception on read(). However, this happens not before everything is read, so there is no practical difference
+        # how to "break" the loop.
+        # This problem occurs on Windows command shell and Cygwin.
+      end
+
+      begin
+        rd.close
+      rescue
+      end
+      pid, status = Process.wait2(pid)
+      @@pid = nil
+      @@rd = nil
+      return [false, output] if status.nil?
+      exitCodeArray = [0] if exitCodeArray.empty?
+      [(exitCodeArray.include?status.exitstatus), output]
+    end
+
+    def self.killProcess(force) # do not kill compile processes or implement rd and pid array if really needed
+      begin
+        @@rd.close
+      rescue Exception => e
+      end
+      begin
+        Process.kill("KILL",@@pid)
+      rescue Exception => e
+      end
+      @@rd = nil
+      @@pid = nil
+    end
+
+  end
+
 end

data/lib/common/version.rb

@@ -1,7 +1,7 @@
 module Bake
   class Version
     def self.number
-      "2.32.0"
+      "2.33.0"
     end
 
     def self.printBakeVersion(ry = "")

data/lib/multithread/job.rb

@@ -1,44 +1,73 @@
-require 'common/ext/stdout'
-require 'stringio'
-require 'thread'
-
-module Bake
-  module Multithread
-
-    class Jobs
-      def initialize(jobs, &block)
-        nr_of_threads = [Bake.options.threads, jobs.length].min
-        @jobs = jobs
-        @threads = []
-        nr_of_threads.times do
-          @threads << ::Thread.new do
-            block.call(self)
-          end
-        end
-      end
-
-      def failed
-        @failed ||= false
-      end
-      def set_failed
-        @failed = true
-      end
-
-      def get_next_or_nil
-        the_next = nil
-        mutex.synchronize {
-          the_next = @jobs.shift
-        }
-        the_next
-      end
-      def join
-        @threads.each{|t| while not t.join(2) do end}
-      end
-      def mutex
-        @mutex ||= Mutex.new
-      end
-    end
-
-  end
-end
-
+require 'common/ext/stdout'
+require 'stringio'
+require 'thread'
+
+module Bake
+  module Multithread
+
+    class Jobs
+
+      @@mutex_sempaphore = Mutex.new
+      @@running_threads = 0
+      @@waiting_threads = 0
+      @@cv = ConditionVariable.new
+
+      def self.incThread
+        @@mutex_sempaphore.synchronize do
+          if @@running_threads >= Bake.options.threads
+            @@waiting_threads += 1
+            @@cv.wait(@@mutex_sempaphore)
+            @@waiting_threads -= 1
+            @@running_threads += 1
+          else
+            @@running_threads += 1
+          end
+        end
+      end
+      def self.decThread
+        @@mutex_sempaphore.synchronize do
+          @@running_threads -= 1
+          if @@waiting_threads > 0
+            @@cv.signal
+          end
+        end
+      end
+
+      def initialize(jobs, &block)
+        nr_of_threads = [Bake.options.threads, jobs.length].min
+        @jobs = jobs
+        @threads = []
+        nr_of_threads.times do
+          @threads << ::Thread.new do
+            Jobs.incThread()
+            block.call(self)
+            Jobs.decThread()
+          end
+        end
+      end
+
+      def failed
+        @failed ||= false
+      end
+      def set_failed
+        @failed = true
+      end
+
+      def get_next_or_nil
+        the_next = nil
+        mutex.synchronize {
+          the_next = @jobs.shift
+        }
+        the_next
+      end
+      def join
+        @threads.each{|t| while not t.join(2) do end}
+      end
+      def mutex
+        @mutex ||= Mutex.new
+      end
+    end
+
+  end
+end
+

data/lib/tocxx.rb

@@ -33,6 +33,7 @@ require 'blocks/showIncludes'
 require 'common/abortException'
 
 require 'adapt/config/loader'
+require "thwait"
 
 module Bake
 
@@ -350,7 +351,14 @@ module Bake
       Blocks::Block.reset_block_counter
       result = true
       startBlocks.each do |block|
-        result = callBlock(block, method) && result
+        begin
+          SyncOut.reset_errors
+          result = callBlock(block, method) && result
+        ensure
+          ThreadsWait.all_waits(Blocks::Block::threads)
+          SyncOut.flush_errors
+        end
+        result &&= Blocks::Block.delayed_result
         if not ignoreStopOnFirstError
           return false if not result and Bake.options.stopOnFirstError
         end
@@ -510,7 +518,10 @@ module Bake
         Bake::IDEInterface.instance.set_build_info(@mainConfig.parent.name, @mainConfig.name, Blocks::ALL_BLOCKS.length)
 
         ideAbort = false
+        Blocks::Block.reset_delayed_result
+
         begin
+          Blocks::Block.init_threads()
           result = callBlocks(startBlocks, :startup, true)
           if Bake.options.clean or Bake.options.rebuild
             if not Bake.options.stopOnFirstError or result
@@ -527,7 +538,7 @@ module Bake
         end
         result = callBlocks(startBlocks, :exits, true) && result
 
-        if ideAbort
+        if ideAbort || Bake::IDEInterface.instance.get_abort
           Bake.formatter.printError("\n#{taskType} aborted.")
           ExitHelper.set_exit_code(1)
           return