bake-toolkit 2.32.0 → 2.33.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6cea1feff9772952716a20f61fe4bad3a94c4bb2
-  data.tar.gz: 58225bbd87e4288b92a801bff0888caab841c9dc
+  metadata.gz: 1e7ed2853443ad76ecf1127b80c0cd92eef0b3c5
+  data.tar.gz: 9cf372289dca4e9951661e8ac196aaacf2d8c574
 SHA512:
-  metadata.gz: f80bf3ca98efcd734e9786a8a0cf4f15361837572900afddd0c1bdb2d76e971cde688e92ceb39089f81c3e53f965467519007a42b425acbc5f9dda8fa567a27d
-  data.tar.gz: bfefc83c40ce2fef0571f5a5bb1508e8fe9aca1757f3eaa1317ae42c8eaff3e7c4dfe9aedd207d3e1db5369ad523bca599db061499594371d03cf1063f9ae2f9
+  metadata.gz: ed3019529754a80e9d3525aa9bf80f5d787a24b63ac0ba3752e73abe0570faab8617fd0434039766327473808fff9b5f95e12b81b3948cac970c5464cd2bef8a
+  data.tar.gz: c0ab324a725930bf2fe0302f5f8eaba32a41b8c37e8f2867df034415d27fc3854c895c6d6d133dddfcd5c608ef328dfad30080c083f44a068a26e6319b363e92

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

@@ -1,40 +1,40 @@
-require 'bake/toolchain/errorparser/error_parser'
-
-module Bake
-  class DiabCompilerErrorParser < ErrorParser
-
-    def initialize()
-      @error_expression_start = /\"(.+)\", line ([0-9]+): (?!included)(catastrophic |fatal )*([A-Za-z]+)[:]* (.+)/
-      @error_expression_end = /^[ \t]*\^/ # well, it may end without "^"... in this case the error will last the next one starts or console text ends
-    end
-
-    def scan_lines(consoleOutput, proj_dir)
-      res = []
-      error_severity = 255
-      consoleOutputFullnames = ""
-      consoleOutput[0].each_line do |l|
-        d = ErrorDesc.new
-        lstripped = l.rstrip
-        scan_res = lstripped.scan(@error_expression_start)
-        if scan_res.length == 0
-          d.severity = error_severity
-          d.message = lstripped
-          if lstripped.scan(@error_expression_end).length > 0
-            error_severity = 255
-          end
-        else
-          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])
-          error_severity = d.severity
-          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 DiabCompilerErrorParser < ErrorParser
+
+    def initialize()
+      @error_expression_start = /\"(.+)\", line ([0-9]+): (?!included)(catastrophic |fatal )*([A-Za-z]+)[:]* (.+)/
+      @error_expression_end = /^[ \t]*\^/ # well, it may end without "^"... in this case the error will last the next one starts or console text ends
+    end
+
+    def scan_lines(consoleOutput, proj_dir)
+      res = []
+      error_severity = 255
+      consoleOutputFullnames = ""
+      consoleOutput[0].each_line do |l|
+        d = ErrorDesc.new
+        lstripped = l.rstrip
+        scan_res = lstripped.scan(@error_expression_start)
+        if scan_res.length == 0
+          d.severity = error_severity
+          d.message = lstripped
+          if lstripped.scan(@error_expression_end).length > 0
+            error_severity = 255
+          end
+        else
+          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])
+          error_severity = d.severity
+          l.gsub!(scan_res[0][0],d.file_name)
+        end
+        res << d
+        consoleOutputFullnames << l
+      end
+      [res, consoleOutputFullnames]
+    end
+
+  end
+end

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

