bake-toolkit 2.24.6 → 2.25.0

data/lib/bake/toolchain/greenhills.rb

@@ -1,52 +1,51 @@
-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,
+      :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,55 +1,54 @@
-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[:COMPILER][:DEP_FILE_SINGLE_LINE] = true
-
-    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,
+      :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[:COMPILER][:DEP_FILE_SINGLE_LINE] = true
+
+    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

data/lib/bake/toolchain/lint.rb

@@ -1,20 +1,19 @@
-require 'common/utils'
-require 'bake/toolchain/provider'
-require 'bake/toolchain/errorparser/lint_error_parser'
-
-module Bake
-  module Toolchain
-
-    LintChain = Provider.add("Lint")
-
-    LintChain[:COMPILER][:CPP].update({
-      :COMMAND => "lint-nt.exe",
-      :DEFINE_FLAG => "-D",
-      :INCLUDE_PATH_FLAG => "-I",
-      :COMPILE_FLAGS => ["-b","-\"format=%f%(:%l:%) %t %n: %m\"", "-width(0)", "-hF1", "-zero"], # array, not string!
-    })
-
-    LintChain[:COMPILER][:CPP][:ERROR_PARSER] = LintErrorParser.new
-
-  end
-end
+require 'common/utils'
+require 'bake/toolchain/provider'
+require 'bake/toolchain/errorparser/lint_error_parser'
+
+module Bake
+  module Toolchain
+
+    LintChain = Provider.add("Lint")
+
+    LintChain[:COMPILER][:CPP].update({
+      :COMMAND => "lint-nt.exe",
+      :DEFINE_FLAG => "-D",
+      :COMPILE_FLAGS => ["-b","-\"format=%f%(:%l:%) %t %n: %m\"", "-width(0)", "-hF1", "-zero"], # array, not string!
+    })
+
+    LintChain[:COMPILER][:CPP][:ERROR_PARSER] = LintErrorParser.new
+
+  end
+end

data/lib/bake/toolchain/msvc.rb

