bake-toolkit 2.48.3 → 2.49.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87b0a6156a9c1c4991df6c1186af0d5a9a079af28b8295f62a0d8491c79b8c48
-  data.tar.gz: 4aa739dbe2fa50df789ce3c6555096469c23063423d3f01fcdd083712d091bb8
+  metadata.gz: 8844fa101183b5ecb09b0044a22a62114fd6c44b0159073b8dc3384aacd59998
+  data.tar.gz: 94959e16d1b765730b022c485b85653102d0c61abb33ff51cb4234354bb05555
 SHA512:
-  metadata.gz: 8705e0c8fe13182e469f875455473496eb1c588eefa6079a158080942f6c9b1a5b81e83552992e92df5f273f0043b28400cdc7ab2d7a5f7cce7275a4de97a465
-  data.tar.gz: 82520083ec69c0b837190c04a64996d0f2efd5e0a4b17f5e5bae239137da96c29bed7fb334a6bee1feb01aff31a7437f0d1905fffc48c42b9553921907d69e4a
+  metadata.gz: 6f778ac7fbed30cbf74b8899b82143f151975f9dd7a0d17fbf12142c379df6285e3a90420be10ddcfa2a97e1b175f9aef2f505fc9aa1a36a4b75c96859981c23
+  data.tar.gz: 452e34af50623a715ac25f417d37f00946a8abb7af1a55552f6c5f6e1cf3ad297e27f83992f3ba0c4279d43379ad602b028d62de6baf2892f94d1d8b938fb663

data/lib/bake/options/showToolchains.rb

@@ -11,7 +11,7 @@ module Bake
           end
           puts k
           printHash(v,level+1)
-        elsif Array === v or String === v
+        elsif Array === v or String === v or true == v or false == v or Symbol === v
           level.times {print "  "}
           print "\n" if (level == 0)
           puts "#{k} = #{v}"

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

@@ -22,7 +22,7 @@ module Bake
     end
 
     def get_severity(str)
-      if str.downcase == "info" || str.downcase == "note"
+      if str.downcase == "info" || str.downcase == "note" || str.downcase == "remark"
         SEVERITY_INFO
       elsif str.downcase == "warning"
         SEVERITY_WARNING

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

@@ -0,0 +1,47 @@
+require_relative 'error_parser'
+
+module Bake
+  class IARCompilerErrorParser < ErrorParser
+
+    def initialize()
+      @error_expression_start = /\"(.+)\",([0-9]+)\s+(internal |fatal )*([A-Za-z]+)([^:]*):\s*(.*)/
+    end
+
+    def scan_lines(consoleOutput, proj_dir)
+      res = []
+      error_severity = 255
+      consoleOutputFullnames = ""
+      lastValidErrorDesc = nil
+
+      consoleOutput[0].each_line do |l|
+        d = ErrorDesc.new
+        lstripped = l.rstrip
+        scan_res = lstripped.scan(@error_expression_start)
+        if scan_res.length == 0
+          if lastValidErrorDesc
+            lastValidErrorDesc.message += l
+            d.severity = lastValidErrorDesc.severity
+          else
+            d.severity = SEVERITY_OK
+            d.message = lstripped
+          end
+          if lstripped == ""
+            lastValidErrorDesc = nil
+          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][5]
+          d.severity = get_severity(scan_res[0][3])
+          error_severity = d.severity
+          l.gsub!(scan_res[0][0],d.file_name)
+          lastValidErrorDesc = d
+        end
+        res << d
+        consoleOutputFullnames << l
+      end
+      [res, consoleOutputFullnames]
+    end
+
+  end
+end

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

@@ -0,0 +1,38 @@
+require_relative 'error_parser'
+
+module Bake
+  class IARLinkerErrorParser < ErrorParser
+
+    def initialize()
+      @error_expression = /([A-Za-z]+)\[\w+\]:\s*(.+)/
+    end
+
+    def scan_lines(consoleOutput, proj_dir)
+      res = []
+      lastValidErrorDesc = nil
+      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
+          lastValidErrorDesc = d
+        else
+          if lastValidErrorDesc
+            lastValidErrorDesc.message += l.lstrip
+            d.severity = lastValidErrorDesc.severity
+          else
+            d.severity = SEVERITY_ERROR
+          end
+        end
+        res << d
+      end
+      [res, consoleOutput[0]]
+    end
+
+  end
+end

data/lib/bake/toolchain/iar.rb

