bake-toolkit 2.20.4 → 2.21.0

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

@@ -1,3 +1,3 @@
-module Bake
-  
+module Bake
+
 end

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

@@ -1,30 +1,30 @@
-require 'bake/toolchain/errorparser/error_parser'
-
-module Bake
-  class TILinkerErrorParser < 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
-        if l != "<Linking>" then
-          d.file_name = proj_dir
-          d.line_number = 0
-          d.message = l
-          d.severity = SEVERITY_ERROR
-        end
-        res << d
-      end
-      [res, consoleOutput]
-    end
-
-  end
-end
+require 'bake/toolchain/errorparser/error_parser'
+
+module Bake
+  class TILinkerErrorParser < 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
+        if l != "<Linking>" then
+          d.file_name = proj_dir
+          d.line_number = 0
+          d.message = l
+          d.severity = SEVERITY_ERROR
+        end
+        res << d
+      end
+      [res, consoleOutput]
+    end
+
+  end
+end

data/lib/bake/toolchain/gcc.rb

@@ -1,49 +1,49 @@
-require 'common/utils'
-require 'bake/toolchain/provider'
-require 'bake/toolchain/errorparser/error_parser'
-require 'bake/toolchain/errorparser/gcc_compiler_error_parser'
-require 'bake/toolchain/errorparser/gcc_linker_error_parser'
-
-module Bake
-  module Toolchain
-
-    GCCChain = Provider.add("GCC")
-
-    GCCChain[:COMPILER][:CPP].update({
-      :COMMAND => "g++",
-      :DEFINE_FLAG => "-D",
-      :OBJECT_FILE_FLAG => "-o",
-      :OBJ_FLAG_SPACE => true,
-      :INCLUDE_PATH_FLAG => "-I",
-      :COMPILE_FLAGS => "-c ",
-      :DEP_FLAGS => "-MD -MF",
-      :DEP_FLAGS_SPACE => true,
-      :PREPRO_FLAGS => "-E -P"
-    })
-
-    GCCChain[:COMPILER][:C] = Utils.deep_copy(GCCChain[:COMPILER][:CPP])
-    GCCChain[:COMPILER][:C][:SOURCE_FILE_ENDINGS] = Provider.default[:COMPILER][:C][:SOURCE_FILE_ENDINGS]
-    GCCChain[:COMPILER][:C][:COMMAND] = "gcc"
-
-    GCCChain[:COMPILER][:ASM] = Utils.deep_copy(GCCChain[:COMPILER][:C])
-    GCCChain[:COMPILER][:ASM][:SOURCE_FILE_ENDINGS] = Provider.default[:COMPILER][:ASM][:SOURCE_FILE_ENDINGS]
-
-    GCCChain[:ARCHIVER][:COMMAND] = "ar"
-    GCCChain[:ARCHIVER][:ARCHIVE_FLAGS] = "-rc"
-
-    GCCChain[:LINKER][:COMMAND] = "g++"
-    GCCChain[:LINKER][:SCRIPT] = "-T"
-    GCCChain[:LINKER][:USER_LIB_FLAG] = "-l:"
-    GCCChain[:LINKER][:EXE_FLAG] = "-o"
-    GCCChain[:LINKER][:LIB_FLAG] = "-l"
-    GCCChain[:LINKER][:LIB_PATH_FLAG] = "-L"
-
-    gccCompilerErrorParser =                   GCCCompilerErrorParser.new
-    GCCChain[:COMPILER][:C][:ERROR_PARSER] =   gccCompilerErrorParser
-    GCCChain[:COMPILER][:CPP][:ERROR_PARSER] = gccCompilerErrorParser
-    GCCChain[:COMPILER][:ASM][:ERROR_PARSER] = gccCompilerErrorParser
-    GCCChain[:ARCHIVER][:ERROR_PARSER] =       gccCompilerErrorParser
-    GCCChain[:LINKER][:ERROR_PARSER] =         GCCLinkerErrorParser.new
-
-  end
-end
+require 'common/utils'
+require 'bake/toolchain/provider'
+require 'bake/toolchain/errorparser/error_parser'
+require 'bake/toolchain/errorparser/gcc_compiler_error_parser'
+require 'bake/toolchain/errorparser/gcc_linker_error_parser'
+
+module Bake
+  module Toolchain
+
+    GCCChain = Provider.add("GCC")
+
+    GCCChain[:COMPILER][:CPP].update({
+      :COMMAND => "g++",
+      :DEFINE_FLAG => "-D",
+      :OBJECT_FILE_FLAG => "-o",
+      :OBJ_FLAG_SPACE => true,
+      :INCLUDE_PATH_FLAG => "-I",
+      :COMPILE_FLAGS => "-c ",
+      :DEP_FLAGS => "-MD -MF",
+      :DEP_FLAGS_SPACE => true,
+      :PREPRO_FLAGS => "-E -P"
+    })
+
+    GCCChain[:COMPILER][:C] = Utils.deep_copy(GCCChain[:COMPILER][:CPP])
+    GCCChain[:COMPILER][:C][:SOURCE_FILE_ENDINGS] = Provider.default[:COMPILER][:C][:SOURCE_FILE_ENDINGS]
+    GCCChain[:COMPILER][:C][:COMMAND] = "gcc"
+
+    GCCChain[:COMPILER][:ASM] = Utils.deep_copy(GCCChain[:COMPILER][:C])
+    GCCChain[:COMPILER][:ASM][:SOURCE_FILE_ENDINGS] = Provider.default[:COMPILER][:ASM][:SOURCE_FILE_ENDINGS]
+
+    GCCChain[:ARCHIVER][:COMMAND] = "ar"
+    GCCChain[:ARCHIVER][:ARCHIVE_FLAGS] = "-rc"
+
+    GCCChain[:LINKER][:COMMAND] = "g++"
+    GCCChain[:LINKER][:SCRIPT] = "-T"
+    GCCChain[:LINKER][:USER_LIB_FLAG] = "-l:"
+    GCCChain[:LINKER][:EXE_FLAG] = "-o"
+    GCCChain[:LINKER][:LIB_FLAG] = "-l"
+    GCCChain[:LINKER][:LIB_PATH_FLAG] = "-L"
+
+    gccCompilerErrorParser =                   GCCCompilerErrorParser.new
+    GCCChain[:COMPILER][:C][:ERROR_PARSER] =   gccCompilerErrorParser
+    GCCChain[:COMPILER][:CPP][:ERROR_PARSER] = gccCompilerErrorParser
+    GCCChain[:COMPILER][:ASM][:ERROR_PARSER] = gccCompilerErrorParser
+    GCCChain[:ARCHIVER][:ERROR_PARSER] =       gccCompilerErrorParser
+    GCCChain[:LINKER][:ERROR_PARSER] =         GCCLinkerErrorParser.new
+
+  end
+end

