bake-toolkit 2.20.4 → 2.21.0

data/lib/bake/toolchain/lint.rb

@@ -1,20 +1,20 @@
-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",
+      :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

data/lib/bake/toolchain/msvc.rb

@@ -1,58 +1,58 @@
-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,
+      :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
+

data/lib/bake/toolchain/provider.rb

@@ -1,146 +1,146 @@
-module Bake
-  module Toolchain
-
-    class Provider
-      @@settings = {}
-      @@default = {
-        :COMPILER =>
-        {
-          :CPP => {
-            :COMMAND => "",
-            :DEFINE_FLAG => "",
-            :OBJECT_FILE_FLAG => "",
-            :OBJECT_FILE_ENDING => ".o",
-            :OBJ_FLAG_SPACE => false,
-            :INCLUDE_PATH_FLAG => "",
-            :COMPILE_FLAGS => "",
-            :DEFINES => [],
-            :FLAGS => "",
-            :SOURCE_FILE_ENDINGS => [".cxx", ".cpp", ".c++", ".cc", ".C"],
-            :DEP_FLAGS => "",
-            :DEP_FLAGS_SPACE => false,
-            :DEP_FLAGS_FILENAME => true,
-            :ERROR_PARSER => nil,
-            :PREPRO_FLAGS => "",
-            :PREPRO_FILE_FLAG => nil
-          },
-          :C => {
-            :COMMAND => "",
-            :DEFINE_FLAG => "",
-            :OBJECT_FILE_FLAG => "",
-            :OBJECT_FILE_ENDING => ".o",
-            :OBJ_FLAG_SPACE => false,
-            :INCLUDE_PATH_FLAG => "",
-            :COMPILE_FLAGS => "",
-            :DEFINES => [],
-            :FLAGS => "",
-            :SOURCE_FILE_ENDINGS => [".c"],
-            :DEP_FLAGS => "",
-            :DEP_FLAGS_SPACE => false,
-            :DEP_FLAGS_FILENAME => true,
-            :ERROR_PARSER => nil,
-            :PREPRO_FLAGS => "",
-            :PREPRO_FILE_FLAG => nil
-          },
-          :ASM => {
-            :COMMAND => "",
-            :DEFINE_FLAG => "",
-            :OBJECT_FILE_FLAG => "",
-            :OBJECT_FILE_ENDING => ".o",
-            :OBJ_FLAG_SPACE => false,
-            :INCLUDE_PATH_FLAG => "",
-            :COMPILE_FLAGS => "",
-            :DEFINES => [],
-            :FLAGS => "",
-            :SOURCE_FILE_ENDINGS => [".asm", ".s", ".S"],
-            :DEP_FLAGS => "",
-            :DEP_FLAGS_SPACE => false,
-            :DEP_FLAGS_FILENAME => true,
-            :ERROR_PARSER => nil,
-            :PREPRO_FLAGS => "",
-            :PREPRO_FILE_FLAG => nil
-          }
-        },
-
-        :ARCHIVER =>
-        {
-          :COMMAND => "",
-          :ARCHIVE_FLAGS => "",
-          :ARCHIVE_FLAGS_SPACE => true,
-          :FLAGS => "",
-          :ERROR_PARSER => nil
-        },
-
-        :LINKER =>
-        {
-          :COMMAND => "",
-          :MUST_FLAGS => "",
-          :SCRIPT => "",
-          :USER_LIB_FLAG => "",
-          :EXE_FLAG => "",
-          :EXE_FLAG_SPACE => true,
-          :LIB_FLAG => "",
-          :LIB_PATH_FLAG => "",
-          :LIB_PREFIX_FLAGS => "", # "-Wl,--whole-archive",
-          :LIB_POSTFIX_FLAGS => "", # "-Wl,--no-whole-archive",
-          :FLAGS => "",
-          :MAP_FILE_FLAG => "",
-          :MAP_FILE_PIPE => true,
-          :OUTPUT_ENDING => ".exe", # or .elf
-          :ERROR_PARSER => nil,
-          :LIST_MODE => false
-        },
-
-        :MAKE =>
-        {
-          :COMMAND => "make",
-          :FLAGS => "-j",
-          :FILE_FLAG => "-f",
-          :DIR_FLAG => "-C",
-          :CLEAN => "clean"
-        },
-
-        :LINT_POLICY => [],
-        :DOCU => ""
-      }
-
-      def self.add(name, basedOn = nil)
-        chain = Marshal.load(Marshal.dump(basedOn.nil? ? @@default : @@settings[basedOn]))
-        @@settings[name] = chain
-        chain
-      end
-
-      def self.default
-        @@default
-      end
-
-      def self.modify_cpp_compiler(based_on, h)
-        chain = Marshal.load(Marshal.dump(@@settings[based_on]))
-        chain[:COMPILER][:CPP].update(h)
-        chain
-      end
-
-      def self.[](name)
-        return @@settings[name] if @@settings.include? name
-        nil
-      end
-
-      def self.list
-        return @@settings.delete_if {|x| x.include?"Lint" }
-      end
-
-    end
-
-  end
-end
-
-require 'bake/toolchain/diab'
-require 'bake/toolchain/gcc'
-require 'bake/toolchain/lint'
-require 'bake/toolchain/clang'
-require 'bake/toolchain/clang_analyze'
-require 'bake/toolchain/ti'
-require 'bake/toolchain/greenhills'
-require 'bake/toolchain/keil'
-require 'bake/toolchain/msvc'
-require 'bake/toolchain/gcc_env'
+module Bake
+  module Toolchain
+
+    class Provider
+      @@settings = {}
+      @@default = {
+        :COMPILER =>
+        {
+          :CPP => {
+            :COMMAND => "",
+            :DEFINE_FLAG => "",
+            :OBJECT_FILE_FLAG => "",
+            :OBJECT_FILE_ENDING => ".o",
+            :OBJ_FLAG_SPACE => false,
+            :INCLUDE_PATH_FLAG => "",
+            :COMPILE_FLAGS => "",
+            :DEFINES => [],
+            :FLAGS => "",
+            :SOURCE_FILE_ENDINGS => [".cxx", ".cpp", ".c++", ".cc", ".C"],
+            :DEP_FLAGS => "",
+            :DEP_FLAGS_SPACE => false,
+            :DEP_FLAGS_FILENAME => true,
+            :ERROR_PARSER => nil,
+            :PREPRO_FLAGS => "",
+            :PREPRO_FILE_FLAG => nil
+          },
+          :C => {
+            :COMMAND => "",
+            :DEFINE_FLAG => "",
+            :OBJECT_FILE_FLAG => "",
+            :OBJECT_FILE_ENDING => ".o",
+            :OBJ_FLAG_SPACE => false,
+            :INCLUDE_PATH_FLAG => "",
+            :COMPILE_FLAGS => "",
+            :DEFINES => [],
+            :FLAGS => "",
+            :SOURCE_FILE_ENDINGS => [".c"],
+            :DEP_FLAGS => "",
+            :DEP_FLAGS_SPACE => false,
+            :DEP_FLAGS_FILENAME => true,
+            :ERROR_PARSER => nil,
+            :PREPRO_FLAGS => "",
+            :PREPRO_FILE_FLAG => nil
+          },
+          :ASM => {
+            :COMMAND => "",
+            :DEFINE_FLAG => "",
+            :OBJECT_FILE_FLAG => "",
+            :OBJECT_FILE_ENDING => ".o",
+            :OBJ_FLAG_SPACE => false,
+            :INCLUDE_PATH_FLAG => "",
+            :COMPILE_FLAGS => "",
+            :DEFINES => [],
+            :FLAGS => "",
+            :SOURCE_FILE_ENDINGS => [".asm", ".s", ".S"],
+            :DEP_FLAGS => "",
+            :DEP_FLAGS_SPACE => false,
+            :DEP_FLAGS_FILENAME => true,
+            :ERROR_PARSER => nil,
+            :PREPRO_FLAGS => "",
+            :PREPRO_FILE_FLAG => nil
+          }
+        },
+
+        :ARCHIVER =>
+        {
+          :COMMAND => "",
+          :ARCHIVE_FLAGS => "",
+          :ARCHIVE_FLAGS_SPACE => true,
+          :FLAGS => "",
+          :ERROR_PARSER => nil
+        },
+
+        :LINKER =>
+        {
+          :COMMAND => "",
+          :MUST_FLAGS => "",
+          :SCRIPT => "",
+          :USER_LIB_FLAG => "",
+          :EXE_FLAG => "",
+          :EXE_FLAG_SPACE => true,
+          :LIB_FLAG => "",
+          :LIB_PATH_FLAG => "",
+          :LIB_PREFIX_FLAGS => "", # "-Wl,--whole-archive",
+          :LIB_POSTFIX_FLAGS => "", # "-Wl,--no-whole-archive",
+          :FLAGS => "",
+          :MAP_FILE_FLAG => "",
+          :MAP_FILE_PIPE => true,
+          :OUTPUT_ENDING => ".exe", # or .elf
+          :ERROR_PARSER => nil,
+          :LIST_MODE => false
+        },
+
+        :MAKE =>
+        {
+          :COMMAND => "make",
+          :FLAGS => "-j",
+          :FILE_FLAG => "-f",
+          :DIR_FLAG => "-C",
+          :CLEAN => "clean"
+        },
+
+        :LINT_POLICY => [],
+        :DOCU => ""
+      }
+
+      def self.add(name, basedOn = nil)
+        chain = Marshal.load(Marshal.dump(basedOn.nil? ? @@default : @@settings[basedOn]))
+        @@settings[name] = chain
+        chain
+      end
+
+      def self.default
+        @@default
+      end
+
+      def self.modify_cpp_compiler(based_on, h)
+        chain = Marshal.load(Marshal.dump(@@settings[based_on]))
+        chain[:COMPILER][:CPP].update(h)
+        chain
+      end
+
+      def self.[](name)
+        return @@settings[name] if @@settings.include? name
+        nil
+      end
+
+      def self.list
+        return @@settings.delete_if {|x| x.include?"Lint" }
+      end
+
+    end
+
+  end
+end
+
+require 'bake/toolchain/diab'
+require 'bake/toolchain/gcc'
+require 'bake/toolchain/lint'
+require 'bake/toolchain/clang'
+require 'bake/toolchain/clang_analyze'
+require 'bake/toolchain/ti'
+require 'bake/toolchain/greenhills'
+require 'bake/toolchain/keil'
+require 'bake/toolchain/msvc'
+require 'bake/toolchain/gcc_env'

data/lib/bake/toolchain/ti.rb

@@ -1,47 +1,47 @@
-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[: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=",
+      :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[: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