@@ -0,0 +1,56 @@
+require_relative '../../common/utils'
+require_relative '../toolchain/provider'
+require_relative '../toolchain/errorparser/error_parser'
+require_relative '../toolchain/errorparser/iar_compiler_error_parser'
+require_relative '../toolchain/errorparser/iar_linker_error_parser'
+
+module Bake
+  module Toolchain
+
+    IARChain = Provider.add("IAR")
+
+    IARChain[:COMPILER][:CPP].update({
+      :COMMAND => "iccarm",
+      :DEFINE_FLAG => "-D",
+      :OBJECT_FILE_FLAG => "-o",
+      :OBJ_FLAG_SPACE => true,
+      :COMPILE_FLAGS => "--c++",
+      :DEP_FLAGS => "--dependencies",
+      :DEP_FLAGS_SPACE => true,
+      :PREPRO_FLAGS => ""
+    })
+
+    IARChain[:COMPILER][:C] = Utils.deep_copy(IARChain[:COMPILER][:CPP])
+    IARChain[:COMPILER][:C][:SOURCE_FILE_ENDINGS] = Provider.default[:COMPILER][:C][:SOURCE_FILE_ENDINGS]
+    IARChain[:COMPILER][:C][:COMPILE_FLAGS] = ""
+
+    IARChain[:COMPILER][:ASM] = Utils.deep_copy(IARChain[:COMPILER][:C])
+    IARChain[:COMPILER][:ASM][:SOURCE_FILE_ENDINGS] = Provider.default[:COMPILER][:ASM][:SOURCE_FILE_ENDINGS]
+    IARChain[:COMPILER][:ASM][:COMMAND] = "iasmarm"
+    IARChain[:COMPILER][:ASM][:COMPILE_FLAGS] = ""
+    IARChain[:COMPILER][:ASM][:PREFIX] = Provider.default[:COMPILER][:ASM][:PREFIX]
+
+    IARChain[:COMPILER][:DEP_FILE_SINGLE_LINE] = :plain
+
+    IARChain[:ARCHIVER][:COMMAND] = "iarchive"
+    IARChain[:ARCHIVER][:ARCHIVE_FLAGS] = "--create"
+
+    IARChain[:LINKER][:COMMAND] = "ilinkarm"
+    IARChain[:LINKER][:SCRIPT] = "--config"
+    IARChain[:LINKER][:USER_LIB_FLAG] = ""
+    IARChain[:LINKER][:EXE_FLAG] = "-o"
+    IARChain[:LINKER][:LIB_FLAG] = ""
+    IARChain[:LINKER][:LIB_PATH_FLAG] = "-L"
+    IARChain[:LINKER][:MAP_FILE_FLAG] = "--map"
+    IARChain[:LINKER][:MAP_FILE_PIPE] = false
+    IARChain[:LINKER][:LIST_MODE] = true
+
+    iarCompilerErrorParser =                   IARCompilerErrorParser.new
+    IARChain[:COMPILER][:C][:ERROR_PARSER] =   iarCompilerErrorParser
+    IARChain[:COMPILER][:CPP][:ERROR_PARSER] = iarCompilerErrorParser
+    IARChain[:COMPILER][:ASM][:ERROR_PARSER] = iarCompilerErrorParser
+    IARChain[:ARCHIVER][:ERROR_PARSER] =       iarCompilerErrorParser
+    IARChain[:LINKER][:ERROR_PARSER] =         IARLinkerErrorParser.new
+
+  end
+end

data/lib/bake/toolchain/keil.rb

@@ -29,7 +29,7 @@ module Bake
     KeilChain[:COMPILER][:ASM][:COMPILE_FLAGS] = ""
     KeilChain[:COMPILER][:ASM][:PREFIX] = Provider.default[:COMPILER][:ASM][:PREFIX]
 
-    KeilChain[:COMPILER][:DEP_FILE_SINGLE_LINE] = true
+    KeilChain[:COMPILER][:DEP_FILE_SINGLE_LINE] = :single
 
     KeilChain[:ARCHIVER][:COMMAND] = "armar"
     KeilChain[:ARCHIVER][:ARCHIVE_FLAGS] = "--create"

data/lib/bake/toolchain/provider.rb

@@ -72,7 +72,8 @@ module Bake
             :ERROR_PARSER => nil,
             :PREPRO_FLAGS => "",
             :PREPRO_FILE_FLAG => nil
-          }
+          },
+          :DEP_FILE_SINGLE_LINE => :multi
         },
 
         :ARCHIVER =>