data/lib/bake/toolchain/gcc_env.rb

@@ -1,55 +1,55 @@
-require 'common/utils'
-require 'bake/toolchain/provider'
-require 'bake/toolchain/errorparser/error_parser'
-require 'bake/toolchain/errorparser/gcc_compiler_error_parser'
-require 'bake/toolchain/errorparser/gcc_linker_error_parser'
-
-module Bake
-  module Toolchain
-
-    GCCENVChain = Provider.add("GCC_ENV")
-
-    GCCENVChain[:COMPILER][:CPP].update({
-      :COMMAND => "$(CXX)",
-      :DEFINE_FLAG => "-D",
-      :OBJECT_FILE_FLAG => "-o",
-      :OBJ_FLAG_SPACE => true,
-      :INCLUDE_PATH_FLAG => "-I",
-      :COMPILE_FLAGS => "-c ",
-      :DEP_FLAGS => "-MD -MF",
-      :DEP_FLAGS_SPACE => true,
-      :PREPRO_FLAGS => "-E -P",
-      :FLAGS => "$(CXXFLAGS)"
-    })
-
-    GCCENVChain[:COMPILER][:C] = Utils.deep_copy(GCCENVChain[:COMPILER][:CPP])
-    GCCENVChain[:COMPILER][:C][:SOURCE_FILE_ENDINGS] = Provider.default[:COMPILER][:C][:SOURCE_FILE_ENDINGS]
-    GCCENVChain[:COMPILER][:C][:COMMAND] = "$(CC)"
-    GCCENVChain[:COMPILER][:C][:FLAGS] = "$(CFLAGS)"
-      
-    GCCENVChain[:COMPILER][:ASM] = Utils.deep_copy(GCCENVChain[:COMPILER][:C])
-    GCCENVChain[:COMPILER][:ASM][:COMMAND] = "$(AS)"
-    GCCENVChain[:COMPILER][:ASM][:SOURCE_FILE_ENDINGS] = Provider.default[:COMPILER][:ASM][:SOURCE_FILE_ENDINGS]
-    GCCENVChain[:COMPILER][:ASM][:FLAGS] = "$(ASFLAGS)"
-      
-    GCCENVChain[:ARCHIVER][:COMMAND] = "$(AR)"
-    GCCENVChain[:ARCHIVER][:ARCHIVE_FLAGS] = "-rc"
-    GCCENVChain[:ARCHIVER][:FLAGS] = "$(ARFLAGS)"
-      
-    GCCENVChain[:LINKER][:COMMAND] = "$(CXX)"
-    GCCENVChain[:LINKER][:SCRIPT] = "-T"
-    GCCENVChain[:LINKER][:USER_LIB_FLAG] = "-l:"
-    GCCENVChain[:LINKER][:EXE_FLAG] = "-o"
-    GCCENVChain[:LINKER][:LIB_FLAG] = "-l"
-    GCCENVChain[:LINKER][:LIB_PATH_FLAG] = "-L"
-    GCCENVChain[:LINKER][:FLAGS] = "$(LDFLAGS)"
-      
-    gccCompilerErrorParser =                      GCCCompilerErrorParser.new
-    GCCENVChain[:COMPILER][:C][:ERROR_PARSER] =   gccCompilerErrorParser
-    GCCENVChain[:COMPILER][:CPP][:ERROR_PARSER] = gccCompilerErrorParser
-    GCCENVChain[:COMPILER][:ASM][:ERROR_PARSER] = gccCompilerErrorParser
-    GCCENVChain[:ARCHIVER][:ERROR_PARSER] =       gccCompilerErrorParser
-    GCCENVChain[:LINKER][:ERROR_PARSER] =         GCCLinkerErrorParser.new
-
-  end
-end
+require 'common/utils'
+require 'bake/toolchain/provider'
+require 'bake/toolchain/errorparser/error_parser'
+require 'bake/toolchain/errorparser/gcc_compiler_error_parser'
+require 'bake/toolchain/errorparser/gcc_linker_error_parser'
+
+module Bake
+  module Toolchain
+
+    GCCENVChain = Provider.add("GCC_ENV")
+
+    GCCENVChain[:COMPILER][:CPP].update({
+      :COMMAND => "$(CXX)",
+      :DEFINE_FLAG => "-D",
+      :OBJECT_FILE_FLAG => "-o",
+      :OBJ_FLAG_SPACE => true,
+      :INCLUDE_PATH_FLAG => "-I",
+      :COMPILE_FLAGS => "-c ",
+      :DEP_FLAGS => "-MD -MF",
+      :DEP_FLAGS_SPACE => true,
+      :PREPRO_FLAGS => "-E -P",
+      :FLAGS => "$(CXXFLAGS)"
+    })
+
+    GCCENVChain[:COMPILER][:C] = Utils.deep_copy(GCCENVChain[:COMPILER][:CPP])
+    GCCENVChain[:COMPILER][:C][:SOURCE_FILE_ENDINGS] = Provider.default[:COMPILER][:C][:SOURCE_FILE_ENDINGS]
+    GCCENVChain[:COMPILER][:C][:COMMAND] = "$(CC)"
+    GCCENVChain[:COMPILER][:C][:FLAGS] = "$(CFLAGS)"
+
+    GCCENVChain[:COMPILER][:ASM] = Utils.deep_copy(GCCENVChain[:COMPILER][:C])
+    GCCENVChain[:COMPILER][:ASM][:COMMAND] = "$(AS)"
+    GCCENVChain[:COMPILER][:ASM][:SOURCE_FILE_ENDINGS] = Provider.default[:COMPILER][:ASM][:SOURCE_FILE_ENDINGS]
+    GCCENVChain[:COMPILER][:ASM][:FLAGS] = "$(ASFLAGS)"
+
+    GCCENVChain[:ARCHIVER][:COMMAND] = "$(AR)"
+    GCCENVChain[:ARCHIVER][:ARCHIVE_FLAGS] = "-rc"
+    GCCENVChain[:ARCHIVER][:FLAGS] = "$(ARFLAGS)"
+
+    GCCENVChain[:LINKER][:COMMAND] = "$(CXX)"
+    GCCENVChain[:LINKER][:SCRIPT] = "-T"
+    GCCENVChain[:LINKER][:USER_LIB_FLAG] = "-l:"
+    GCCENVChain[:LINKER][:EXE_FLAG] = "-o"
+    GCCENVChain[:LINKER][:LIB_FLAG] = "-l"
+    GCCENVChain[:LINKER][:LIB_PATH_FLAG] = "-L"
+    GCCENVChain[:LINKER][:FLAGS] = "$(LDFLAGS)"
+
+    gccCompilerErrorParser =                      GCCCompilerErrorParser.new
+    GCCENVChain[:COMPILER][:C][:ERROR_PARSER] =   gccCompilerErrorParser
+    GCCENVChain[:COMPILER][:CPP][:ERROR_PARSER] = gccCompilerErrorParser
+    GCCENVChain[:COMPILER][:ASM][:ERROR_PARSER] = gccCompilerErrorParser
+    GCCENVChain[:ARCHIVER][:ERROR_PARSER] =       gccCompilerErrorParser
+    GCCENVChain[:LINKER][:ERROR_PARSER] =         GCCLinkerErrorParser.new
+
+  end
+end