@@ -1,35 +1,35 @@
-require 'bake/toolchain/errorparser/error_parser'
-
-module Bake
-  class GCCCompilerErrorParser < ErrorParser
-
-    def initialize()
-      @error_expression = /([^:]+):([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]
-          if (scan_res[0][3].include?".")
-            d.severity = SEVERITY_ERROR
-            d.message = scan_res[0][3] + ": " + d.message
-          else
-            d.severity = get_severity(scan_res[0][3])
-          end
-          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 GCCCompilerErrorParser < ErrorParser
+
+    def initialize()
+      @error_expression = /([^:]+):([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]
+          if (scan_res[0][3].include?".")
+            d.severity = SEVERITY_ERROR
+            d.message = scan_res[0][3] + ": " + d.message
+          else
+            d.severity = get_severity(scan_res[0][3])
+          end
+          l.gsub!(scan_res[0][0],d.file_name)
+        end
+        res << d
+        consoleOutputFullnames << l
+      end
+      [res, consoleOutputFullnames]
+    end
+
+  end
+end

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

@@ -1,32 +1,32 @@
-require 'bake/toolchain/errorparser/error_parser'
-
-module Bake
-  class GreenHillsCompilerErrorParser < ErrorParser
-
-    def initialize()
-      # example:
-      # "test.c", line 1: warning #123-D: blah blub
-      @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 GreenHillsCompilerErrorParser < ErrorParser
+
+    def initialize()
+      # example:
+      # "test.c", line 1: warning #123-D: blah blub
+      @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/bake/toolchain/errorparser/keil_compiler_error_parser.rb

@@ -1,40 +1,40 @@
-require 'bake/toolchain/errorparser/error_parser'
-
-module Bake
-  class KeilCompilerErrorParser < ErrorParser
-
-    def initialize()
-      @error_expression_start = /\"(.+)\", line ([0-9]+): (?!included)(catastrophic |fatal )*([A-Za-z]+)[:]* (.+)/
-      @error_expression_end = /^[ \t]*\^/ # well, it may end without "^"... in this case the error will last the next one starts or console text ends
-    end
-
-    def scan_lines(consoleOutput, proj_dir)
-      res = []
-      error_severity = 255
-      consoleOutputFullnames = ""
-      consoleOutput[0].each_line do |l|
-        d = ErrorDesc.new
-        lstripped = l.rstrip
-        scan_res = lstripped.scan(@error_expression_start)
-        if scan_res.length == 0
-          d.severity = error_severity
-          d.message = lstripped
-          if lstripped.scan(@error_expression_end).length > 0
-            error_severity = 255
-          end
-        else
-          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])
-          error_severity = d.severity
-          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 KeilCompilerErrorParser < ErrorParser
+
+    def initialize()
+      @error_expression_start = /\"(.+)\", line ([0-9]+): (?!included)(catastrophic |fatal )*([A-Za-z]+)[:]* (.+)/
+      @error_expression_end = /^[ \t]*\^/ # well, it may end without "^"... in this case the error will last the next one starts or console text ends
+    end
+
+    def scan_lines(consoleOutput, proj_dir)
+      res = []
+      error_severity = 255
+      consoleOutputFullnames = ""
+      consoleOutput[0].each_line do |l|
+        d = ErrorDesc.new
+        lstripped = l.rstrip
+        scan_res = lstripped.scan(@error_expression_start)
+        if scan_res.length == 0
+          d.severity = error_severity
+          d.message = lstripped
+          if lstripped.scan(@error_expression_end).length > 0
+            error_severity = 255
+          end
+        else
+          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])
+          error_severity = d.severity
+          l.gsub!(scan_res[0][0],d.file_name)
+        end
+        res << d
+        consoleOutputFullnames << l
+      end
+      [res, consoleOutputFullnames]
+    end
+
+  end
+end

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

