bake-toolkit 2.32.0 → 2.33.0

data/lib/bake/toolchain/errorparser/ti_compiler_error_parser.rb

@@ -1,30 +1,30 @@
-require 'bake/toolchain/errorparser/error_parser'
-
-module Bake
-  class TICompilerErrorParser < ErrorParser
-
-    def initialize()
-      @error_expression = /\"([^,^\"]+)\", line ([0-9]+)[:0-9]* (catastrophic |fatal )*([A-Za-z]+): (.+)/
-    end
-
-    def scan_lines(consoleOutput, proj_dir)
-      res = []
-      consoleOutputFullnames = ""
-      consoleOutput[0].each_line do |l|
-        d = ErrorDesc.new
-        scan_res = l.gsub(/\r\n?/, "").scan(@error_expression)
-        if scan_res.length > 0
-          d.file_name = File.expand_path(scan_res[0][0])
-          d.line_number = scan_res[0][1].to_i
-          d.message = scan_res[0][4]
-          d.severity = get_severity(scan_res[0][3])
-          l.gsub!(scan_res[0][0],d.file_name)
-        end
-        res << d
-        consoleOutputFullnames << l
-      end
-      [res, consoleOutputFullnames]
-    end
-
-  end
-end
+require 'bake/toolchain/errorparser/error_parser'
+
+module Bake
+  class TICompilerErrorParser < ErrorParser
+
+    def initialize()
+      @error_expression = /\"([^,^\"]+)\", line ([0-9]+)[:0-9]* (catastrophic |fatal )*([A-Za-z]+): (.+)/
+    end
+
+    def scan_lines(consoleOutput, proj_dir)
+      res = []
+      consoleOutputFullnames = ""
+      consoleOutput[0].each_line do |l|
+        d = ErrorDesc.new
+        scan_res = l.gsub(/\r\n?/, "").scan(@error_expression)
+        if scan_res.length > 0
+          d.file_name = File.expand_path(scan_res[0][0], proj_dir)
+          d.line_number = scan_res[0][1].to_i
+          d.message = scan_res[0][4]
+          d.severity = get_severity(scan_res[0][3])
+          l.gsub!(scan_res[0][0],d.file_name)
+        end
+        res << d
+        consoleOutputFullnames << l
+      end
+      [res, consoleOutputFullnames]
+    end
+
+  end
+end

data/lib/blocks/block.rb

@@ -1,6 +1,8 @@
 require 'bake/libElement'
 require 'bake/model/metamodel'
 require 'common/abortException'
+require "multithread/job"
+require "thwait"
 
 module Bake
 
@@ -16,6 +18,10 @@ module Bake
 
     class Block
 
+      @@block_counter = 0
+      @@delayed_result = true
+      @@threads = []
+
       attr_reader :lib_elements, :projectDir, :library, :config, :projectName, :prebuild, :output_dir, :tcs
       attr_accessor :visited, :inDeps, :result
 
@@ -73,7 +79,6 @@ module Bake
         @projectName = config.parent.name
         @configName = config.name
         @projectDir = config.get_project_dir
-        @@block_counter = 0
         @result = true
         @tcs = tcs
 
@@ -99,7 +104,9 @@ module Bake
         inc = d.split("/")
         if (inc[0] == "..") # very simple check, but should be okay for 99.9 % of the cases
           if elem and Bake.options.verbose >= 2
-            Bake.formatter.printInfo("path starts with \"..\"", elem)
+            SyncOut.mutex.synchronize do
+              Bake.formatter.printInfo("path starts with \"..\"", elem)
+            end
           end
         end
 
@@ -138,9 +145,11 @@ module Bake
 
         if warnIfLocal && res.length > 1
           if elem and Bake.options.verbose >= 2
-            Bake.formatter.printInfo("#{d} matches several paths:", elem)
-            puts "  #{res[0]} (chosen)"
-            res[1..-1].each { |r| puts "  #{r}" }
+            SyncOut.mutex.synchronize do
+              Bake.formatter.printInfo("#{d} matches several paths:", elem)
+              puts "  #{res[0]} (chosen)"
+              res[1..-1].each { |r| puts "  #{r}" }
+            end
           end
         end
 
@@ -159,6 +168,18 @@ module Bake
         @@block_counter = 0
       end
 
+      def self.reset_delayed_result
+        @@delayed_result = true
+      end
+
+      def self.delayed_result
+        @@delayed_result
+      end
+
+      def self.threads
+        @@threads
+      end
+
       def calcIsBuildBlock
         @startupSteps ||= []
 