data/lib/bake/toolchain/greenhills.rb

@@ -1,52 +1,52 @@
-require 'bake/toolchain/provider'
-require 'common/utils'
-require 'bake/toolchain/errorparser/greenhills_compiler_error_parser'
-require 'bake/toolchain/errorparser/greenhills_linker_error_parser'
-
-module Bake
-  module Toolchain
-
-    GreenHillsChain = Provider.add("GreenHills")
-
-    GreenHillsChain[:COMPILER][:C].update({
-      :COMMAND => "cxppc",
-      :FLAGS => "",
-      :DEFINE_FLAG => "-D",
-      :OBJECT_FILE_FLAG => "-o",
-      :OBJ_FLAG_SPACE => true,
-      :INCLUDE_PATH_FLAG => "-I",
-      :COMPILE_FLAGS => "-c",
-      :DEP_FLAGS => "-MD",
-      :DEP_FLAGS_FILENAME => false,
-      :PREPRO_FLAGS => "-P"
-    })
-
-    GreenHillsChain[:COMPILER][:CPP] = Utils.deep_copy(GreenHillsChain[:COMPILER][:C])
-    GreenHillsChain[:COMPILER][:CPP][:SOURCE_FILE_ENDINGS] = Provider.default[:COMPILER][:CPP][:SOURCE_FILE_ENDINGS]
-
-    GreenHillsChain[:COMPILER][:ASM] = Utils.deep_copy(GreenHillsChain[:COMPILER][:C])
-    GreenHillsChain[:COMPILER][:ASM][:SOURCE_FILE_ENDINGS] = Provider.default[:COMPILER][:ASM][:SOURCE_FILE_ENDINGS]
-    GreenHillsChain[:COMPILER][:ASM][:PREPRO_FLAGS] = ""
-
-    GreenHillsChain[:ARCHIVER][:COMMAND] = "cxppc"
-    GreenHillsChain[:ARCHIVER][:ARCHIVE_FLAGS] = "-archive -o"
-
-    GreenHillsChain[:LINKER][:COMMAND] = "cxppc" # ??
-    GreenHillsChain[:LINKER][:SCRIPT] = "-T" # -T file.ld
-    GreenHillsChain[:LINKER][:USER_LIB_FLAG] = "-l" # user lib not supported? same as lib... 
-    GreenHillsChain[:LINKER][:EXE_FLAG] = "-o"
-    GreenHillsChain[:LINKER][:LIB_FLAG] = "-l"
-    GreenHillsChain[:LINKER][:LIB_PATH_FLAG] = "-L"
-    GreenHillsChain[:LINKER][:MAP_FILE_FLAG] = "-map=" # -map=filename
-    GreenHillsChain[:LINKER][:MAP_FILE_PIPE] = false   
-    GreenHillsChain[:LINKER][:OUTPUT_ENDING] = ".elf"
-
-    GreenHillsCompilerErrorParser =                   GreenHillsCompilerErrorParser.new
-    GreenHillsChain[:COMPILER][:C][:ERROR_PARSER] =   GreenHillsCompilerErrorParser
-    GreenHillsChain[:COMPILER][:CPP][:ERROR_PARSER] = GreenHillsCompilerErrorParser
-    GreenHillsChain[:COMPILER][:ASM][:ERROR_PARSER] = GreenHillsCompilerErrorParser
-    GreenHillsChain[:ARCHIVER][:ERROR_PARSER] =       GreenHillsCompilerErrorParser
-    GreenHillsChain[:LINKER][:ERROR_PARSER] =         GreenHillsLinkerErrorParser.new
-
-  end
-end
+require 'bake/toolchain/provider'
+require 'common/utils'
+require 'bake/toolchain/errorparser/greenhills_compiler_error_parser'
+require 'bake/toolchain/errorparser/greenhills_linker_error_parser'
+
+module Bake
+  module Toolchain
+
+    GreenHillsChain = Provider.add("GreenHills")
+
+    GreenHillsChain[:COMPILER][:C].update({
+      :COMMAND => "cxppc",
+      :FLAGS => "",
+      :DEFINE_FLAG => "-D",
+      :OBJECT_FILE_FLAG => "-o",
+      :OBJ_FLAG_SPACE => true,
+      :INCLUDE_PATH_FLAG => "-I",
+      :COMPILE_FLAGS => "-c",
+      :DEP_FLAGS => "-MD",
+      :DEP_FLAGS_FILENAME => false,
+      :PREPRO_FLAGS => "-P"
+    })
+
+    GreenHillsChain[:COMPILER][:CPP] = Utils.deep_copy(GreenHillsChain[:COMPILER][:C])
+    GreenHillsChain[:COMPILER][:CPP][:SOURCE_FILE_ENDINGS] = Provider.default[:COMPILER][:CPP][:SOURCE_FILE_ENDINGS]
+
+    GreenHillsChain[:COMPILER][:ASM] = Utils.deep_copy(GreenHillsChain[:COMPILER][:C])
+    GreenHillsChain[:COMPILER][:ASM][:SOURCE_FILE_ENDINGS] = Provider.default[:COMPILER][:ASM][:SOURCE_FILE_ENDINGS]
+    GreenHillsChain[:COMPILER][:ASM][:PREPRO_FLAGS] = ""
+
+    GreenHillsChain[:ARCHIVER][:COMMAND] = "cxppc"
+    GreenHillsChain[:ARCHIVER][:ARCHIVE_FLAGS] = "-archive -o"
+
+    GreenHillsChain[:LINKER][:COMMAND] = "cxppc" # ??
+    GreenHillsChain[:LINKER][:SCRIPT] = "-T" # -T file.ld
+    GreenHillsChain[:LINKER][:USER_LIB_FLAG] = "-l" # user lib not supported? same as lib...
+    GreenHillsChain[:LINKER][:EXE_FLAG] = "-o"
+    GreenHillsChain[:LINKER][:LIB_FLAG] = "-l"
+    GreenHillsChain[:LINKER][:LIB_PATH_FLAG] = "-L"
+    GreenHillsChain[:LINKER][:MAP_FILE_FLAG] = "-map=" # -map=filename
+    GreenHillsChain[:LINKER][:MAP_FILE_PIPE] = false
+    GreenHillsChain[:LINKER][:OUTPUT_ENDING] = ".elf"
+
+    GreenHillsCompilerErrorParser =                   GreenHillsCompilerErrorParser.new
+    GreenHillsChain[:COMPILER][:C][:ERROR_PARSER] =   GreenHillsCompilerErrorParser
+    GreenHillsChain[:COMPILER][:CPP][:ERROR_PARSER] = GreenHillsCompilerErrorParser
+    GreenHillsChain[:COMPILER][:ASM][:ERROR_PARSER] = GreenHillsCompilerErrorParser
+    GreenHillsChain[:ARCHIVER][:ERROR_PARSER] =       GreenHillsCompilerErrorParser
+    GreenHillsChain[:LINKER][:ERROR_PARSER] =         GreenHillsLinkerErrorParser.new
+
+  end
+end

