bake-toolkit 2.34.3 → 2.34.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ce09ce9775f6b4322517f6b88935b7bf473e40d
-  data.tar.gz: be9156d919acee73ae486bb8f9a1197693701871
+  metadata.gz: a509502821070f924447f0e5690dac7a98efcf3c
+  data.tar.gz: d3ea565246f0a2e940d0cda680edc07cb6807e92
 SHA512:
-  metadata.gz: baeb03be280b965d8f135c78b93c261cae0124e0cd59dde208ace9be0c45a4249c721c18832cffb1fec2ff3cc52d9dbe8090591030dd861e69a552f85dc20282
-  data.tar.gz: fc054cbff5b02d3cb63aba2d0187fd96c2bc3a4941f61d60555303f77b5b33cecdf08864e2edc1264ab83fa4d5e1cce00a8d8b70c947c7a871b5a4a6ccbd33bc
+  metadata.gz: 9c91af0ff514ce5a5c92b501e73246ce2f4b0981427f0e30cc60febc899f06849a7df4a02689e4d07a86f4c9a38f6eee154b3730383ce8c8760dbbcc0e63f91b
+  data.tar.gz: 76c5d9412bf476a6eb41916a556bf844cf231c9213b2a7edfb528f161cfe9599d11651cae884e009432c078c67eabc628c8cb7109ada25a7c21da659ff748be7

data/bin/bakeqac

@@ -66,8 +66,9 @@ def self.executeQacli(cmd, adminStepAndImmediateOutput = false)
     puts "Retry seconds left: %d" % (@options.qacretry - (Time.now - timeStart))
   end
   checkError = !cSizeCheck || licenseError || qacDaemonError
-  puts "Retry timeout over -> failure." if @options.qacretry > 0 && checkError
-
+  if @options.qacretry > 0 && checkError
+    puts "Retry timeout over: %d -> failure." % (@options.qacretry - (Time.now - timeStart))
+  end
   success = false if checkError
   return [success, consoleOutput, checkError]
 end

data/lib/bake/cache.rb

@@ -50,8 +50,8 @@ module Bake
               cache = nil
             end
 
-            puts "Cache: Checking if cache was moved: #{@cacheFilename} vs. #{cache.cache_file}" if Bake.options.debug
             if cache != nil
+              puts "Cache: Checking if cache was moved: #{@cacheFilename} vs. #{cache.cache_file}" if Bake.options.debug
               if cache.cache_file != @cacheFilename
                 Bake.formatter.printInfo("Info: cache filename changed, reloading meta information")
                 cache = nil

data/lib/bake/model/metamodel.rb

@@ -183,6 +183,7 @@ module Bake
         has_attr 'default', String, :defaultValueLiteral => "on"
         has_attr 'filter', String, :defaultValueLiteral => ""
         has_attr 'echo', String, :defaultValueLiteral => "on"
+        has_attr 'independent', Boolean, :defaultValueLiteral => "false"
         has_many_attr 'validExitCodes', Integer
       end
 

data/lib/bake/options/options.rb

@@ -106,10 +106,7 @@ module Bake
 
       add_option(["--adapt"                                      ], lambda { |x| set_adapt(x)                            })
 
-      add_option(["-v0"                                          ], lambda {     @verbose = 0                            })
-      add_option(["-v1"                                          ], lambda {     @verbose = 1                            })
-      add_option(["-v2"                                          ], lambda {     @verbose = 2                            })
-      add_option(["-v3"                                          ], lambda {     @verbose = 3                            })
+      add_option(["-v"                                           ], lambda { |x, dummy1, dummy2| set_verbose(x)          })
 
       add_option(["--debug"                                      ], lambda {     @debug = true                           })
       add_option(["--debug-threads"                              ], lambda {     @debug_threads = true                   })
@@ -117,7 +114,7 @@ module Bake
 
       add_option(["--clobber"                                    ], lambda {     @clobber = true; @clean = true          })
       add_option(["--ignore-cache",       "--ignore_cache"       ], lambda {     @nocache = true                         })
-      add_option(["-j",                   "--threads"            ], lambda { |x| set_threads(x)                          })
+      add_option(["-j",                   "--threads"            ], lambda { |x, dummy1, dummy2| set_threads(x)          })
       add_option(["--socket"                                     ], lambda { |x| @socket = String === x ? x.to_i : x     })
       add_option(["--toolchain-info",     "--toolchain_info"     ], lambda { |x| ToolchainInfo.showToolchain(x)          })
       add_option(["--toolchain-names",    "--toolchain_names"    ], lambda {     ToolchainInfo.showToolchainList         })