@@ -1,58 +1,57 @@
-require 'common/utils'
-require 'bake/toolchain/provider'
-require 'bake/toolchain/errorparser/error_parser'
-require 'bake/toolchain/errorparser/msvc_compiler_error_parser'
-require 'bake/toolchain/errorparser/msvc_linker_error_parser'
-
-module Bake
-  module Toolchain
-
-    MSVCChain = Provider.add("MSVC")
-
-    MSVCChain[:COMPILER][:CPP].update({
-      :COMMAND => "cl",
-      :DEFINE_FLAG => "-D",
-      :OBJECT_FILE_FLAG => "-Fo",
-      :OBJ_FLAG_SPACE => false,
-      :INCLUDE_PATH_FLAG => "-I",
-      :COMPILE_FLAGS => "-c -EHsc $(MSVC_FORCE_SYNC_PDB_WRITES)",
-      :DEP_FLAGS_FILENAME => false,
-      :DEP_FLAGS => "-showIncludes",
-      :DEP_FLAGS_SPACE => true,
-      :PREPRO_FLAGS => "-P",
-      :PREPRO_FILE_FLAG => "-Fi"
-    })
-
-    MSVCChain[:COMPILER][:C] = Utils.deep_copy(MSVCChain[:COMPILER][:CPP])
-    MSVCChain[:COMPILER][:C][:SOURCE_FILE_ENDINGS] = Provider.default[:COMPILER][:C][:SOURCE_FILE_ENDINGS]
-
-    MSVCChain[:COMPILER][:ASM] = Utils.deep_copy(MSVCChain[:COMPILER][:C])
-    MSVCChain[:COMPILER][:ASM][:COMMAND] = "ml"
-    MSVCChain[:COMPILER][:ASM][:COMPILE_FLAGS] = "-c $(MSVC_FORCE_SYNC_PDB_WRITES)"
-    MSVCChain[:COMPILER][:ASM][:SOURCE_FILE_ENDINGS] = Provider.default[:COMPILER][:ASM][:SOURCE_FILE_ENDINGS]
-
-    MSVCChain[:ARCHIVER][:COMMAND] = "lib"
-    MSVCChain[:ARCHIVER][:ARCHIVE_FLAGS] = "-out:"
-    MSVCChain[:ARCHIVER][:ARCHIVE_FLAGS_SPACE] = false
-
-    MSVCChain[:LINKER][:COMMAND] = "link"
-    MSVCChain[:LINKER][:USER_LIB_FLAG] = ""
-    MSVCChain[:LINKER][:EXE_FLAG] = "-out:"
-    MSVCChain[:LINKER][:EXE_FLAG_SPACE] = false
-    MSVCChain[:LINKER][:LIB_FLAG] = ""
-    MSVCChain[:LINKER][:LIB_PATH_FLAG] = "-libpath:"
-    MSVCChain[:LINKER][:MAP_FILE_FLAG] = "-map:"
-    MSVCChain[:LINKER][:MAP_FILE_PIPE] = false
-    MSVCChain[:LINKER][:SCRIPT] = "Linkerscript option not supported for MSVC"
-
-
-    msvcCompilerErrorParser =                   MSVCCompilerErrorParser.new
-    MSVCChain[:COMPILER][:C][:ERROR_PARSER] =   msvcCompilerErrorParser
-    MSVCChain[:COMPILER][:CPP][:ERROR_PARSER] = msvcCompilerErrorParser
-    MSVCChain[:COMPILER][:ASM][:ERROR_PARSER] = msvcCompilerErrorParser
-    MSVCChain[:ARCHIVER][:ERROR_PARSER] =       msvcCompilerErrorParser
-    MSVCChain[:LINKER][:ERROR_PARSER] =         MSVCLinkerErrorParser.new
-
-  end
-end
-
+require 'common/utils'
+require 'bake/toolchain/provider'
+require 'bake/toolchain/errorparser/error_parser'
+require 'bake/toolchain/errorparser/msvc_compiler_error_parser'
+require 'bake/toolchain/errorparser/msvc_linker_error_parser'
+
+module Bake
+  module Toolchain
+
+    MSVCChain = Provider.add("MSVC")
+
+    MSVCChain[:COMPILER][:CPP].update({
+      :COMMAND => "cl",
+      :DEFINE_FLAG => "-D",
+      :OBJECT_FILE_FLAG => "-Fo",
+      :OBJ_FLAG_SPACE => false,
+      :COMPILE_FLAGS => "-c -EHsc $(MSVC_FORCE_SYNC_PDB_WRITES)",
+      :DEP_FLAGS_FILENAME => false,
+      :DEP_FLAGS => "-showIncludes",
+      :DEP_FLAGS_SPACE => true,
+      :PREPRO_FLAGS => "-P",
+      :PREPRO_FILE_FLAG => "-Fi"
+    })
+
+    MSVCChain[:COMPILER][:C] = Utils.deep_copy(MSVCChain[:COMPILER][:CPP])
+    MSVCChain[:COMPILER][:C][:SOURCE_FILE_ENDINGS] = Provider.default[:COMPILER][:C][:SOURCE_FILE_ENDINGS]
+
+    MSVCChain[:COMPILER][:ASM] = Utils.deep_copy(MSVCChain[:COMPILER][:C])
+    MSVCChain[:COMPILER][:ASM][:COMMAND] = "ml"
+    MSVCChain[:COMPILER][:ASM][:COMPILE_FLAGS] = "-c $(MSVC_FORCE_SYNC_PDB_WRITES)"
+    MSVCChain[:COMPILER][:ASM][:SOURCE_FILE_ENDINGS] = Provider.default[:COMPILER][:ASM][:SOURCE_FILE_ENDINGS]
+
+    MSVCChain[:ARCHIVER][:COMMAND] = "lib"
+    MSVCChain[:ARCHIVER][:ARCHIVE_FLAGS] = "-out:"
+    MSVCChain[:ARCHIVER][:ARCHIVE_FLAGS_SPACE] = false
+
+    MSVCChain[:LINKER][:COMMAND] = "link"
+    MSVCChain[:LINKER][:USER_LIB_FLAG] = ""
+    MSVCChain[:LINKER][:EXE_FLAG] = "-out:"
+    MSVCChain[:LINKER][:EXE_FLAG_SPACE] = false
+    MSVCChain[:LINKER][:LIB_FLAG] = ""
+    MSVCChain[:LINKER][:LIB_PATH_FLAG] = "-libpath:"
+    MSVCChain[:LINKER][:MAP_FILE_FLAG] = "-map:"
+    MSVCChain[:LINKER][:MAP_FILE_PIPE] = false
+    MSVCChain[:LINKER][:SCRIPT] = "Linkerscript option not supported for MSVC"
+
+
+    msvcCompilerErrorParser =                   MSVCCompilerErrorParser.new
+    MSVCChain[:COMPILER][:C][:ERROR_PARSER] =   msvcCompilerErrorParser
+    MSVCChain[:COMPILER][:CPP][:ERROR_PARSER] = msvcCompilerErrorParser
+    MSVCChain[:COMPILER][:ASM][:ERROR_PARSER] = msvcCompilerErrorParser
+    MSVCChain[:ARCHIVER][:ERROR_PARSER] =       msvcCompilerErrorParser
+    MSVCChain[:LINKER][:ERROR_PARSER] =         MSVCLinkerErrorParser.new
+
+  end
+end
+

