bake-toolkit 2.33.0 → 2.34.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e7ed2853443ad76ecf1127b80c0cd92eef0b3c5
-  data.tar.gz: 9cf372289dca4e9951661e8ac196aaacf2d8c574
+  metadata.gz: 55e127ea891d694b2055ef9c7233f0c2f52955a1
+  data.tar.gz: 897a5a3e47ff5d351ef86395b801389395c8a21f
 SHA512:
-  metadata.gz: ed3019529754a80e9d3525aa9bf80f5d787a24b63ac0ba3752e73abe0570faab8617fd0434039766327473808fff9b5f95e12b81b3948cac970c5464cd2bef8a
-  data.tar.gz: c0ab324a725930bf2fe0302f5f8eaba32a41b8c37e8f2867df034415d27fc3854c895c6d6d133dddfcd5c608ef328dfad30080c083f44a068a26e6319b363e92
+  metadata.gz: df5380fdb0f5b84bf0e393726df5aa259502ec3f721a7e6ed110dda3f1ba845758d2c78449cf0ccb7896cff8ca9094bc930af6552c5394b9ae0deddcde4683fa
+  data.tar.gz: 335f22338bd491a4edab31ac75c272aef67a2bb781f775dc397be558cd9c98cb6f27f995bc5943b3a7c2dc9215017e05cc2a175748982592c76ff99f30092898

data/bin/bakery

@@ -123,6 +123,11 @@ module Bake
       tocxx = ToCxx.new
       tocxx.doit()
       runOk = (ExitHelper.exit_code == 0)
+      if Bake::IDEInterface.instance.get_abort
+        abort = true
+        exitValue = 1
+        break
+      end
     rescue SystemExit
       runOk = (ExitHelper.exit_code == 0)
     rescue Exception => e
@@ -151,16 +156,14 @@ module Bake
     else
       msg1 << "summary: #{maxRuns} of #{maxRuns} builds ok"
     end
-  else
-  end
 
-  timeEnd = Time.now
-  timeDiff = timeEnd - $timeStart
-  failedRuns.each_with_index do |f,i|
-    msg1 << "\n#{i+1}: #{f}"
+    timeEnd = Time.now
+    timeDiff = timeEnd - $timeStart
+    failedRuns.each_with_index do |f,i|
+      msg1 << "\n#{i+1}: #{f}"
+    end
+    msg1 << "\ntime: %02d:%02d minutes" % [timeDiff/60, timeDiff%60]
   end
-  msg1 << "\ntime: %02d:%02d minutes" % [timeDiff/60, timeDiff%60]
-
 
   if failedRuns.length == 0
     Bake.formatter.printSuccess($stars)

data/lib/bake/config/loader.rb

@@ -335,6 +335,7 @@ module Bake
         if (r.length == 3 && r.include?(":/"))
           r = r + Bake.options.main_project_name # glob would not work otherwise on windows (ruby bug?)
         end
+        puts "Checking root #{r}" if Bake.options.verbose >= 1
         r = r+"/**{,/*/**}/Project.meta"
         @potentialProjs.concat(Dir.glob(r).sort)
       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 # Boolean
+    attr_reader :conversion_info, :stopOnFirstError, :clean, :rebuild, :show_includes, :show_includes_and_defines, :projectPaths, :qac, :dry, :syncedOutput # 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
@@ -78,6 +78,7 @@ module Bake
       @def_roots = []
       @main_project_name = ""
       @adapt = []
+      @syncedOutput = false
 
       add_option(["-b",                   ""                     ], lambda { |x| set_build_config(x)                     })
       add_option(["-m"                                           ], lambda { |x| set_main_dir(x)                         })
@@ -87,6 +88,7 @@ module Bake
       add_option(["-a"                                           ], lambda { |x| Bake.formatter.setColorScheme(x.to_sym) })
       add_option(["-w"                                           ], lambda { |x| set_root(x)                             })
       add_option(["-r"                                           ], lambda {     @stopOnFirstError = true                })
+      add_option(["-O"                                           ], lambda {     @syncedOutput = true                    })
       add_option(["--rebuild"                                    ], lambda {     @rebuild = true                         })
       add_option(["--prepro"                                     ], lambda {     @prepro = true                          })
       add_option(["--link-only",          "--link_only"          ], lambda {     @linkOnly = true;                       })

data/lib/bake/options/usage.rb

@@ -33,6 +33,7 @@ module Bake
       puts " --generate-doc           Builds docu instead of compiling sources."
       puts " --ignore-cache           Rereads the original meta files - usefull if workspace structure has been changed."
       puts " -j <num>                 Set NUMBER of parallel compiled files (default is 8)."
