bake-toolkit 2.20.4 → 2.21.0

data/lib/bake/toolchain/clang.rb

@@ -1,44 +1,44 @@
-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
-    gccCompilerErrorParser = GCCCompilerErrorParser.new
-
-    CLANG_CHAIN = Provider.add("CLANG")
-
-    CLANG_CHAIN[:COMPILER][:CPP].update({
-      :COMMAND => "clang++",
-      :DEFINE_FLAG => "-D",
-      :OBJECT_FILE_FLAG => "-o",
-      :OBJ_FLAG_SPACE => true,
-      :INCLUDE_PATH_FLAG => "-I",
-      :COMPILE_FLAGS => "-c ",
-      :DEP_FLAGS => "-MD -MF ", # empty space at the end is important!
-      :ERROR_PARSER => gccCompilerErrorParser
-    })
-
-    CLANG_CHAIN[:COMPILER][:C] = Utils.deep_copy(CLANG_CHAIN[:COMPILER][:CPP])
-    CLANG_CHAIN[:COMPILER][:C][:SOURCE_FILE_ENDINGS] = Provider.default[:COMPILER][:C][:SOURCE_FILE_ENDINGS]
-    CLANG_CHAIN[:COMPILER][:C][:COMMAND] = "clang"
-
-    CLANG_CHAIN[:COMPILER][:ASM] = Utils.deep_copy(CLANG_CHAIN[:COMPILER][:C])
-    CLANG_CHAIN[:COMPILER][:ASM][:SOURCE_FILE_ENDINGS] = Provider.default[:COMPILER][:ASM][:SOURCE_FILE_ENDINGS]
-
-    CLANG_CHAIN[:ARCHIVER][:COMMAND] = "ar"
-    CLANG_CHAIN[:ARCHIVER][:ARCHIVE_FLAGS] = "r"
-    CLANG_CHAIN[:ARCHIVER][:ERROR_PARSER] = gccCompilerErrorParser
-
-    CLANG_CHAIN[:LINKER][:COMMAND] = "clang++"
-    CLANG_CHAIN[:LINKER][:SCRIPT] = "-T"
-    CLANG_CHAIN[:LINKER][:USER_LIB_FLAG] = "-l:"
-    CLANG_CHAIN[:LINKER][:EXE_FLAG] = "-o"
-    CLANG_CHAIN[:LINKER][:LIB_FLAG] = "-l"
-    CLANG_CHAIN[:LINKER][:LIB_PATH_FLAG] = "-L"
-      
-    CLANG_CHAIN[: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
+    gccCompilerErrorParser = GCCCompilerErrorParser.new
+
+    CLANG_CHAIN = Provider.add("CLANG")
+
+    CLANG_CHAIN[:COMPILER][:CPP].update({
+      :COMMAND => "clang++",
+      :DEFINE_FLAG => "-D",
+      :OBJECT_FILE_FLAG => "-o",
+      :OBJ_FLAG_SPACE => true,
+      :INCLUDE_PATH_FLAG => "-I",
+      :COMPILE_FLAGS => "-c ",
+      :DEP_FLAGS => "-MD -MF ", # empty space at the end is important!
+      :ERROR_PARSER => gccCompilerErrorParser
+    })
+
+    CLANG_CHAIN[:COMPILER][:C] = Utils.deep_copy(CLANG_CHAIN[:COMPILER][:CPP])
+    CLANG_CHAIN[:COMPILER][:C][:SOURCE_FILE_ENDINGS] = Provider.default[:COMPILER][:C][:SOURCE_FILE_ENDINGS]
+    CLANG_CHAIN[:COMPILER][:C][:COMMAND] = "clang"
+
+    CLANG_CHAIN[:COMPILER][:ASM] = Utils.deep_copy(CLANG_CHAIN[:COMPILER][:C])
+    CLANG_CHAIN[:COMPILER][:ASM][:SOURCE_FILE_ENDINGS] = Provider.default[:COMPILER][:ASM][:SOURCE_FILE_ENDINGS]
+
+    CLANG_CHAIN[:ARCHIVER][:COMMAND] = "ar"
+    CLANG_CHAIN[:ARCHIVER][:ARCHIVE_FLAGS] = "r"
+    CLANG_CHAIN[:ARCHIVER][:ERROR_PARSER] = gccCompilerErrorParser
+
+    CLANG_CHAIN[:LINKER][:COMMAND] = "clang++"
+    CLANG_CHAIN[:LINKER][:SCRIPT] = "-T"
+    CLANG_CHAIN[:LINKER][:USER_LIB_FLAG] = "-l:"
+    CLANG_CHAIN[:LINKER][:EXE_FLAG] = "-o"
+    CLANG_CHAIN[:LINKER][:LIB_FLAG] = "-l"
+    CLANG_CHAIN[:LINKER][:LIB_PATH_FLAG] = "-L"
+
+    CLANG_CHAIN[:LINKER][:ERROR_PARSER] = GCCLinkerErrorParser.new
+  end
+end

data/lib/bake/toolchain/clang_analyze.rb

@@ -1,31 +1,31 @@
-require 'common/utils'
-require 'bake/toolchain/provider'
-
-module Bake
-  module Toolchain
-    CLANG_ANALYZE_CHAIN = Provider.add("CLANG_ANALYZE")
-
-    CLANG_ANALYZE_CHAIN[:COMPILER][:CPP].update({
-      :COMMAND => "clang++",
-      :DEFINE_FLAG => "-D",
-      :OBJECT_FILE_FLAG => "-o",
-      :OBJ_FLAG_SPACE => true,
-      :OBJECT_FILE_ENDING => ".plist",
-      :INCLUDE_PATH_FLAG => "-I",
-      :COMPILE_FLAGS => "-cc1 -analyze -analyzer-output=plist ",
-      :DEP_FLAGS => "",
-      :DEP_FLAGS_FILENAME  => false,
-      :ERROR_PARSER => nil
-    })
-
-    CLANG_ANALYZE_CHAIN[:COMPILER][:C] = Utils.deep_copy(CLANG_ANALYZE_CHAIN[:COMPILER][:CPP])
-    CLANG_ANALYZE_CHAIN[:COMPILER][:C][:SOURCE_FILE_ENDINGS] = Provider.default[:COMPILER][:C][:SOURCE_FILE_ENDINGS]
-    CLANG_ANALYZE_CHAIN[:COMPILER][:C][:COMMAND] = "clang"
-
-    CLANG_ANALYZE_CHAIN[:COMPILER][:ASM] = Utils.deep_copy(CLANG_ANALYZE_CHAIN[:COMPILER][:C])
-    CLANG_ANALYZE_CHAIN[:COMPILER][:ASM][:SOURCE_FILE_ENDINGS] = Provider.default[:COMPILER][:ASM][:SOURCE_FILE_ENDINGS]
-
-    CLANG_ANALYZE_CHAIN[:ARCHIVER][:COMMAND] = ""
-    CLANG_ANALYZE_CHAIN[:LINKER][:COMMAND] = ""
-  end
-end
+require 'common/utils'
+require 'bake/toolchain/provider'
+
+module Bake
+  module Toolchain
+    CLANG_ANALYZE_CHAIN = Provider.add("CLANG_ANALYZE")
+
+    CLANG_ANALYZE_CHAIN[:COMPILER][:CPP].update({
+      :COMMAND => "clang++",
+      :DEFINE_FLAG => "-D",
+      :OBJECT_FILE_FLAG => "-o",
+      :OBJ_FLAG_SPACE => true,
+      :OBJECT_FILE_ENDING => ".plist",
+      :INCLUDE_PATH_FLAG => "-I",
+      :COMPILE_FLAGS => "-cc1 -analyze -analyzer-output=plist ",
+      :DEP_FLAGS => "",
+      :DEP_FLAGS_FILENAME  => false,
+      :ERROR_PARSER => nil
+    })
+
+    CLANG_ANALYZE_CHAIN[:COMPILER][:C] = Utils.deep_copy(CLANG_ANALYZE_CHAIN[:COMPILER][:CPP])
+    CLANG_ANALYZE_CHAIN[:COMPILER][:C][:SOURCE_FILE_ENDINGS] = Provider.default[:COMPILER][:C][:SOURCE_FILE_ENDINGS]
+    CLANG_ANALYZE_CHAIN[:COMPILER][:C][:COMMAND] = "clang"
+
+    CLANG_ANALYZE_CHAIN[:COMPILER][:ASM] = Utils.deep_copy(CLANG_ANALYZE_CHAIN[:COMPILER][:C])
+    CLANG_ANALYZE_CHAIN[:COMPILER][:ASM][:SOURCE_FILE_ENDINGS] = Provider.default[:COMPILER][:ASM][:SOURCE_FILE_ENDINGS]
+
+    CLANG_ANALYZE_CHAIN[:ARCHIVER][:COMMAND] = ""
+    CLANG_ANALYZE_CHAIN[:LINKER][:COMMAND] = ""
+  end
+end

data/lib/bake/toolchain/colorizing_formatter.rb

@@ -1,125 +1,125 @@
-require 'colored'
-
-module Bake
-  #include Utils ????
-
-  class ColorizingFormatter
-    
-    def initialize
-      @scheme = :none
-    end
-  
-    def setColorScheme(scheme)
-      
-      if (scheme != :black and scheme != :white and scheme != :none)
-        Bake.formatter.printError("Error: color scheme must be 'black' or 'white'")
-        ExitHelper.exit(1)
-      end
-      @scheme = scheme
-      
-      if @scheme == :black
-        @warning_color = :yellow
-        @error_color = :red
-        @info_color = :white
-        @additional_info_color = :cyan
-        @success_color = :green
-      elsif @scheme == :white
-        @warning_color = :magenta
-        @error_color = :red
-        @info_color = :black
-        @additional_info_color = :blue
-        @success_color = :green
-      end
-    end
-  
-    def printInternal(col, str)
-      puts(@scheme == :none ? str : [col,:bold].inject(str) {|m,x| m.send(x)})
-    end
-    
-    def createIdeError(str, file_name, line_number, severity)
-      if (file_name)
-        d = ErrorDesc.new
-        d.file_name = file_name
-        d.line_number = (line_number ? line_number : 0)
-        d.message = str
-        d.severity = severity
-        Bake::IDEInterface.instance.set_errors([d])
-      end
-    end
-  
-    def processString(prefix, str, file_name_or_elem, line_num, severity)
-      if file_name_or_elem.respond_to?("file_name")
-        file_name = file_name_or_elem.file_name
-        line_num = file_name_or_elem.line_number
-      elsif String === file_name_or_elem
-        file_name = file_name_or_elem
-      else
-        file_name = nil
-      end
-
-      createIdeError(str, file_name, line_num, severity)
-      
-      line = (line_num ? ":#{line_num}" : "")
-      file = (file_name ? "#{file_name}#{line}: " : "")
-      return file + prefix + ": " + str
-    end
-    
-    def printError(str, file_name_or_elem=nil, line_num=nil)
-      str = processString("Error", str, file_name_or_elem, line_num, Bake::ErrorParser::SEVERITY_ERROR) if file_name_or_elem
-      printInternal(@error_color, str)
-    end
-  
-    def printWarning(str, file_name=nil, line_num=nil)
-      str = processString("Warning", str, file_name, line_num, Bake::ErrorParser::SEVERITY_WARNING) if file_name
-      printInternal(@warning_color, str)
-    end
-  
-    def printInfo(str, file_name=nil, line_num=nil)
-      str = processString("Info", str, file_name, line_num, Bake::ErrorParser::SEVERITY_INFO) if file_name
-      printInternal(@info_color, str)
-    end
-  
-    def printAdditionalInfo(str)
-      printInternal(@additional_info_color, str)
-    end
-  
-    def printSuccess(str)
-      printInternal(@success_color, str)
-    end
-  
-    # formats several lines of compiler output
-    def format(compiler_output, error_descs, error_parser)
-      if @scheme == :none
-        puts compiler_output
-      else 
-        begin
-          zipped = compiler_output.split($/).zip(error_descs)
-          zipped.each do |l,desc|
-            if desc.severity != 255
-              coloring = {}
-              if desc.severity == ErrorParser::SEVERITY_WARNING
-                printWarning(l)
-              elsif desc.severity == ErrorParser::SEVERITY_ERROR
-                printError(l)
-              else
-                printInfo(l)
-              end
-            else
-              puts l
-            end
-          end
-        rescue Exception => e
-          puts "Error while parsing output: #{e}"
-          puts e.backtrace if Bake.options.debug
-          puts compiler_output
-        end
-      end
-    end
-  end
-
-def self.formatter
-  @@formatter ||= ColorizingFormatter.new
-end
-
-    
-end
+require 'colored'
+
+module Bake
+  #include Utils ????
+
+  class ColorizingFormatter
+
+    def initialize
+      @scheme = :none
+    end
+
+    def setColorScheme(scheme)
+
+      if (scheme != :black and scheme != :white and scheme != :none)
+        Bake.formatter.printError("Error: color scheme must be 'black' or 'white'")
+        ExitHelper.exit(1)
+      end
+      @scheme = scheme
+
+      if @scheme == :black
+        @warning_color = :yellow
+        @error_color = :red
+        @info_color = :white
+        @additional_info_color = :cyan
+        @success_color = :green
+      elsif @scheme == :white
+        @warning_color = :magenta
+        @error_color = :red
+        @info_color = :black
+        @additional_info_color = :blue
+        @success_color = :green
+      end
+    end
+
+    def printInternal(col, str)
+      puts(@scheme == :none ? str : [col,:bold].inject(str) {|m,x| m.send(x)})
+    end
+
+    def createIdeError(str, file_name, line_number, severity)
+      if (file_name)
+        d = ErrorDesc.new
+        d.file_name = file_name
+        d.line_number = (line_number ? line_number : 0)
+        d.message = str
+        d.severity = severity
+        Bake::IDEInterface.instance.set_errors([d])
+      end
+    end
+
+    def processString(prefix, str, file_name_or_elem, line_num, severity)
+      if file_name_or_elem.respond_to?("file_name")
+        file_name = file_name_or_elem.file_name
+        line_num = file_name_or_elem.line_number
+      elsif String === file_name_or_elem
+        file_name = file_name_or_elem
+      else
+        file_name = nil
+      end
+
+      createIdeError(str, file_name, line_num, severity)
+
+      line = (line_num ? ":#{line_num}" : "")
+      file = (file_name ? "#{file_name}#{line}: " : "")
+      return file + prefix + ": " + str
+    end
+
+    def printError(str, file_name_or_elem=nil, line_num=nil)
+      str = processString("Error", str, file_name_or_elem, line_num, Bake::ErrorParser::SEVERITY_ERROR) if file_name_or_elem
+      printInternal(@error_color, str)
+    end
+
+    def printWarning(str, file_name=nil, line_num=nil)
+      str = processString("Warning", str, file_name, line_num, Bake::ErrorParser::SEVERITY_WARNING) if file_name
+      printInternal(@warning_color, str)
+    end
+
+    def printInfo(str, file_name=nil, line_num=nil)
+      str = processString("Info", str, file_name, line_num, Bake::ErrorParser::SEVERITY_INFO) if file_name
+      printInternal(@info_color, str)
+    end
+
+    def printAdditionalInfo(str)
+      printInternal(@additional_info_color, str)
+    end
+
+    def printSuccess(str)
+      printInternal(@success_color, str)
+    end
+
+    # formats several lines of compiler output
+    def format(compiler_output, error_descs, error_parser)
+      if @scheme == :none
+        puts compiler_output
+      else
+        begin
+          zipped = compiler_output.split($/).zip(error_descs)
+          zipped.each do |l,desc|
+            if desc.severity != 255
+              coloring = {}
+              if desc.severity == ErrorParser::SEVERITY_WARNING
+                printWarning(l)
+              elsif desc.severity == ErrorParser::SEVERITY_ERROR
+                printError(l)
+              else
+                printInfo(l)
+              end
+            else
+              puts l
+            end
+          end
+        rescue Exception => e
+          puts "Error while parsing output: #{e}"
+          puts e.backtrace if Bake.options.debug
+          puts compiler_output
+        end
+      end
+    end
+  end
+
+def self.formatter
+  @@formatter ||= ColorizingFormatter.new
+end
+
+
+end

data/lib/bake/toolchain/diab.rb

@@ -1,53 +1,53 @@
-require 'bake/toolchain/provider'
-require 'common/utils'
-require 'bake/toolchain/errorparser/diab_compiler_error_parser'
-require 'bake/toolchain/errorparser/diab_linker_error_parser'
-
-module Bake
-  module Toolchain
-
-    DiabChain = Provider.add("Diab")
-
-    DiabChain[:COMPILER][:C].update({
-      :COMMAND => "dcc",
-      :FLAGS => "",
-      :DEFINE_FLAG => "-D",
-      :OBJECT_FILE_FLAG => "-o",
-      :OBJ_FLAG_SPACE => true,
-      :INCLUDE_PATH_FLAG => "-I",
-      :COMPILE_FLAGS => "-c",
-      :DEP_FLAGS => "-Xmake-dependency=5 -Xmake-dependency-savefile=",
-      :DEP_FLAGS_SPACE => false,
-      :PREPRO_FLAGS => "-P"
-    })
-
-    DiabChain[:COMPILER][:CPP] = Utils.deep_copy(DiabChain[:COMPILER][:C])
-    DiabChain[:COMPILER][:CPP][:SOURCE_FILE_ENDINGS] = Provider.default[:COMPILER][:CPP][:SOURCE_FILE_ENDINGS]
-
-    DiabChain[:COMPILER][:ASM] = Utils.deep_copy(DiabChain[:COMPILER][:C])
-    DiabChain[:COMPILER][:ASM][:COMMAND] = "das"
-    DiabChain[:COMPILER][:ASM][:COMPILE_FLAGS] = ""
-    DiabChain[:COMPILER][:ASM][:SOURCE_FILE_ENDINGS] = Provider.default[:COMPILER][:ASM][:SOURCE_FILE_ENDINGS]
-    DiabChain[:COMPILER][:ASM][:PREPRO_FLAGS] = ""
-
-    DiabChain[:ARCHIVER][:COMMAND] = "dar"
-    DiabChain[:ARCHIVER][:ARCHIVE_FLAGS] = "-rc"
-
-    DiabChain[:LINKER][:COMMAND] = "dcc"
-    DiabChain[:LINKER][:SCRIPT] = "-Wm"
-    DiabChain[:LINKER][:USER_LIB_FLAG] = "-l:"
-    DiabChain[:LINKER][:EXE_FLAG] = "-o"
-    DiabChain[:LINKER][:LIB_FLAG] = "-l"
-    DiabChain[:LINKER][:LIB_PATH_FLAG] = "-L"
-    DiabChain[:LINKER][:MAP_FILE_FLAG] = "-Wl,-m6" # no map file if this string is empty, otherwise -Wl,-m6>abc.map
-    DiabChain[:LINKER][:OUTPUT_ENDING] = ".elf"
-
-    diabCompilerErrorParser =                   DiabCompilerErrorParser.new
-    DiabChain[:COMPILER][:C][:ERROR_PARSER] =   diabCompilerErrorParser
-    DiabChain[:COMPILER][:CPP][:ERROR_PARSER] = diabCompilerErrorParser
-    DiabChain[:COMPILER][:ASM][:ERROR_PARSER] = diabCompilerErrorParser
-    DiabChain[:ARCHIVER][:ERROR_PARSER] =       diabCompilerErrorParser
-    DiabChain[:LINKER][:ERROR_PARSER] =         DiabLinkerErrorParser.new
-
-  end
-end
+require 'bake/toolchain/provider'
+require 'common/utils'
+require 'bake/toolchain/errorparser/diab_compiler_error_parser'
+require 'bake/toolchain/errorparser/diab_linker_error_parser'
+
+module Bake
+  module Toolchain
+
+    DiabChain = Provider.add("Diab")
+
+    DiabChain[:COMPILER][:C].update({
+      :COMMAND => "dcc",
+      :FLAGS => "",
+      :DEFINE_FLAG => "-D",
+      :OBJECT_FILE_FLAG => "-o",
+      :OBJ_FLAG_SPACE => true,
+      :INCLUDE_PATH_FLAG => "-I",
+      :COMPILE_FLAGS => "-c",
+      :DEP_FLAGS => "-Xmake-dependency=5 -Xmake-dependency-savefile=",
+      :DEP_FLAGS_SPACE => false,
+      :PREPRO_FLAGS => "-P"
+    })
+
+    DiabChain[:COMPILER][:CPP] = Utils.deep_copy(DiabChain[:COMPILER][:C])
+    DiabChain[:COMPILER][:CPP][:SOURCE_FILE_ENDINGS] = Provider.default[:COMPILER][:CPP][:SOURCE_FILE_ENDINGS]
+
+    DiabChain[:COMPILER][:ASM] = Utils.deep_copy(DiabChain[:COMPILER][:C])
+    DiabChain[:COMPILER][:ASM][:COMMAND] = "das"
+    DiabChain[:COMPILER][:ASM][:COMPILE_FLAGS] = ""
+    DiabChain[:COMPILER][:ASM][:SOURCE_FILE_ENDINGS] = Provider.default[:COMPILER][:ASM][:SOURCE_FILE_ENDINGS]
+    DiabChain[:COMPILER][:ASM][:PREPRO_FLAGS] = ""
+
+    DiabChain[:ARCHIVER][:COMMAND] = "dar"
+    DiabChain[:ARCHIVER][:ARCHIVE_FLAGS] = "-rc"
+
+    DiabChain[:LINKER][:COMMAND] = "dcc"
+    DiabChain[:LINKER][:SCRIPT] = "-Wm"
+    DiabChain[:LINKER][:USER_LIB_FLAG] = "-l:"
+    DiabChain[:LINKER][:EXE_FLAG] = "-o"
+    DiabChain[:LINKER][:LIB_FLAG] = "-l"
+    DiabChain[:LINKER][:LIB_PATH_FLAG] = "-L"
+    DiabChain[:LINKER][:MAP_FILE_FLAG] = "-Wl,-m6" # no map file if this string is empty, otherwise -Wl,-m6>abc.map
+    DiabChain[:LINKER][:OUTPUT_ENDING] = ".elf"
+
+    diabCompilerErrorParser =                   DiabCompilerErrorParser.new
+    DiabChain[:COMPILER][:C][:ERROR_PARSER] =   diabCompilerErrorParser
+    DiabChain[:COMPILER][:CPP][:ERROR_PARSER] = diabCompilerErrorParser
+    DiabChain[:COMPILER][:ASM][:ERROR_PARSER] = diabCompilerErrorParser
+    DiabChain[:ARCHIVER][:ERROR_PARSER] =       diabCompilerErrorParser
+    DiabChain[:LINKER][:ERROR_PARSER] =         DiabLinkerErrorParser.new
+
+  end
+end