@@ -116,7 +117,6 @@ module Bake
           :CLEAN => "clean"
         },
 
-        :DEP_FILE_SINGLE_LINE => false,
         :DOCU => "",
         :KEEP_FILE_ENDINGS => false
       }
@@ -158,6 +158,7 @@ require_relative '../toolchain/clang_analyze'
 require_relative '../toolchain/ti'
 require_relative '../toolchain/greenhills'
 require_relative '../toolchain/keil'
+require_relative '../toolchain/iar'
 require_relative '../toolchain/msvc'
 require_relative '../toolchain/gcc_env'
 require_relative '../toolchain/tasking'

data/lib/bake/toolchain/tasking.rb

@@ -51,6 +51,6 @@ module Bake
     TaskingChain[:ARCHIVER][:ERROR_PARSER] =       taskingCompilerErrorParser
     TaskingChain[:LINKER][:ERROR_PARSER] =         TaskingLinkerErrorParser.new
 
-    TaskingChain[:COMPILER][:DEP_FILE_SINGLE_LINE] = true
+    TaskingChain[:COMPILER][:DEP_FILE_SINGLE_LINE] = :single
   end
 end

data/lib/bake/toolchain/ti.rb

@@ -28,7 +28,7 @@ module Bake
     TiChain[:COMPILER][:ASM][:SOURCE_FILE_ENDINGS] = Provider.default[:COMPILER][:ASM][:SOURCE_FILE_ENDINGS]
     TiChain[:COMPILER][:ASM][:PREFIX] = Provider.default[:COMPILER][:ASM][:PREFIX]
 
-    TiChain[:COMPILER][:DEP_FILE_SINGLE_LINE] = true
+    TiChain[:COMPILER][:DEP_FILE_SINGLE_LINE] = :single
 
     TiChain[:ARCHIVER][:COMMAND] = "ti_ar"
     TiChain[:ARCHIVER][:ARCHIVE_FLAGS] = "r"

data/lib/blocks/compile.rb

@@ -336,10 +336,10 @@ module Bake
 
       end
 
-      def self.read_depfile(dep_filename, projDir, singleLine)
+      def self.read_depfile(dep_filename, projDir, lineType)
         deps = []
         begin
-          if singleLine
+          if lineType == :single
             File.readlines(dep_filename).each do |line|
               splitted = line.split(": ")
               if splitted.length > 1
@@ -353,11 +353,20 @@ module Bake
                 end
               end
             end
-          else
+          elsif lineType == :multi
             deps_string = File.read(dep_filename)
             deps_string = deps_string.gsub(/\\\n/,'')
             dep_splitted = deps_string.split(/([^\\]) /).each_slice(2).map(&:join)[2..-1]
             deps = dep_splitted.map { |d| d.gsub(/[\\] /,' ').gsub(/[\\]/,'/').strip }.delete_if {|d| d == "" }
+          elsif lineType == :plain
+            firstLine = true
+            File.readlines(dep_filename).each do |line|
+              if firstLine
+                firstLine = false
+              else
+                deps << line
+              end
+            end
           end
         rescue Exception => ex1
           if !Bake.options.dry

data/lib/common/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bake-toolkit
 version: !ruby/object:Gem::Version
-  version: 2.48.3
+  version: 2.49.0
 platform: ruby
 authors:
 - Alexander Schaal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-28 00:00:00.000000000 Z
+date: 2019-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rtext
@@ -183,6 +183,8 @@ files:
 - lib/bake/toolchain/errorparser/gcc_linker_error_parser.rb
 - lib/bake/toolchain/errorparser/greenhills_compiler_error_parser.rb
 - lib/bake/toolchain/errorparser/greenhills_linker_error_parser.rb
+- lib/bake/toolchain/errorparser/iar_compiler_error_parser.rb
+- lib/bake/toolchain/errorparser/iar_linker_error_parser.rb
 - lib/bake/toolchain/errorparser/keil_compiler_error_parser.rb
 - lib/bake/toolchain/errorparser/keil_linker_error_parser.rb
 - lib/bake/toolchain/errorparser/msvc_compiler_error_parser.rb
@@ -195,6 +197,7 @@ files:
 - lib/bake/toolchain/gcc.rb
 - lib/bake/toolchain/gcc_env.rb
 - lib/bake/toolchain/greenhills.rb
+- lib/bake/toolchain/iar.rb
 - lib/bake/toolchain/keil.rb
 - lib/bake/toolchain/msvc.rb
 - lib/bake/toolchain/provider.rb