@@ -207,8 +228,10 @@ module Bake
         rescue Exception => ex1
           @result = false
           if not Bake::IDEInterface.instance.get_abort
-            Bake.formatter.printError("Error: #{ex1.message}")
-            puts ex1.backtrace if Bake.options.debug
+            SyncOut.mutex.synchronize do
+              Bake.formatter.printError("Error: #{ex1.message}")
+              puts ex1.backtrace if Bake.options.debug
+            end
           end
         end
 
@@ -248,26 +271,88 @@ module Bake
         return depResult
       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
+                end
+              end
+            end
+            if !exceptionOccured
+              @result = false
+              @@delayed_result = false
+            end
+          }
+          @@mutex.synchronize do
+            @@threads << thread
+          end
+        else
+          yield
+        end
+        raise AbortException.new if Bake::IDEInterface.instance.get_abort
+      end
+
+      def blockAbort?(res)
+        ((not res) || !@@delayed_result) and Bake.options.stopOnFirstError or Bake::IDEInterface.instance.get_abort
+      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 not @result and Bake.options.stopOnFirstError
+          return false if blockAbort?(@result)
         end unless @prebuild
 
-        mainSteps.each do |step|
+        threadableSteps    = mainSteps.select { |step| method == :execute && (Library === step || Compile === step) }
+        nonThreadableSteps = mainSteps.select { |step| method != :execute || !(Library === step || Compile === step) }
+
+        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
+              end
+              @@delayed_result &&= @result
+            end
+            break if blockAbort?(@result)
+          end
+        } if !threadableSteps.empty?
+        nonThreadableSteps.each do |step|
           if !@prebuild || (Library === step)
+            ThreadsWait.all_waits(Blocks::Block::threads)
             @result = executeStep(step, method) if @result
           end
-          return false if not @result and Bake.options.stopOnFirstError
+          return false if blockAbort?(@result)
         end
 
         postSteps.each do |step|
+          ThreadsWait.all_waits(Blocks::Block::threads)
           @result = executeStep(step, method) if @result
-          return false if not @result and Bake.options.stopOnFirstError
+          return false if blockAbort?(@result)
         end unless @prebuild
 
         return @result
@@ -276,7 +361,9 @@ module Bake
       def execute
         if (@inDeps)
           if Bake.options.verbose >= 3
-            Bake.formatter.printWarning("While calculating next config, a circular dependency was found including project #{@projectName} with config #{@configName}", @config)
+            SyncOut.mutex.synchronize do
+              Bake.formatter.printWarning("While calculating next config, a circular dependency was found including project #{@projectName} with config #{@configName}", @config)
+            end
           end
           return true
         end
@@ -287,21 +374,23 @@ module Bake
         @inDeps = true
         depResult = callDeps(:execute)
         @inDeps = false
-        return false if not depResult and Bake.options.stopOnFirstError
+        return false if blockAbort?(depResult)
 
         Bake::IDEInterface.instance.set_build_info(@projectName, @configName)
 
-        if Bake.options.verbose >= 2 || isBuildBlock? || @prebuild
-          typeStr = "Building"
-          if @prebuild
-            typeStr = "Using"
-          elsif not isBuildBlock?
-            typeStr = "Applying"
+        SyncOut.mutex.synchronize do
+          if Bake.options.verbose >= 2 || isBuildBlock? || @prebuild
+            typeStr = "Building"
+            if @prebuild
+              typeStr = "Using"
+            elsif not isBuildBlock?
+              typeStr = "Applying"
+            end
+            Block.inc_block_counter()
+            Bake.formatter.printAdditionalInfo "**** #{typeStr} #{Block.block_counter} 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
-        puts "Project path: #{@projectDir}" if Bake.options.projectPaths
 
         @result = callSteps(:execute)
         return (depResult && @result)
@@ -315,6 +404,10 @@ module Bake
         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
             typeStr = "Checking"
@@ -346,6 +439,12 @@ module Bake
         return (depResult && @result)
       end
 
+      def self.init_threads()
+        @@threads = []
+        @@result = true
+        @@mutex = Mutex.new
+      end
+
       def startup
         return true if (@visited)
         @visited = true

data/lib/blocks/blockBase.rb