@@ -286,7 +283,15 @@ module Bake
       @adapt << name if not @adapt.include?name
     end
 
+    def checkNum(num)
+      if String === num && !/\A\d+\z/.match(num)
+        Bake.formatter.printError("Error: #{num} is not a positive number")
+        ExitHelper.exit(1)
+      end
+    end
+
     def set_threads(num)
+      checkNum(num)
       @threads = String === num ? num.to_i : num
       if @threads <= 0
         Bake.formatter.printError("Error: number of threads must be > 0")
@@ -294,6 +299,15 @@ module Bake
       end
     end
 
+    def set_verbose(num)
+      checkNum(num)
+      @verbose = String === num ? num.to_i : num
+      if @verbose < 0 || verbose > 3
+        Bake.formatter.printError("Error: verbose must be between 0 and 3")
+        ExitHelper.exit(1)
+      end
+    end
+
     def set_set(str)
       ar = str.split("=")
       if not str.include?"=" or ar[0].length == 0

data/lib/blocks/block.rb

@@ -296,42 +296,41 @@ module Bake
         end
       end
 
-      def execute_in_thread(method)
-        if method == :execute
-          @@mutex.synchronize do
-            Block::waitForFreeThread()
-            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
-              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
+      def execute_in_thread(steps)
+        @@mutex.synchronize do
+          Block::waitForFreeThread()
+          return if blockAbort?(true)
+
+          tmpstdout = Thread.current[:tmpStdout].nil? ? nil : Thread.current[:tmpStdout].dup
+          @@threads << Thread.new(Thread.current[:stdout], Thread.current[:errorStream], tmpstdout, steps) { |outStr, errStr, tmpStdout, steps|
+            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
+            Thread.current[:tmpStdout] = tmpStdout
+            Thread.current[:steps] = steps
+            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
-              if !exceptionOccured
-                @result = false
-                @@delayed_result = false
-              end
-              STDOUT.puts "DEBUG_THREADS: Stopped: #{Thread.current.object_id} (#{@projectName}, #{@config.name})" if Bake.options.debug_threads
-            }
+            end
+            if !exceptionOccured
+              @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()
-            return if blockAbort?(true)
-          end
-        else
-          yield
+          Block::waitForFreeThread()
+          return if blockAbort?(true)
         end
         raise AbortException.new if Bake::IDEInterface.instance.get_abort
       end
@@ -340,55 +339,54 @@ module Bake
         ((not res) || !@@delayed_result) and Bake.options.stopOnFirstError or Bake::IDEInterface.instance.get_abort
       end
 
+      def independent?(method, step)
+        method == :execute && (Library === step || Compile === step ||
+          (CommandLine === step && step.config.independent) ||
+          (Makefile === step && step.config.independent))
+      end
+
       def callSteps(method)
         @config.writeEnvVars()
         Thread.current[:lastCommand] = nil
 
-        preSteps.each do |step|
-          Blocks::Block::waitForAllThreads()
-          @result = executeStep(step, method) if @result
-          return @result if blockAbort?(@result)
-        end unless @prebuild
+        allSteps = (preSteps + mainSteps + postSteps)
 
-        threadableSteps    = mainSteps.select { |step| method == :execute && (Library === step || Compile === step) }
-        nonThreadableSteps = mainSteps.select { |step| method != :execute || !(Library === step || Compile === step) }
+        # check if we have to delay the output (if the last step of this block is not in a thread)
+        # todo: sync output if commandline and makefile!!!!!!!!!!!!!!!!!!!
+        @outputStep = nil
+        allSteps.each { |step| @outputStep = independent?(method, step) ? step : nil }
 
-        @outputInMainThread = nonThreadableSteps.any?{ |step| !@prebuild || (Library === step) } ||
-                              postSteps.length > 0 ||
-                              (threadableSteps.length == 0 && preSteps.length > 0)
-
-        execute_in_thread(method) {
-          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
-              break if blockAbort?(@result)
-            end
-          ensure
-            SyncOut.stopStream(@result) if !@outputInMainThread
+        while !allSteps.empty?
+          parallel = []
+          while allSteps.first && independent?(method, allSteps.first)
+            parallel << allSteps.shift
           end
-        } if !threadableSteps.empty?
-        nonThreadableSteps.each do |step|
-          if !@prebuild || (Library === step)
+          if parallel.length > 0
+            execute_in_thread(parallel) {
+              lastStep = Thread.current[:steps].last
+               begin
+                 Thread.current[:steps].each do |step|
+                   Multithread::Jobs.incThread() if !Compile === step
+                   begin
+                     @result = executeStep(step, :execute) if @result
+                   ensure
+                     Multithread::Jobs.decThread() if !Compile === step
+                   end
+                   @@delayed_result &&= @result
+                   break if blockAbort?(@result)
+                 end
+               ensure
+                 SyncOut.stopStream(@result) if lastStep == @outputStep if Bake.options.syncedOutput
+               end
+             }
+          else
+            step = allSteps.shift
             Blocks::Block::waitForAllThreads()
             @result = executeStep(step, method) if @result
           end
           return @result if blockAbort?(@result)
         end
 
