bake-toolkit 2.20.4 → 2.21.0

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

@@ -1,44 +1,44 @@
-require 'bake/toolchain/errorparser/error_parser'
-
-module Bake
-  class GreenHillsLinkerErrorParser < ErrorParser
-
-#    detect this:
-
-#    C++ prelinker: recompiling "x/y.z"
-#    "blah.h", line 1: warning #123-D: expression has no effect
-#                    uiuiui
-#                    ^
-#              detected during:
-#                instantiation of ...
-    
-#   dblink: WARNING: 10 problems were encountered while processing debug information, see "Debug/xy.dle" for details.
-    
-    def initialize()
-      @error_expression = /ld: (.+)/
-    end
-
-    def scan_lines(consoleOutput, proj_dir)
-      res = []
-      error_severity = 255
-      consoleOutput[0].each_line do |l|
-        l.rstrip!
-        d = ErrorDesc.new
-        scan_res = l.scan(@error_expression)
-        if scan_res.length == 0 # msg will end with the beginning of the next message
-          d.severity = error_severity
-          d.message = l
-        elsif scan_res.length > 0
-          d.file_name = proj_dir
-          d.line_number = 0
-          d.message = scan_res[0][0]
-          d.severity = SEVERITY_ERROR
-          error_severity = d.severity
-        end
-        res << d
-      end
-      [res, consoleOutput[0]]
-    end
-
-  end
-end
+require 'bake/toolchain/errorparser/error_parser'
+
+module Bake
+  class GreenHillsLinkerErrorParser < ErrorParser
+
+#    detect this:
+
+#    C++ prelinker: recompiling "x/y.z"
+#    "blah.h", line 1: warning #123-D: expression has no effect
+#                    uiuiui
+#                    ^
+#              detected during:
+#                instantiation of ...
+
+#   dblink: WARNING: 10 problems were encountered while processing debug information, see "Debug/xy.dle" for details.
+
+    def initialize()
+      @error_expression = /ld: (.+)/
+    end
+
+    def scan_lines(consoleOutput, proj_dir)
+      res = []
+      error_severity = 255
+      consoleOutput[0].each_line do |l|
+        l.rstrip!
+        d = ErrorDesc.new
+        scan_res = l.scan(@error_expression)
+        if scan_res.length == 0 # msg will end with the beginning of the next message
+          d.severity = error_severity
+          d.message = l
+        elsif scan_res.length > 0
+          d.file_name = proj_dir
+          d.line_number = 0
+          d.message = scan_res[0][0]
+          d.severity = SEVERITY_ERROR
+          error_severity = d.severity
+        end
+        res << d
+      end
+      [res, consoleOutput[0]]
+    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])
+          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/keil_linker_error_parser.rb

@@ -1,30 +1,30 @@
-require 'bake/toolchain/errorparser/error_parser'
-
-module Bake
-  class KeilLinkerErrorParser < ErrorParser
-
-    def initialize()
-      @error_expression = /([^:]+): (L[0-9]+[A-Z]: .+)/
-    end
-
-    def scan_lines(consoleOutput, proj_dir)
-      res = []
-      consoleOutput[0].each_line do |l|
-        l.rstrip!
-        d = ErrorDesc.new
-        scan_res = l.scan(@error_expression)
-        if scan_res.length > 0
-          d.file_name = proj_dir
-          d.line_number = 0
-          d.message = scan_res[0][1]
-          d.severity = get_severity(scan_res[0][0])
-          error_severity = d.severity
-        end
-        res << d
-      end
-      [res, consoleOutput[0]]
-    end
-
-
-  end
-end
+require 'bake/toolchain/errorparser/error_parser'
+
+module Bake
+  class KeilLinkerErrorParser < ErrorParser
+
+    def initialize()
+      @error_expression = /([^:]+): (L[0-9]+[A-Z]: .+)/
+    end
+
+    def scan_lines(consoleOutput, proj_dir)
+      res = []
+      consoleOutput[0].each_line do |l|
+        l.rstrip!
+        d = ErrorDesc.new
+        scan_res = l.scan(@error_expression)
+        if scan_res.length > 0
+          d.file_name = proj_dir
+          d.line_number = 0
+          d.message = scan_res[0][1]
+          d.severity = get_severity(scan_res[0][0])
+          error_severity = d.severity
+        end
+        res << d
+      end
+      [res, consoleOutput[0]]
+    end
+
+
+  end
+end

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