@@ -1,205 +1,206 @@
-module Bake
-  module Blocks
-
-    class BlockBase
-
-      attr_reader :projectDir, :block
-
-      def initialize(block, config, referencedConfigs)
-        @block = block
-        @config = config
-        @referencedConfigs = referencedConfigs
-        @projectName = config.parent.name
-        @projectDir = config.get_project_dir
-        @config_date = Time.now
-      end
-
-      def check_config_file()
-        if File.exists?(@config.file_name) and File.mtime(@config.file_name) > @config_date
-          begin
-            FileUtils.touch(@config.file_name) if !Bake.options.dry
-          rescue Exception=>e
-            if Bake.options.verbose >= 2
-              Bake.formatter.printWarning("Could not touch #{@config.file_name}: #{e.message}", @config.file_name)
-            end
-          end
-        end
-      end
-
-      def self.prepareOutput(filename)
-        return if Bake.options.dry
-        begin
-          if File.exists?(filename)
-            FileUtils.rm(filename)
-          else
-            FileUtils.mkdir_p(File.dirname(filename))
-          end
-        rescue Exception => e
-          if Bake.options.debug
-            puts e.message
-            puts e.backtrace
-          end
-        end
-      end
-
-      def defaultToolchainTime
-        @defaultToolchainTime ||= File.mtime(Bake.options.main_dir+"/Project.meta")
-      end
-
-      def config_changed?(cmdLineFile)
-        return "because command line file does not exist" if not File.exist?(cmdLineFile)
-        cmdTime = File.mtime(cmdLineFile)
-        return "because config file has been changed" if cmdTime < File.mtime(@config.file_name)
-        return "because DefaultToolchain has been changed" if cmdTime < defaultToolchainTime
-        return "because command line has been changed"
-      end
-
-      def self.isCmdLineEqual?(cmd, cmdLineFile)
-        begin
-          if File.exist?cmdLineFile
-            lastCmdLineArray = File.readlines(cmdLineFile)[0];
-            if lastCmdLineArray == cmd.join(" ")
-              FileUtils.touch(cmdLineFile) if !Bake.options.dry
-              return true
-            end
-          end
-        rescue Exception => e
-          if Bake.options.debug
-            puts e.message
-            puts e.backtrace
-          end
-        end
-        return false
-      end
-
-      def self.writeCmdLineFile(cmd, cmdLineFile)
-        begin
-          if !Bake.options.dry
-            File.open(cmdLineFile, 'w') { |f| f.write(cmd.join(" ")) }
-          end
-        rescue Exception => e
-          if Bake.options.debug
-            puts e.message
-            puts e.backtrace
-          end
-        end
-      end
-
-      def printCmd(cmd, alternate, reason, forceVerbose)
-        if (cmd == Thread.current[:lastCommand])
-          if (Bake.options.verbose >= 2 or (Thread.current[:printedCmdAlternate] and not forceVerbose))
-            return
-          end
-        end
-
-        Thread.current[:lastCommand] = cmd
-
-        return if Bake.options.verbose == 0 and not forceVerbose
-
-        if forceVerbose or Bake.options.verbose >= 2 or not alternate
-          Thread.current[:printedCmdAlternate] = false
-          puts "" if Bake.options.verbose >= 2 # for A.K. :-)
-          if Bake.options.verbose >= 3
-            exedIn = "\n(executed in '#{@projectDir}')"
-            because = reason ? "\n(#{reason})" : ""
-          else
-            exedIn = ""
-            because = ""
-          end
-
-          if cmd.is_a?(Array)
-            puts cmd.join(' ') + exedIn + because
-          else
-            puts cmd + exedIn + because
-          end
-        else
-          Thread.current[:printedCmdAlternate] = true
-          puts alternate
-        end
-
-      end
-
-      def process_console_output(console_output, error_parser)
-        ret = false
-        incList = nil
-        #if not console_output.empty?
-          if error_parser
-            begin
-              x = [console_output]
-              error_descs, console_output_full, incList = error_parser.scan_lines(x, @projectDir)
-
-              console_output = x[0]
-              console_output = console_output_full if Bake.options.consoleOutput_fullnames
-
-              if Bake.options.consoleOutput_visualStudio
-                console_output_VS = ""
-                descCounter = 0
-                console_output.each_line do |l|
-                  d = error_descs[descCounter]
-                  console_output_VS << error_parser.makeVsError(l.rstrip, d) << "\n"
-                  descCounter = descCounter + 1
-                end
-                console_output = console_output_VS
-              end
-
-              ret = error_descs.any? { |e| e.severity == ErrorParser::SEVERITY_ERROR }
-
-              console_output.gsub!(/[\r]/, "")
-              Bake.formatter.format(console_output, error_descs, error_parser) unless console_output.empty?
-
-              Bake::IDEInterface.instance.set_errors(error_descs)
-            rescue Exception => e
-              Bake.formatter.printWarning("Parsing output failed (maybe language not set to English?): " + e.message)
-              Bake.formatter.printWarning("Original output:")
-              Bake.formatter.printWarning(console_output)
-              raise e
-            end
-          else
-            puts console_output # fallback
-          end
-        #end
-        [ret, incList]
-      end
-
-      def process_result(cmd, console_output, error_parser, alternate, reason, success)
-        hasError = (success == false)
-        printCmd(cmd, alternate, reason, hasError)
-        errorPrinted, incList = process_console_output(console_output, error_parser)
-        if hasError and not errorPrinted
-          Bake.formatter.printError("System command failed", @projectDir)
-        end
-        if hasError or (Bake.options.wparse and errorPrinted)
-          raise SystemCommandFailed.new
-        end
-        incList
-      end
-
-
-      def cleanProjectDir
-        if !Bake.options.filename
-          Dir.chdir(@projectDir) do
-            if File.exist?@block.output_dir
-              puts "Deleting folder #{@block.output_dir}" if Bake.options.verbose >= 2
-              if !Bake.options.dry
-                FileUtils.rm_rf(@block.output_dir)
-              end
-
-              if (@block.tcs[:OUTPUT_DIR] == nil) && (Bake.options.buildDirDelimiter == "/") # in this case all builds are placed in a "build" folder
-                buildDir = File.dirname(@block.output_dir)
-                if (File.basename(buildDir) == "build") && (Dir.entries(buildDir).size == 2)# double check if it's really "build" and check if it's empty (except "." and "..")
-                  puts "Deleting folder #{buildDir}" if Bake.options.verbose >= 2
-                  if !Bake.options.dry
-                    FileUtils.rm_rf(buildDir)
-                  end
-                end
-              end
-
-            end
-          end
-        end
-        return true
-      end
-
-    end
-  end
-end
+module Bake
+  module Blocks
+
+    class BlockBase
+
+      attr_reader :projectDir, :block
+
+      def initialize(block, config, referencedConfigs)
+        @block = block
+        @config = config
+        @referencedConfigs = referencedConfigs
+        @projectName = config.parent.name
+        @projectDir = config.get_project_dir
+        @config_date = Time.now
+      end
+
+      def check_config_file()
+        if File.exists?(@config.file_name) and File.mtime(@config.file_name) > @config_date
+          begin
+            FileUtils.touch(@config.file_name) if !Bake.options.dry
+          rescue Exception=>e
+            if Bake.options.verbose >= 2
+              Bake.formatter.printWarning("Could not touch #{@config.file_name}: #{e.message}", @config.file_name)
+            end
+          end
+        end
+      end
+
+      def self.prepareOutput(filename)
+        return if Bake.options.dry
+        filename = File.expand_path(filename, @projectDir)
+        begin
+          if File.exists?(filename)
+            FileUtils.rm(filename)
+          else
+            FileUtils.mkdir_p(File.dirname(filename))
+          end
+        rescue Exception => e
+          if Bake.options.debug
+            puts e.message
+            puts e.backtrace
+          end
+        end
+      end
+
+      def defaultToolchainTime
+        @defaultToolchainTime ||= File.mtime(Bake.options.main_dir+"/Project.meta")
+      end
+
+      def config_changed?(cmdLineFile)
+        return "because command line file does not exist" if not File.exist?(cmdLineFile)
+        cmdTime = File.mtime(cmdLineFile)
+        return "because config file has been changed" if cmdTime < File.mtime(@config.file_name)
+        return "because DefaultToolchain has been changed" if cmdTime < defaultToolchainTime
+        return "because command line has been changed"
+      end
+
+      def self.isCmdLineEqual?(cmd, cmdLineFile)
+        begin
+          if File.exist?cmdLineFile
+            lastCmdLineArray = File.readlines(cmdLineFile)[0];
+            if lastCmdLineArray == cmd.join(" ")
+              FileUtils.touch(cmdLineFile) if !Bake.options.dry
+              return true
+            end
+          end
+        rescue Exception => e
+          if Bake.options.debug
+            puts e.message
+            puts e.backtrace
+          end
+        end
+        return false
+      end
+
+      def self.writeCmdLineFile(cmd, cmdLineFile)
+        begin
+          if !Bake.options.dry
+            File.open(cmdLineFile, 'w') { |f| f.write(cmd.join(" ")) }
+          end
+        rescue Exception => e
+          if Bake.options.debug
+            puts e.message
+            puts e.backtrace
+          end
+        end
+      end
+
+      def printCmd(cmd, alternate, reason, forceVerbose)
+        if (cmd == Thread.current[:lastCommand])
+          if (Bake.options.verbose >= 2 or (Thread.current[:printedCmdAlternate] and not forceVerbose))
+            return
+          end
+        end
+
+        Thread.current[:lastCommand] = cmd
+
+        return if Bake.options.verbose == 0 and not forceVerbose
+
+        if forceVerbose or Bake.options.verbose >= 2 or not alternate
+          Thread.current[:printedCmdAlternate] = false
+          puts "" if Bake.options.verbose >= 2 # for A.K. :-)
+          if Bake.options.verbose >= 3
+            exedIn = "\n(executed in '#{@projectDir}')"
+            because = reason ? "\n(#{reason})" : ""
+          else
+            exedIn = ""
+            because = ""
+          end
+
+          if cmd.is_a?(Array)
+            puts cmd.join(' ') + exedIn + because
+          else
+            puts cmd + exedIn + because
+          end
+        else
+          Thread.current[:printedCmdAlternate] = true
+          puts alternate
+        end
+
+      end
+
+      def process_console_output(console_output, error_parser)
+        ret = false
+        incList = nil
+        #if not console_output.empty?
+          if error_parser
+            begin
+              x = [console_output]
+              error_descs, console_output_full, incList = error_parser.scan_lines(x, @projectDir)
+
+              console_output = x[0]
+              console_output = console_output_full if Bake.options.consoleOutput_fullnames
+
+              if Bake.options.consoleOutput_visualStudio
+                console_output_VS = ""
+                descCounter = 0
+                console_output.each_line do |l|
+                  d = error_descs[descCounter]
+                  console_output_VS << error_parser.makeVsError(l.rstrip, d) << "\n"
+                  descCounter = descCounter + 1
+                end
+                console_output = console_output_VS
+              end
+
+              ret = error_descs.any? { |e| e.severity == ErrorParser::SEVERITY_ERROR }
+
+              console_output.gsub!(/[\r]/, "")
+              Bake.formatter.format(console_output, error_descs, error_parser) unless console_output.empty?
+
+              Bake::IDEInterface.instance.set_errors(error_descs)
+            rescue Exception => e
+              Bake.formatter.printWarning("Parsing output failed (maybe language not set to English?): " + e.message)
+              Bake.formatter.printWarning("Original output:")
+              Bake.formatter.printWarning(console_output)
+              raise e
+            end
+          else
+            puts console_output # fallback
+          end
+        #end
+        [ret, incList]
+      end
+
+      def process_result(cmd, console_output, error_parser, alternate, reason, success)
+        hasError = (success == false)
+        printCmd(cmd, alternate, reason, hasError)
+        errorPrinted, incList = process_console_output(console_output, error_parser)
+        if hasError and not errorPrinted
+          Bake.formatter.printError("System command failed", @projectDir)
+        end
+        if hasError or (Bake.options.wparse and errorPrinted)
+          raise SystemCommandFailed.new
+        end
+        incList
+      end
+
+
+      def cleanProjectDir
+        if !Bake.options.filename
+          Dir.chdir(@projectDir) do
+            if File.exist?@block.output_dir
+              puts "Deleting folder #{@block.output_dir}" if Bake.options.verbose >= 2
+              if !Bake.options.dry
+                FileUtils.rm_rf(@block.output_dir)
+              end
+
+              if (@block.tcs[:OUTPUT_DIR] == nil) && (Bake.options.buildDirDelimiter == "/") # in this case all builds are placed in a "build" folder
+                buildDir = File.dirname(@block.output_dir)
+                if (File.basename(buildDir) == "build") && (Dir.entries(buildDir).size == 2)# double check if it's really "build" and check if it's empty (except "." and "..")
+                  puts "Deleting folder #{buildDir}" if Bake.options.verbose >= 2
+                  if !Bake.options.dry
+                    FileUtils.rm_rf(buildDir)
+                  end
+                end
+              end
+
+            end
+          end
+        end
+        return true
+      end
+
+    end
+  end
+end