bake-toolkit 2.20.4 → 2.21.0

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])
+          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/diab_linker_error_parser.rb

@@ -1,41 +1,41 @@
-require 'bake/toolchain/errorparser/error_parser'
-
-module Bake
-  class DiabLinkerErrorParser < ErrorParser
-
-    def initialize()
-      @error_expression = /dld: ([A-Za-z]+): (.+)/
-      @error_expression_linkerscript = /dld: \"([^\"]+)\", line ([0-9]+): (.+)/
-    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)
-        scan_res2 = l.scan(@error_expression_linkerscript)
-        if scan_res.length == 0 and scan_res2.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][1]
-          d.severity = get_severity(scan_res[0][0])
-          error_severity = d.severity
-        else
-          d.file_name = proj_dir+"/"+scan_res2[0][0]
-          d.line_number = scan_res2[0][1].to_i
-          d.message = scan_res2[0][2]
-          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 DiabLinkerErrorParser < ErrorParser
+
+    def initialize()
+      @error_expression = /dld: ([A-Za-z]+): (.+)/
+      @error_expression_linkerscript = /dld: \"([^\"]+)\", line ([0-9]+): (.+)/
+    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)
+        scan_res2 = l.scan(@error_expression_linkerscript)
+        if scan_res.length == 0 and scan_res2.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][1]
+          d.severity = get_severity(scan_res[0][0])
+          error_severity = d.severity
+        else
+          d.file_name = proj_dir+"/"+scan_res2[0][0]
+          d.line_number = scan_res2[0][1].to_i
+          d.message = scan_res2[0][2]
+          d.severity = SEVERITY_ERROR
+          error_severity = d.severity
+        end
+        res << d
+      end
+      [res, consoleOutput[0]]
+    end
+
+  end
+end

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

@@ -1,71 +1,71 @@
-module Bake
-
-  class ErrorDesc
-    def initialize
-      @severity = 255
-    end
-    attr_accessor :severity
-    attr_accessor :line_number
-    attr_accessor :message
-    attr_accessor :file_name
-  end
-
-  class ErrorParser
-
-    SEVERITY_INFO = 0
-    SEVERITY_WARNING = 1
-    SEVERITY_ERROR = 2
-    SEVERITY_OK = 255
-
-    def scan(consoleOutput, proj_dir)
-      raise "Use specialized classes only"
-    end
-
-    def get_severity(str)
-      if str.downcase == "info" || str.downcase == "note"
-        SEVERITY_INFO
-      elsif str.downcase == "warning"
-        SEVERITY_WARNING
-      else
-        SEVERITY_ERROR
-      end
-    end
-    
-    def inv_severity(s)
-      if s == SEVERITY_INFO
-        "info"
-      elsif s == SEVERITY_WARNING
-        "warning"
-      elsif s == SEVERITY_ERROR 
-        "error"
-      else
-        raise "Unknown severity: #{s}"
-      end
-    end    
-
-    # scan the output from the console line by line and return a list of ErrorDesc objects.
-    # for none-error/warning lines the description object will indicate that as severity 255
-    # for single line errors/warnings: description will contain severity, line-number, message and file-name
-    #
-    # for multi-line errors/warnings:
-    #   one description object for each line, first one will contain all single line error information,
-    #   all following desc.objects will just repeat the severity and include the message
-    #
-    def scan_lines(consoleOutput, proj_dir)
-      raise "Use specialized classes only"
-    end
-    
-    def makeVsError(line, d)
-      if d.file_name == nil
-        return line
-      end
-
-      ret = d.file_name
-      ret = ret + "(" + d.line_number.to_s + ")" if (d.line_number and d.line_number > 0)
-      ret = ret + ": " + inv_severity(d.severity) + ": " + d.message 
-      return ret 
-    end    
-    
-  end
-
-end
+module Bake
+
+  class ErrorDesc
+    def initialize
+      @severity = 255
+    end
+    attr_accessor :severity
+    attr_accessor :line_number
+    attr_accessor :message
+    attr_accessor :file_name
+  end
+
+  class ErrorParser
+
+    SEVERITY_INFO = 0
+    SEVERITY_WARNING = 1
+    SEVERITY_ERROR = 2
+    SEVERITY_OK = 255
+
+    def scan(consoleOutput, proj_dir)
+      raise "Use specialized classes only"
+    end
+
+    def get_severity(str)
+      if str.downcase == "info" || str.downcase == "note"
+        SEVERITY_INFO
+      elsif str.downcase == "warning"
+        SEVERITY_WARNING
+      else
+        SEVERITY_ERROR
+      end
+    end
+
+    def inv_severity(s)
+      if s == SEVERITY_INFO
+        "info"
+      elsif s == SEVERITY_WARNING
+        "warning"
+      elsif s == SEVERITY_ERROR
+        "error"
+      else
+        raise "Unknown severity: #{s}"
+      end
+    end
+
+    # scan the output from the console line by line and return a list of ErrorDesc objects.
+    # for none-error/warning lines the description object will indicate that as severity 255
+    # for single line errors/warnings: description will contain severity, line-number, message and file-name
+    #
+    # for multi-line errors/warnings:
+    #   one description object for each line, first one will contain all single line error information,
+    #   all following desc.objects will just repeat the severity and include the message
+    #
+    def scan_lines(consoleOutput, proj_dir)
+      raise "Use specialized classes only"
+    end
+
+    def makeVsError(line, d)
+      if d.file_name == nil
+        return line
+      end
+
+      ret = d.file_name
+      ret = ret + "(" + d.line_number.to_s + ")" if (d.line_number and d.line_number > 0)
+      ret = ret + ": " + inv_severity(d.severity) + ": " + d.message
+      return ret
+    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])
+          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/gcc_linker_error_parser.rb