@@ -1,34 +1,34 @@
-require 'bake/toolchain/errorparser/error_parser'
-
-module Bake
-  class LintErrorParser < ErrorParser
-
-    def initialize()
-      @error_expression = /([^:]*):([0-9]+): ([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
-          if (scan_res[0][0] == "")
-            d.file_name = proj_dir
-          else
-            d.file_name = File.expand_path(scan_res[0][0])
-          end
-          d.line_number = scan_res[0][1].to_i
-          d.severity = get_severity(scan_res[0][2])
-          d.message = 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 LintErrorParser < ErrorParser
+
+    def initialize()
+      @error_expression = /([^:]*):([0-9]+): ([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
+          if (scan_res[0][0] == "")
+            d.file_name = proj_dir
+          else
+            d.file_name = File.expand_path(scan_res[0][0])
+          end
+          d.line_number = scan_res[0][1].to_i
+          d.severity = get_severity(scan_res[0][2])
+          d.message = 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/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])
+          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/msvc_linker_error_parser.rb

@@ -1,42 +1,42 @@
-require 'bake/toolchain/errorparser/error_parser'
-
-module Bake
-  class MSVCLinkerErrorParser < ErrorParser
-
-    def initialize()
-      # todo: is every line an error?
-    end
-
-    def scan_lines(consoleOutput, proj_dir)
-      res = []
-      consoleOutputFiltered = ""
-      filterLine = 0
-
-      consoleOutput[0].each_line do |l|
-      filterLine = filterLine + 1
-        next if (filterLine == 1 and l.include?"Microsoft (R)")
-        next if (filterLine == 2 and l.include?"Copyright (C)")
-        next if (filterLine == 3 and l.strip.empty?)
-        
-        l.rstrip!
-        d = ErrorDesc.new
-        d.file_name = proj_dir
-        d.line_number = 0
-        d.message = l
-        if l.length == 0
-          d.severity = SEVERITY_OK
-        elsif l.include?" Warning:" 
-          d.severity = SEVERITY_WARNING
-        else
-          d.severity = SEVERITY_ERROR
-        end
-        consoleOutputFiltered << l
-        res << d
-      end
-      consoleOutput[0] = consoleOutputFiltered
-      [res, consoleOutput[0]]
-    end
-
-
-  end
-end
+require 'bake/toolchain/errorparser/error_parser'
+
+module Bake
+  class MSVCLinkerErrorParser < ErrorParser
+
+    def initialize()
+      # todo: is every line an error?
+    end
+
+    def scan_lines(consoleOutput, proj_dir)
+      res = []
+      consoleOutputFiltered = ""
+      filterLine = 0
+
+      consoleOutput[0].each_line do |l|
+      filterLine = filterLine + 1
+        next if (filterLine == 1 and l.include?"Microsoft (R)")
+        next if (filterLine == 2 and l.include?"Copyright (C)")
+        next if (filterLine == 3 and l.strip.empty?)
+
+        l.rstrip!
+        d = ErrorDesc.new
+        d.file_name = proj_dir
+        d.line_number = 0
+        d.message = l
+        if l.length == 0
+          d.severity = SEVERITY_OK
+        elsif l.include?" Warning:"
+          d.severity = SEVERITY_WARNING
+        else
+          d.severity = SEVERITY_ERROR
+        end
+        consoleOutputFiltered << l
+        res << d
+      end
+      consoleOutput[0] = consoleOutputFiltered
+      [res, consoleOutput[0]]
+    end
+
+
+  end
+end