-        postSteps.each do |step|
-          Blocks::Block::waitForAllThreads()
-          @result = executeStep(step, method) if @result
-          return @result if blockAbort?(@result)
-        end unless @prebuild
-
         return @result
       end
 
@@ -414,7 +412,7 @@ module Bake
 
         begin
           SyncOut.mutex.synchronize do
-            @outputInMainThread = true
+            @outputStep = nil
             SyncOut.startStream() if Bake.options.syncedOutput
             if Bake.options.verbose >= 2 || isBuildBlock? || @prebuild
               typeStr = "Building"
@@ -437,10 +435,12 @@ module Bake
 
           @result = callSteps(:execute)
         ensure
-          if @outputInMainThread
-            SyncOut.stopStream(@result)
-          else
-            SyncOut.discardStreams()
+          if Bake.options.syncedOutput
+            if !@outputStep
+              SyncOut.stopStream(@result)
+            else
+              SyncOut.discardStreams()
+            end
           end
         end
 
@@ -485,7 +485,7 @@ module Bake
         cleanSteps.each do |step|
           @result = executeStep(step, :cleanStep) if @result
           return false if not @result and Bake.options.stopOnFirstError
-        end unless @prebuild
+        end
 
         return (depResult && @result)
       end

data/lib/blocks/has_execute_command.rb

@@ -3,6 +3,7 @@ module Bake
   module Blocks
 
     module HasExecuteCommand
+      attr_reader :config
 
       def executeCommand(commandLine, ignoreStr=nil, exitCodeArray = [0], echo = "on")
         if Bake.options.dry
@@ -15,9 +16,7 @@ module Bake
         cmd_result = false
         output = ""
         begin
-          Dir.chdir(@projectDir) do
-            cmd_result, output = ProcessHelper.run([commandLine], true, true, nil, exitCodeArray)
-          end
+          cmd_result, output = ProcessHelper.run([commandLine], true, true, nil, exitCodeArray, @projectDir)
         rescue Exception=>e
           puts e.message
           puts e.backtrace if Bake.options.debug

data/lib/common/ext/stdout.rb

@@ -74,7 +74,6 @@ class SyncOut
     else
       Thread.current[:tmpStdout] << Thread.current[:stdout]
     end
-
     Thread.current[:stdout] = s
   end
 
@@ -90,6 +89,7 @@ class SyncOut
     s = Thread.current[:stdout]
     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
@@ -105,7 +105,7 @@ class SyncOut
 
 
   def self.discardStreams()
-    Thread.current[:tmpStdout] = []
+    Thread.current[:stdout] = Thread.current[:tmpStdout] ? Thread.current[:tmpStdout].pop : nil
   end
 
   def self.flush_errors

data/lib/common/options/parser.rb

@@ -18,19 +18,27 @@ module Bake
       params.each { |p| @arguments[p] = block }
     end
 
-    def get_block(param)
-      opt = @arguments[param]
-      raise "Internal error in option handling" unless opt
-      opt.block
+    def valid?(argument)
+      @arguments.keys.any? { |a| a != "" && argument.start_with?(a) }
     end
 
-    def valid?(argument)
-      @arguments.include?argument
+    def get_block(argument)
+      arg = nil
+      block = nil
+      @arguments.each do |a, b|
+        if argument.start_with?(a) && a != ""
+          return [b, nil] if a == argument
+          block = b
+          arg = b.parameters.length==3 ? argument[a.length..-1] : nil
+        end
+      end
+      return [block, arg]
     end
 
     def has_parameter?(argument)
-      return false unless valid?(argument)
-      @arguments[argument].parameters.length == 1
+      b, inPlaceArg = get_block(argument)
+      return false unless b
+      b.parameters.length == 1
     end
 
     def parse_internal(ignore_invalid, subOptions = nil)