data/lib/bake/toolchain/provider.rb

@@ -19,7 +19,8 @@ module Bake
             :OBJECT_FILE_FLAG => "",
             :OBJECT_FILE_ENDING => ".o",
             :OBJ_FLAG_SPACE => false,
-            :INCLUDE_PATH_FLAG => "",
+            :INCLUDE_PATH_FLAG => "-I",
+            :SYSTEM_INCLUDE_PATH_FLAG => "-I",
             :COMPILE_FLAGS => "",
             :DEFINES => [],
             :FLAGS => "",
@@ -37,7 +38,8 @@ module Bake
             :OBJECT_FILE_FLAG => "",
             :OBJECT_FILE_ENDING => ".o",
             :OBJ_FLAG_SPACE => false,
-            :INCLUDE_PATH_FLAG => "",
+            :INCLUDE_PATH_FLAG => "-I",
+            :SYSTEM_INCLUDE_PATH_FLAG => "-I",
             :COMPILE_FLAGS => "",
             :DEFINES => [],
             :FLAGS => "",
@@ -55,7 +57,8 @@ module Bake
             :OBJECT_FILE_FLAG => "",
             :OBJECT_FILE_ENDING => ".o",
             :OBJ_FLAG_SPACE => false,
-            :INCLUDE_PATH_FLAG => "",
+            :INCLUDE_PATH_FLAG => "-I",
+            :SYSTEM_INCLUDE_PATH_FLAG => "-I",
             :COMPILE_FLAGS => "",
             :DEFINES => [],
             :FLAGS => "",

data/lib/bake/toolchain/ti.rb