@@ -1,35 +1,35 @@
-require 'bake/toolchain/errorparser/error_parser'
-
-module Bake
-  class GCCLinkerErrorParser < ErrorParser
-
-    def initialize()
-      # todo: is every line an error?
-      # todo: some linker errors look like simple text, dunno how to parse properly...
-      # @error_expression1 = /(.*:\(\..*\)): (.*)/  # e.g. /c/Tool/Temp/ccAlar4R.o:x.cpp:(.text+0x17): undefined reference to `_a'
-      # @error_expression2 = /(.*):([0-9]+): (.*)/  # e.g. /usr/lib/gcc/i686-pc-cygwin/4.3.4/../../../../i686-pc-cygwin/bin/ld:roodi.yml.a:1: syntax error
-    end
-
-    def scan_lines(consoleOutput, proj_dir)
-      res = []
-      consoleOutput[0].each_line do |l|
-        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
-        res << d
-      end
-      [res, consoleOutput[0]]
-    end
-
-
-  end
-end
+require 'bake/toolchain/errorparser/error_parser'
+
+module Bake
+  class GCCLinkerErrorParser < ErrorParser
+
+    def initialize()
+      # todo: is every line an error?
+      # todo: some linker errors look like simple text, dunno how to parse properly...
+      # @error_expression1 = /(.*:\(\..*\)): (.*)/  # e.g. /c/Tool/Temp/ccAlar4R.o:x.cpp:(.text+0x17): undefined reference to `_a'
+      # @error_expression2 = /(.*):([0-9]+): (.*)/  # e.g. /usr/lib/gcc/i686-pc-cygwin/4.3.4/../../../../i686-pc-cygwin/bin/ld:roodi.yml.a:1: syntax error
+    end
+
+    def scan_lines(consoleOutput, proj_dir)
+      res = []
+      consoleOutput[0].each_line do |l|
+        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
+        res << d
+      end
+      [res, consoleOutput[0]]
+    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])
+          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