@@ -55,29 +63,32 @@ module Bake
             if index != nil and index == 0
               raise "Option #{arg} unknown" if not ignore_invalid
             else
-              @arguments[""].call(arg) # default paramter without "-"
+              @arguments[""].call(arg) # default parameter without "-"
             end
           else
-            option = @arguments[arg]
-            if option.parameters.length >= 1
-              hasArgument = (pos+1 < @argv.length and @argv[pos+1][0] != "-")
-              if option.parameters.length == 2 or hasArgument
-                if option.parameters.length == 2
-                  if hasArgument
-                    option.call(@argv[pos+1], nil) # do not use default value
-                    pos = pos + 1
-                  else
-                    option.call(nil, nil) # use default value
-                  end
-                else
-                  option.call(@argv[pos+1])
-                  pos = pos + 1
-                end
+            option, inPlaceArg = get_block(arg)
+            hasArgument = (pos+1 < @argv.length and @argv[pos+1][0] != "-")
+            if option.parameters.length == 3 && (hasArgument || inPlaceArg)
+              if inPlaceArg
+                option.call(inPlaceArg, nil, nil)
               else
-                raise "Argument for option #{arg} missing"
+                option.call(@argv[pos+1], nil, nil) # do not use inplace value
+                pos = pos + 1
               end
-            else
+            elsif option.parameters.length == 2
+              if hasArgument
+                option.call(@argv[pos+1], nil) # do not use default value
+                pos = pos + 1
+              else
+                option.call(nil, nil) # use default value
+              end
+            elsif option.parameters.length == 1 && hasArgument
+              option.call(@argv[pos+1])
+              pos = pos + 1
+            elsif option.parameters.length == 0
               option.call()
+            else
+              raise "Argument for option #{arg} missing"
             end
           end
           pos = pos + 1

data/lib/common/version.rb

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

data/lib/tocxx.rb

@@ -299,29 +299,31 @@ module Bake
           addSteps(block, block.startupSteps,  config.startupSteps)
           addSteps(block, block.exitSteps,  config.exitSteps)
 
-          if not Bake.options.prepro and not Bake.options.conversion_info and not Bake.options.docu and not Bake.options.filename and not Bake.options.analyze
+          if not block.prebuild and not Bake.options.prepro and not Bake.options.conversion_info and not Bake.options.docu and not Bake.options.filename and not Bake.options.analyze
             addSteps(block, block.preSteps,   config.preSteps)
             addSteps(block, block.postSteps,  config.postSteps)
             addSteps(block, block.cleanSteps, config.cleanSteps)
           end
 
           if Bake.options.docu
-            block.mainSteps << Blocks::Docu.new(config, @configTcMap[config])
+            block.mainSteps << Blocks::Docu.new(config, @configTcMap[config]) unless block.prebuild
           elsif Metamodel::CustomConfig === config
             if not Bake.options.prepro and not Bake.options.conversion_info and not Bake.options.docu and not Bake.options.filename and not Bake.options.analyze
-              addSteps(block, block.mainSteps, config) if config.step
+              addSteps(block, block.mainSteps, config) if config.step unless block.prebuild
             end
           elsif Bake.options.conversion_info
-            block.mainSteps << Blocks::Convert.new(block, config, @referencedConfigs)
+            block.mainSteps << Blocks::Convert.new(block, config, @referencedConfigs) unless block.prebuild
           else
-            compile = Blocks::Compile.new(block, config, @referencedConfigs)
-            (Blocks::ALL_COMPILE_BLOCKS[projName] ||= []) << compile
-            block.mainSteps << compile
+            if not block.prebuild
+              compile = Blocks::Compile.new(block, config, @referencedConfigs)
+              (Blocks::ALL_COMPILE_BLOCKS[projName] ||= []) << compile
+              block.mainSteps << compile
+            end
             if not Bake.options.filename and not Bake.options.analyze
               if Metamodel::LibraryConfig === config
                 block.mainSteps << Blocks::Library.new(block, config, @referencedConfigs, compile)
               else
-                block.mainSteps << Blocks::Executable.new(block, config, @referencedConfigs, compile)
+                block.mainSteps << Blocks::Executable.new(block, config, @referencedConfigs, compile) unless block.prebuild
               end
             end
           end
@@ -357,7 +359,6 @@ module Bake
         ensure
           Blocks::Block::waitForAllThreads()
           result &&= Blocks::Block.delayed_result
-          SyncOut.stopStream(result)
         end
         if not ignoreStopOnFirstError
           return false if not result and Bake.options.stopOnFirstError

metadata

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