data/lib/bake/toolchain/keil.rb

@@ -1,53 +1,53 @@
-require 'common/utils'
-require 'bake/toolchain/provider'
-require 'bake/toolchain/errorparser/error_parser'
-require 'bake/toolchain/errorparser/keil_compiler_error_parser'
-require 'bake/toolchain/errorparser/keil_linker_error_parser'
-
-module Bake
-  module Toolchain
-
-    KeilChain = Provider.add("Keil")
-
-    KeilChain[:COMPILER][:CPP].update({
-      :COMMAND => "armcc",
-      :DEFINE_FLAG => "-D",
-      :OBJECT_FILE_FLAG => "-o",
-      :OBJ_FLAG_SPACE => true,
-      :INCLUDE_PATH_FLAG => "-I",
-      :COMPILE_FLAGS => "-c ",
-      :DEP_FLAGS => "--depend=",
-      :DEP_FLAGS_SPACE => false,
-      :PREPRO_FLAGS => "-E -P"
-    })
-
-    KeilChain[:COMPILER][:C] = Utils.deep_copy(KeilChain[:COMPILER][:CPP])
-    KeilChain[:COMPILER][:C][:SOURCE_FILE_ENDINGS] = Provider.default[:COMPILER][:C][:SOURCE_FILE_ENDINGS]
-
-    KeilChain[:COMPILER][:ASM] = Utils.deep_copy(KeilChain[:COMPILER][:C])
-    KeilChain[:COMPILER][:ASM][:SOURCE_FILE_ENDINGS] = Provider.default[:COMPILER][:ASM][:SOURCE_FILE_ENDINGS]
-    KeilChain[:COMPILER][:ASM][:COMMAND] = "armasm"
-    KeilChain[:COMPILER][:ASM][:COMPILE_FLAGS] = ""
-
-    KeilChain[:ARCHIVER][:COMMAND] = "armar"
-    KeilChain[:ARCHIVER][:ARCHIVE_FLAGS] = "--create"
-
-    KeilChain[:LINKER][:COMMAND] = "armlink"
-    KeilChain[:LINKER][:SCRIPT] = "--scatter"
-    KeilChain[:LINKER][:USER_LIB_FLAG] = ""
-    KeilChain[:LINKER][:EXE_FLAG] = "-o"
-    KeilChain[:LINKER][:LIB_FLAG] = ""
-    KeilChain[:LINKER][:LIB_PATH_FLAG] = "--userlibpath="
-    KeilChain[:LINKER][:MAP_FILE_FLAG] = "--map --list="
-    KeilChain[:LINKER][:MAP_FILE_PIPE] = false
-    KeilChain[:LINKER][:LIST_MODE] = true
-
-    keilCompilerErrorParser =                   KeilCompilerErrorParser.new
-    KeilChain[:COMPILER][:C][:ERROR_PARSER] =   keilCompilerErrorParser
-    KeilChain[:COMPILER][:CPP][:ERROR_PARSER] = keilCompilerErrorParser
-    KeilChain[:COMPILER][:ASM][:ERROR_PARSER] = keilCompilerErrorParser
-    KeilChain[:ARCHIVER][:ERROR_PARSER] =       keilCompilerErrorParser
-    KeilChain[:LINKER][:ERROR_PARSER] =         KeilLinkerErrorParser.new
-
-  end
-end
+require 'common/utils'
+require 'bake/toolchain/provider'
+require 'bake/toolchain/errorparser/error_parser'
+require 'bake/toolchain/errorparser/keil_compiler_error_parser'
+require 'bake/toolchain/errorparser/keil_linker_error_parser'
+
+module Bake
+  module Toolchain
+
+    KeilChain = Provider.add("Keil")
+
+    KeilChain[:COMPILER][:CPP].update({
+      :COMMAND => "armcc",
+      :DEFINE_FLAG => "-D",
+      :OBJECT_FILE_FLAG => "-o",
+      :OBJ_FLAG_SPACE => true,
+      :INCLUDE_PATH_FLAG => "-I",
+      :COMPILE_FLAGS => "-c ",
+      :DEP_FLAGS => "--depend=",
+      :DEP_FLAGS_SPACE => false,
+      :PREPRO_FLAGS => "-E -P"
+    })
+
+    KeilChain[:COMPILER][:C] = Utils.deep_copy(KeilChain[:COMPILER][:CPP])
+    KeilChain[:COMPILER][:C][:SOURCE_FILE_ENDINGS] = Provider.default[:COMPILER][:C][:SOURCE_FILE_ENDINGS]
+
+    KeilChain[:COMPILER][:ASM] = Utils.deep_copy(KeilChain[:COMPILER][:C])
+    KeilChain[:COMPILER][:ASM][:SOURCE_FILE_ENDINGS] = Provider.default[:COMPILER][:ASM][:SOURCE_FILE_ENDINGS]
+    KeilChain[:COMPILER][:ASM][:COMMAND] = "armasm"
+    KeilChain[:COMPILER][:ASM][:COMPILE_FLAGS] = ""
+
+    KeilChain[:ARCHIVER][:COMMAND] = "armar"
+    KeilChain[:ARCHIVER][:ARCHIVE_FLAGS] = "--create"
+
+    KeilChain[:LINKER][:COMMAND] = "armlink"
+    KeilChain[:LINKER][:SCRIPT] = "--scatter"
+    KeilChain[:LINKER][:USER_LIB_FLAG] = ""
+    KeilChain[:LINKER][:EXE_FLAG] = "-o"
+    KeilChain[:LINKER][:LIB_FLAG] = ""
+    KeilChain[:LINKER][:LIB_PATH_FLAG] = "--userlibpath="
+    KeilChain[:LINKER][:MAP_FILE_FLAG] = "--map --list="
+    KeilChain[:LINKER][:MAP_FILE_PIPE] = false
+    KeilChain[:LINKER][:LIST_MODE] = true
+
+    keilCompilerErrorParser =                   KeilCompilerErrorParser.new
+    KeilChain[:COMPILER][:C][:ERROR_PARSER] =   keilCompilerErrorParser
+    KeilChain[:COMPILER][:CPP][:ERROR_PARSER] = keilCompilerErrorParser
+    KeilChain[:COMPILER][:ASM][:ERROR_PARSER] = keilCompilerErrorParser
+    KeilChain[:ARCHIVER][:ERROR_PARSER] =       keilCompilerErrorParser
+    KeilChain[:LINKER][:ERROR_PARSER] =         KeilLinkerErrorParser.new
+
+  end
+end