+      puts " -O                       The output will be synchronized per configuration. Note, this delays output."
       puts " --socket <num>           Set SOCKET for sending errors, receiving commands, etc. - used by e.g. Eclipse."
       puts " --toolchain-info <name>  Prints default values of a toolchain."
       puts " --toolchain-names        Prints available toolchains."

data/lib/blocks/block.rb

@@ -165,7 +165,11 @@ module Bake
       end
 
       def self.reset_block_counter
-        @@block_counter = 0
+        @@block_counter = 1
+      end
+
+      def self.set_delayed_result
+        @@delayed_result = false
       end
 
       def self.reset_delayed_result
@@ -271,37 +275,44 @@ module Bake
         return depResult
       end
 
+      def self.waitForFreeThread
+        if @@threads.length == Bake.options.threads
+         endedThread = ThreadsWait.new(@@threads).next_wait
+         @@threads.delete(endedThread)
+        end
+      end
+
       def execute_in_thread(method)
         if method == :execute
           @@mutex.synchronize do
-            if @@threads.length == Bake.options.threads
-             endedThread = ThreadsWait.new(@@threads).next_wait
-             @@threads.delete(endedThread)
-            end
-          end
-          thread = Thread.new() {
-
-            exceptionOccured = false
-            begin
-              yield
-              exceptionOccured = true
-            rescue Bake::SystemCommandFailed => scf # normal compilation error
-            rescue SystemExit => exSys
-            rescue Exception => ex1
-              if not Bake::IDEInterface.instance.get_abort
-                SyncOut.mutex.synchronize do
-                  Bake.formatter.printError("Error: #{ex1.message}")
-                  puts ex1.backtrace if Bake.options.debug
+            Block::waitForFreeThread()
+            return if blockAbort?(true)
+
+            @@threads << Thread.new(Thread.current[:stdout], Thread.current[:errorStream]) { |outStr, errStr|
+              Thread.current[:stdout] = outStr
+              Thread.current[:errorStream] = errStr
+              exceptionOccured = false
+              begin
+                yield
+                exceptionOccured = true
+              rescue Bake::SystemCommandFailed => scf # normal compilation error
+              rescue SystemExit => exSys
+              rescue Exception => ex1
+                if not Bake::IDEInterface.instance.get_abort
+                  SyncOut.mutex.synchronize do
+                    Bake.formatter.printError("Error: #{ex1.message}")
+                    puts ex1.backtrace if Bake.options.debug
+                  end
                 end
               end
-            end
-            if !exceptionOccured
-              @result = false
-              @@delayed_result = false
-            end
-          }
-          @@mutex.synchronize do
-            @@threads << thread
+              if !exceptionOccured
+                @result = false
+                @@delayed_result = false
+              end
+            }
+
+            Block::waitForFreeThread()
+            return if blockAbort?(true)
           end
         else
           yield
@@ -314,31 +325,38 @@ module Bake
       end
 
       def callSteps(method)
-
         @config.writeEnvVars()
         Thread.current[:lastCommand] = nil
 
         preSteps.each do |step|
           ThreadsWait.all_waits(Blocks::Block::threads)
           @result = executeStep(step, method) if @result
-          return false if blockAbort?(@result)
+          return @result if blockAbort?(@result)
         end unless @prebuild
 
         threadableSteps    = mainSteps.select { |step| method == :execute && (Library === step || Compile === step) }
         nonThreadableSteps = mainSteps.select { |step| method != :execute || !(Library === step || Compile === step) }
 
+        @outputInMainThread = nonThreadableSteps.any?{ |step| !@prebuild || (Library === step) } ||
+                              postSteps.length > 0 ||
+                              (threadableSteps.length == 0 && preSteps.length > 0)
+
         execute_in_thread(method) {
-          threadableSteps.each do |step|
-            if !@prebuild || (Library === step)
-              Multithread::Jobs.incThread() if Library === step
-              begin
-                @result = executeStep(step, method) if @result
-              ensure
-                Multithread::Jobs.decThread() if Library === step
+          begin
+            threadableSteps.each do |step|
+              if !@prebuild || (Library === step)
+                Multithread::Jobs.incThread() if Library === step
+                begin
+                  @result = executeStep(step, method) if @result
+                ensure
+                  Multithread::Jobs.decThread() if Library === step
+                end
+                @@delayed_result &&= @result
               end
-              @@delayed_result &&= @result
+              break if blockAbort?(@result)
             end
-            break if blockAbort?(@result)
+          ensure
+            SyncOut.stopStream(@result) if !@outputInMainThread
           end
         } if !threadableSteps.empty?
         nonThreadableSteps.each do |step|
