bake-toolkit 2.34.0 → 2.34.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 55e127ea891d694b2055ef9c7233f0c2f52955a1
-  data.tar.gz: 897a5a3e47ff5d351ef86395b801389395c8a21f
+  metadata.gz: b11e2453cd82049d2070eb49b22ecb28d8048bde
+  data.tar.gz: f10d2cd9bfeca29b371f7c9ee20fad0147390410
 SHA512:
-  metadata.gz: df5380fdb0f5b84bf0e393726df5aa259502ec3f721a7e6ed110dda3f1ba845758d2c78449cf0ccb7896cff8ca9094bc930af6552c5394b9ae0deddcde4683fa
-  data.tar.gz: 335f22338bd491a4edab31ac75c272aef67a2bb781f775dc397be558cd9c98cb6f27f995bc5943b3a7c2dc9215017e05cc2a175748982592c76ff99f30092898
+  metadata.gz: f0bb5910da86ad9840662d921af520b44cb7b63b14c265ab3e3cf9e2ba3d800f23dc888fdffaea3fea7db4f6f482a088bede87ec5a968713c2eecf5825564a60
+  data.tar.gz: bbb83467b457996c83a751383f90bae049cdba3d60c9a60258457a06a62b04bc20783ccb7c35c13b1f9eb790b9609f97aabe2f20a252cb592a5e6a9d0b6a8486

data/bin/bakery

@@ -125,6 +125,7 @@ module Bake
       runOk = (ExitHelper.exit_code == 0)
       if Bake::IDEInterface.instance.get_abort
         abort = true
+        msg1 << "aborted"
         exitValue = 1
         break
       end

data/lib/bake/options/options.rb

@@ -20,7 +20,7 @@ module Bake
     attr_accessor :build_config, :nocache, :analyze, :eclipseOrder, :envToolchain, :showConfigs
     attr_reader :main_dir, :project, :filename, :main_project_name, :buildDirDelimiter, :dot, :cc2j_filename # String
     attr_reader :roots, :include_filter, :exclude_filter, :adapt # String List
-    attr_reader :conversion_info, :stopOnFirstError, :clean, :rebuild, :show_includes, :show_includes_and_defines, :projectPaths, :qac, :dry, :syncedOutput # Boolean
+    attr_reader :conversion_info, :stopOnFirstError, :clean, :rebuild, :show_includes, :show_includes_and_defines, :projectPaths, :qac, :dry, :syncedOutput, :debug_threads # Boolean
     attr_reader :linkOnly, :compileOnly, :no_autodir, :clobber, :docu, :debug, :prepro, :oldLinkOrder, :prebuild, :printTime, :json, :wparse # Boolean
     attr_reader :threads, :socket # Fixnum
     attr_reader :vars # map
@@ -32,6 +32,7 @@ module Bake
     def initialize(argv)
       super(argv)
 
+      @debug_threads = false
       @dry = false
       @filelist = nil
       @qac = false
@@ -111,6 +112,7 @@ module Bake
       add_option(["-v3"                                          ], lambda {     @verbose = 3                            })
 
       add_option(["--debug"                                      ], lambda {     @debug = true                           })
+      add_option(["--debug-threads"                              ], lambda {     @debug_threads = true                   })
       add_option(["--set"                                        ], lambda { |x| set_set(x)                              })
 
       add_option(["--clobber"                                    ], lambda {     @clobber = true; @clean = true          })

data/lib/bake/options/usage.rb

@@ -66,6 +66,7 @@ module Bake
       puts " -h, --help               Print this help."
       puts " --license                Print the license."
       puts " --debug                  Print out backtraces in some cases - used only for debugging bake."
+      puts " --debug-threads          Print some debug information about started and stopped threads."
       ExitHelper.exit(0)
     end
 

data/lib/blocks/block.rb

@@ -184,6 +184,15 @@ module Bake
         @@threads
       end
 
+      def self.waitForAllThreads
+        if @@threads.length > 0
+          STDOUT.puts "DEBUG_THREADS: Wait for all threads." if Bake.options.debug_threads
+          ThreadsWait.all_waits(@@threads)
+          @@threads = []
+          STDOUT.puts "DEBUG_THREADS: All threads finished." if Bake.options.debug_threads
+        end
+      end
+
       def calcIsBuildBlock
         @startupSteps ||= []
 
@@ -277,8 +286,13 @@ module Bake
 
       def self.waitForFreeThread
         if @@threads.length == Bake.options.threads
-         endedThread = ThreadsWait.new(@@threads).next_wait
-         @@threads.delete(endedThread)
+          begin
+            STDOUT.puts "DEBUG_THREADS: Wait for free thread." if Bake.options.debug_threads
+            endedThread = ThreadsWait.new(@@threads).next_wait
+            STDOUT.puts "DEBUG_THREADS: Thread free." if Bake.options.debug_threads
+            @@threads.delete(endedThread)
+          rescue ErrNoWaitingThread
+          end
         end
       end
 
@@ -289,6 +303,7 @@ module Bake
             return if blockAbort?(true)
 
             @@threads << Thread.new(Thread.current[:stdout], Thread.current[:errorStream]) { |outStr, errStr|
+              STDOUT.puts "DEBUG_THREADS: Started: #{Thread.current.object_id} (#{@projectName}, #{@config.name})" if Bake.options.debug_threads
               Thread.current[:stdout] = outStr
               Thread.current[:errorStream] = errStr
               exceptionOccured = false
@@ -309,6 +324,7 @@ module Bake
                 @result = false
                 @@delayed_result = false
               end
+              STDOUT.puts "DEBUG_THREADS: Stopped: #{Thread.current.object_id} (#{@projectName}, #{@config.name})" if Bake.options.debug_threads
             }
 
             Block::waitForFreeThread()
@@ -329,7 +345,7 @@ module Bake
         Thread.current[:lastCommand] = nil
 
         preSteps.each do |step|
-          ThreadsWait.all_waits(Blocks::Block::threads)
+          Blocks::Block::waitForAllThreads()
           @result = executeStep(step, method) if @result
           return @result if blockAbort?(@result)
         end unless @prebuild
@@ -361,14 +377,14 @@ module Bake
         } if !threadableSteps.empty?
         nonThreadableSteps.each do |step|
           if !@prebuild || (Library === step)
-            ThreadsWait.all_waits(Blocks::Block::threads)
+            Blocks::Block::waitForAllThreads()
             @result = executeStep(step, method) if @result
           end
           return @result if blockAbort?(@result)
         end
 
         postSteps.each do |step|
-          ThreadsWait.all_waits(Blocks::Block::threads)
+          Blocks::Block::waitForAllThreads()
           @result = executeStep(step, method) if @result
           return @result if blockAbort?(@result)
         end unless @prebuild

data/lib/common/version.rb

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

data/lib/tocxx.rb

@@ -355,7 +355,7 @@ module Bake
           SyncOut.reset_errors
           result = callBlock(block, method) && result
         ensure
-          ThreadsWait.all_waits(Blocks::Block::threads)
+          Blocks::Block::waitForAllThreads()
           result &&= Blocks::Block.delayed_result
           SyncOut.stopStream(result)
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bake-toolkit
 version: !ruby/object:Gem::Version
-  version: 2.34.0
+  version: 2.34.1
 platform: ruby
 authors:
 - Alexander Schaal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-08 00:00:00.000000000 Z
+date: 2017-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rtext