@@ -1,63 +1,63 @@
-require 'bake/toolchain/errorparser/error_parser'
-
-module Bake
-  class MSVCCompilerErrorParser < ErrorParser
-
-    def initialize()
-      @error_expression = /(.+)\(([0-9]+)\) : ([A-Za-z\._]+) (C[\d]+: .+)/
-      @incEng = "Note: including file: "
-      @incGer = "Hinweis: Einlesen der Datei: "
-    end
-
-    def scan_lines(consoleOutput, proj_dir)
-      includeList = []
-      res = []
-      consoleOutputFiltered = ""
-      consoleOutputFullnames = ""
-      filterLine = 0
-      consoleOutput[0].each_line do |l|
-        filterLine = filterLine + 1
-        next if (filterLine == 1 and l.include?"Assembling: ")
-        if (filterLine <= 2 and l.include?"Microsoft (R)")
-          filterLine = 1
-          next
-        end
-        next if (filterLine == 2 and l.include?"Copyright (C)")
-        next if (filterLine == 3 and l.strip.empty?)
-        next if (filterLine == 4 and not l.include?" : " and l.include?".") # the source file
-        filterLine = 100
-
-        if l.include?@incEng
-          includeList << l[@incEng.length..-1].strip
-          next
-        end
-        if l.include?@incGer
-          includeList << l[@incGer.length..-1].strip
-          next
-        end
-
-        d = ErrorDesc.new
-        scan_res = l.gsub(/\r\n?/, "").scan(@error_expression)
-        lFull = l
-        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][3]
-          if (scan_res[0][2].include?".")
-            d.severity = SEVERITY_ERROR
-            d.message = scan_res[0][2] + ": " + d.message
-          else
-            d.severity = get_severity(scan_res[0][2])
-          end
-          lFull = l.gsub(scan_res[0][0],d.file_name)
-        end
-        res << d
-        consoleOutputFiltered << l
-        consoleOutputFullnames << lFull
-      end
-      consoleOutput[0] = consoleOutputFiltered
-      [res, consoleOutputFullnames, includeList.uniq]
-    end
-
-  end
-end
+require 'bake/toolchain/errorparser/error_parser'
+
+module Bake
+  class MSVCCompilerErrorParser < ErrorParser
+
+    def initialize()
+      @error_expression = /(.+)\(([0-9]+)\) : ([A-Za-z\._]+) (C[\d]+: .+)/
+      @incEng = "Note: including file: "
+      @incGer = "Hinweis: Einlesen der Datei: "
+    end
+
+    def scan_lines(consoleOutput, proj_dir)
+      includeList = []
+      res = []
+      consoleOutputFiltered = ""
+      consoleOutputFullnames = ""
+      filterLine = 0
+      consoleOutput[0].each_line do |l|
+        filterLine = filterLine + 1
+        next if (filterLine == 1 and l.include?"Assembling: ")
+        if (filterLine <= 2 and l.include?"Microsoft (R)")
+          filterLine = 1
+          next
+        end
+        next if (filterLine == 2 and l.include?"Copyright (C)")
+        next if (filterLine == 3 and l.strip.empty?)
+        next if (filterLine == 4 and not l.include?" : " and l.include?".") # the source file
+        filterLine = 100
+
+        if l.include?@incEng
+          includeList << l[@incEng.length..-1].strip
+          next
+        end
+        if l.include?@incGer
+          includeList << l[@incGer.length..-1].strip
+          next
+        end
+
+        d = ErrorDesc.new
+        scan_res = l.gsub(/\r\n?/, "").scan(@error_expression)
+        lFull = l
+        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][3]
+          if (scan_res[0][2].include?".")
+            d.severity = SEVERITY_ERROR
+            d.message = scan_res[0][2] + ": " + d.message
+          else
+            d.severity = get_severity(scan_res[0][2])
+          end
+          lFull = l.gsub(scan_res[0][0],d.file_name)
+        end
+        res << d
+        consoleOutputFiltered << l
+        consoleOutputFullnames << lFull
+      end
+      consoleOutput[0] = consoleOutputFiltered
+      [res, consoleOutputFullnames, includeList.uniq]
+    end
+
+  end
+end

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

@@ -1,31 +1,31 @@
-require 'bake/toolchain/errorparser/error_parser'
-
-module Bake
-  class TaskingCompilerErrorParser < ErrorParser
-
-    def initialize()
-      @error_expression = /.* (.+): \[\"(.+)\" ([0-9]+)\] (.*)/
-    end
-
-    def scan_lines(consoleOutput, proj_dir)
-      res = []
-      consoleOutputFullnames = ""
-      consoleOutput[0].each_line do |l|
-        d = ErrorDesc.new
-        lstripped = l.rstrip
-        scan_res = lstripped.scan(@error_expression)
-        if scan_res.length > 0
-          d.file_name = File.expand_path(scan_res[0][1])
-          d.line_number = scan_res[0][2].to_i
-          d.message = scan_res[0][3]
-          d.severity = get_tasking_severity(scan_res[0][0])
-          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 TaskingCompilerErrorParser < ErrorParser
+
+    def initialize()
+      @error_expression = /.* (.+): \[\"(.+)\" ([0-9]+)\] (.*)/
+    end
+
+    def scan_lines(consoleOutput, proj_dir)
+      res = []
+      consoleOutputFullnames = ""
+      consoleOutput[0].each_line do |l|
+        d = ErrorDesc.new
+        lstripped = l.rstrip
+        scan_res = lstripped.scan(@error_expression)
+        if scan_res.length > 0
+          d.file_name = File.expand_path(scan_res[0][1], proj_dir)
+          d.line_number = scan_res[0][2].to_i
+          d.message = scan_res[0][3]
+          d.severity = get_tasking_severity(scan_res[0][0])
+          l.gsub!(scan_res[0][0],d.file_name)
+        end
+        res << d
+        consoleOutputFullnames << l
+      end
+      [res, consoleOutputFullnames]
+    end
+
+  end
+end