@@ -346,13 +364,13 @@ module Bake
             ThreadsWait.all_waits(Blocks::Block::threads)
             @result = executeStep(step, method) if @result
           end
-          return false if blockAbort?(@result)
+          return @result if blockAbort?(@result)
         end
 
         postSteps.each do |step|
           ThreadsWait.all_waits(Blocks::Block::threads)
           @result = executeStep(step, method) if @result
-          return false if blockAbort?(@result)
+          return @result if blockAbort?(@result)
         end unless @prebuild
 
         return @result
@@ -374,26 +392,44 @@ module Bake
         @inDeps = true
         depResult = callDeps(:execute)
         @inDeps = false
-        return false if blockAbort?(depResult)
+        return @result if blockAbort?(depResult)
 
         Bake::IDEInterface.instance.set_build_info(@projectName, @configName)
 
-        SyncOut.mutex.synchronize do
-          if Bake.options.verbose >= 2 || isBuildBlock? || @prebuild
-            typeStr = "Building"
-            if @prebuild
-              typeStr = "Using"
-            elsif not isBuildBlock?
-              typeStr = "Applying"
+        begin
+          SyncOut.mutex.synchronize do
+            @outputInMainThread = true
+            SyncOut.startStream() if Bake.options.syncedOutput
+            if Bake.options.verbose >= 2 || isBuildBlock? || @prebuild
+              typeStr = "Building"
+              if @prebuild
+                typeStr = "Using"
+              elsif not isBuildBlock?
+                typeStr = "Applying"
+              end
+
+              bcStr = ">>CONF_NUM<<"
+              if !Bake.options.syncedOutput
+                bcStr = Block.block_counter
+                Block.inc_block_counter()
+              end
+
+              Bake.formatter.printAdditionalInfo "**** #{typeStr} #{bcStr} of #{@@num_projects}: #{@projectName} (#{@configName}) ****"
             end
-            Block.inc_block_counter()
-            Bake.formatter.printAdditionalInfo "**** #{typeStr} #{Block.block_counter} of #{@@num_projects}: #{@projectName} (#{@configName}) ****"
+            puts "Project path: #{@projectDir}" if Bake.options.projectPaths
+          end
+
+          @result = callSteps(:execute)
+        ensure
+          if @outputInMainThread
+            SyncOut.stopStream(@result)
+          else
+            SyncOut.discardStreams()
           end
-          puts "Project path: #{@projectDir}" if Bake.options.projectPaths
         end
 
-        @result = callSteps(:execute)
-        return (depResult && @result)
+
+        return (depResult && @result)# && @@delayed_result)
       end
 
       def clean
@@ -403,10 +439,6 @@ module Bake
         depResult = callDeps(:clean)
         return false if not depResult and Bake.options.stopOnFirstError
 
-        if Bake.options.verbose >= 2 || isBuildBlock? || @prebuild
-          Block.inc_block_counter()
-        end
-
         if Bake.options.verbose >= 2
           typeStr = "Cleaning"
           if @prebuild
@@ -414,10 +446,13 @@ module Bake
           elsif not isBuildBlock?
             typeStr = "Skipping"
           end
-          Block.inc_block_counter()
           Bake.formatter.printAdditionalInfo "**** #{typeStr} #{Block.block_counter} of #{@@num_projects}: #{@projectName} (#{@configName}) ****"
         end
 
+        if Bake.options.verbose >= 2 || isBuildBlock? || @prebuild
+          Block.inc_block_counter()
+        end
+
         @result = callSteps(:clean)
 
         if Bake.options.clobber

data/lib/blocks/compile.rb

@@ -291,6 +291,7 @@ module Bake
               end
 
               SyncOut.startStream()
+              SyncOut.reset_errors()
               begin
                 Thread.current[:filelist] = Set.new if Bake.options.filelist
                 Thread.current[:lastCommand] = nil
@@ -311,6 +312,7 @@ module Bake
                 jobs.set_failed if not result
               ensure
                 SyncOut.stopStream(result)
+                SyncOut.flush_errors()
               end
               self.mutex.synchronize do
                 fileListBlock.merge(Thread.current[:filelist]) if Bake.options.filelist

data/lib/blocks/executable.rb

@@ -79,7 +79,14 @@ module Bake
       def execute
         Dir.chdir(@projectDir) do
           childs = @block.getBlocks(:childs)
-          return false if childs.any? { |b| b.result == false }
+          if childs.any? { |b| b.result == false }
+            if Bake.options.stopOnFirstError
+              Blocks::Block.set_delayed_result
+              return true
+            else
+              return false
+            end
+          end
 
           allSources = []
           (childs + [@block]).each do |b|