@@ -1,49 +1,50 @@
-require 'common/utils'
-require 'bake/toolchain/provider'
-require 'bake/toolchain/errorparser/error_parser'
-require 'bake/toolchain/errorparser/ti_compiler_error_parser'
-require 'bake/toolchain/errorparser/ti_linker_error_parser'
-
-module Bake
-  module Toolchain
-
-    TiChain = Provider.add("TI")
-
-    TiChain[:COMPILER][:CPP].update({
-      :COMMAND => "ti_cl",
-      :FLAGS => "",
-      :DEFINE_FLAG => "--define=",
-      :OBJECT_FILE_FLAG => "--output_file=",
-      :INCLUDE_PATH_FLAG => "--include_path=",
-      :COMPILE_FLAGS => "-c ",
-      :DEP_FLAGS => "--preproc_dependency=",
-      :DEP_FLAGS_SPACE => false
-    })
-
-    TiChain[:COMPILER][:C] = Utils.deep_copy(TiChain[:COMPILER][:CPP])
-    TiChain[:COMPILER][:C][:SOURCE_FILE_ENDINGS] = Provider.default[:COMPILER][:C][:SOURCE_FILE_ENDINGS]
-
-    TiChain[:COMPILER][:ASM] = Utils.deep_copy(TiChain[:COMPILER][:C])
-    TiChain[:COMPILER][:ASM][:SOURCE_FILE_ENDINGS] = Provider.default[:COMPILER][:ASM][:SOURCE_FILE_ENDINGS]
-
-    TiChain[:COMPILER][:DEP_FILE_SINGLE_LINE] = true
-
-    TiChain[:ARCHIVER][:COMMAND] = "ti_ar"
-    TiChain[:ARCHIVER][:ARCHIVE_FLAGS] = "r"
-
-    TiChain[:LINKER][:COMMAND] = "ti_cl"
-    TiChain[:LINKER][:FLAGS] = ""
-    TiChain[:LINKER][:MAP_FILE_FLAG] = '-m'
-    TiChain[:LINKER][:EXE_FLAG] = "-o"
-    TiChain[:LINKER][:LIB_FLAG] = "-l"
-    TiChain[:LINKER][:LIB_PATH_FLAG] = "-i"
-
-    tiCompilerErrorParser =                   TICompilerErrorParser.new
-    TiChain[:COMPILER][:C][:ERROR_PARSER] =   tiCompilerErrorParser
-    TiChain[:COMPILER][:CPP][:ERROR_PARSER] = tiCompilerErrorParser
-    TiChain[:COMPILER][:ASM][:ERROR_PARSER] = tiCompilerErrorParser
-    TiChain[:ARCHIVER][:ERROR_PARSER] =       tiCompilerErrorParser
-    TiChain[:LINKER][:ERROR_PARSER] =         TILinkerErrorParser.new
-
-  end
-end
+require 'common/utils'
+require 'bake/toolchain/provider'
+require 'bake/toolchain/errorparser/error_parser'
+require 'bake/toolchain/errorparser/ti_compiler_error_parser'
+require 'bake/toolchain/errorparser/ti_linker_error_parser'
+
+module Bake
+  module Toolchain
+
+    TiChain = Provider.add("TI")
+
+    TiChain[:COMPILER][:CPP].update({
+      :COMMAND => "ti_cl",
+      :FLAGS => "",
+      :DEFINE_FLAG => "--define=",
+      :OBJECT_FILE_FLAG => "--output_file=",
+      :INCLUDE_PATH_FLAG => "--include_path=",
+      :SYSTEM_INCLUDE_PATH_FLAG => "--include_path=",
+      :COMPILE_FLAGS => "-c ",
+      :DEP_FLAGS => "--preproc_dependency=",
+      :DEP_FLAGS_SPACE => false
+    })
+
+    TiChain[:COMPILER][:C] = Utils.deep_copy(TiChain[:COMPILER][:CPP])
+    TiChain[:COMPILER][:C][:SOURCE_FILE_ENDINGS] = Provider.default[:COMPILER][:C][:SOURCE_FILE_ENDINGS]
+
+    TiChain[:COMPILER][:ASM] = Utils.deep_copy(TiChain[:COMPILER][:C])
+    TiChain[:COMPILER][:ASM][:SOURCE_FILE_ENDINGS] = Provider.default[:COMPILER][:ASM][:SOURCE_FILE_ENDINGS]
+
+    TiChain[:COMPILER][:DEP_FILE_SINGLE_LINE] = true
+
+    TiChain[:ARCHIVER][:COMMAND] = "ti_ar"
+    TiChain[:ARCHIVER][:ARCHIVE_FLAGS] = "r"
+
+    TiChain[:LINKER][:COMMAND] = "ti_cl"
+    TiChain[:LINKER][:FLAGS] = ""
+    TiChain[:LINKER][:MAP_FILE_FLAG] = '-m'
+    TiChain[:LINKER][:EXE_FLAG] = "-o"
+    TiChain[:LINKER][:LIB_FLAG] = "-l"
+    TiChain[:LINKER][:LIB_PATH_FLAG] = "-i"
+
+    tiCompilerErrorParser =                   TICompilerErrorParser.new
+    TiChain[:COMPILER][:C][:ERROR_PARSER] =   tiCompilerErrorParser
+    TiChain[:COMPILER][:CPP][:ERROR_PARSER] = tiCompilerErrorParser
+    TiChain[:COMPILER][:ASM][:ERROR_PARSER] = tiCompilerErrorParser
+    TiChain[:ARCHIVER][:ERROR_PARSER] =       tiCompilerErrorParser
+    TiChain[:LINKER][:ERROR_PARSER] =         TILinkerErrorParser.new
+
+  end
+end