data/lib/common/cleanup.rb

@@ -8,7 +8,7 @@ module Bake
       Blocks::CC2J.clear
       Bake::IDEInterface.instance.set_abort(false)
       Blocks::Block.reset_block_counter
-      Blocks::Block.delayed_result
+      Blocks::Block.reset_delayed_result
     end
 
 end

data/lib/common/ext/stdout.rb

@@ -1,4 +1,5 @@
 require 'stringio'
+require 'blocks/block'
 
 class ThreadOut
 
@@ -44,6 +45,10 @@ STDERR.sync = true
 $stdout = ThreadOut.new(STDOUT)
 $stderr = ThreadOut.new(STDERR)
 
+def puts(o)
+  tmp = Thread.current[:stdout]
+  tmp ? tmp.puts(o) : super(o)
+end
 
 class SyncOut
   def self.mutex
@@ -54,7 +59,7 @@ class SyncOut
     mutex.synchronize do
       tmp = Thread.current[:stdout]
       if tmp.string.length > 0
-        Thread.current[:stdout] = Thread.current[:tmpStdout]
+        Thread.current[:stdout] = Thread.current[:tmpStdout][Thread.current[:tmpStdout].length-1]
         puts tmp.string
         tmp.reopen("")
         Thread.current[:stdout] = tmp
@@ -64,31 +69,57 @@ class SyncOut
 
   def self.startStream
     s = StringIO.new
-    Thread.current[:tmpStdout] = Thread.current[:stdout]
+    if Thread.current[:tmpStdout].nil?
+      Thread.current[:tmpStdout] = [Thread.current[:stdout]]
+    else
+      Thread.current[:tmpStdout] << Thread.current[:stdout]
+    end
+
     Thread.current[:stdout] = s
   end
 
-  def self.stopStream(result)
+  def self.convertConfNum(str)
+    if Bake.options.syncedOutput
+      while str.sub!(">>CONF_NUM<<", Bake::Blocks::Block.block_counter.to_s) do
+        Bake::Blocks::Block.inc_block_counter
+      end
+    end
+  end
+
+  def self.stopStream(result=true)
     s = Thread.current[:stdout]
-    Thread.current[:stdout] = Thread.current[:tmpStdout]
+    return if s.nil?
+    Thread.current[:stdout] = Thread.current[:tmpStdout] ? Thread.current[:tmpStdout].pop : nil
     if s.string.length > 0
       mutex.synchronize do
         if !result && Bake.options.stopOnFirstError
-          @@errors << s.string
+          Thread.current[:errorStream] << s.string
         else
+          convertConfNum(s.string)
           puts s.string
         end
       end
+      s.reopen("")
     end
   end
 
+
+  def self.discardStreams()
+    Thread.current[:tmpStdout] = []
+  end
+
   def self.flush_errors
-    puts @@errors unless @@errors.empty?
-    reset_errors
+    if !Thread.current[:errorStream].empty?
+      mutex.synchronize do
+        convertConfNum(Thread.current[:errorStream])
+        puts Thread.current[:errorStream]
+        reset_errors
+      end
+    end
   end
 
   def self.reset_errors
-    @@errors = ""
+    Thread.current[:errorStream] = ""
   end
 
 end

data/lib/common/version.rb

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

data/lib/multithread/job.rb

@@ -38,7 +38,9 @@ module Bake
         @jobs = jobs
         @threads = []
         nr_of_threads.times do
-          @threads << ::Thread.new do
+          @threads << ::Thread.new(Thread.current[:stdout], Thread.current[:errorStream]) do |outStr, errStr|
+            Thread.current[:stdout] = outStr
+            Thread.current[:errorStream] = errStr
             Jobs.incThread()
             block.call(self)
             Jobs.decThread()

data/lib/tocxx.rb

@@ -356,9 +356,9 @@ module Bake
           result = callBlock(block, method) && result
         ensure
           ThreadsWait.all_waits(Blocks::Block::threads)
-          SyncOut.flush_errors
+          result &&= Blocks::Block.delayed_result
+          SyncOut.stopStream(result)
         end
-        result &&= Blocks::Block.delayed_result
         if not ignoreStopOnFirstError
           return false if not result and Bake.options.stopOnFirstError
         end
@@ -536,6 +536,7 @@ module Bake
         rescue AbortException
           ideAbort = true
         end
+        SyncOut.flush_errors
         result = callBlocks(startBlocks, :exits, true) && result
 
         if ideAbort || Bake::IDEInterface.instance.get_abort

metadata

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