bake-toolkit 1.8.0.1 → 2.0.10

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

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

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

@@ -0,0 +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.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

@@ -0,0 +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.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

@@ -0,0 +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

data/lib/bake/toolchain/gcc_param.rb

@@ -0,0 +1,7 @@
+module Bake
+  module Toolchain
+    
+    
+    
+  end
+end

data/lib/bake/toolchain/greenhills.rb

@@ -0,0 +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

data/lib/bake/toolchain/keil.rb

@@ -0,0 +1,55 @@
+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

data/lib/bake/toolchain/lint.rb

@@ -0,0 +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"], # array, not string!
+    })
+
+    LintChain[:COMPILER][:CPP][:ERROR_PARSER] = LintErrorParser.new
+      
+  end
+end

data/lib/bake/toolchain/provider.rb

@@ -0,0 +1,136 @@
+module Bake
+  module Toolchain
+
+    class Provider
+      @@settings = {}
+      @@default = {
+        :COMPILER =>
+        {
+          :CPP => {
+            :COMMAND => "",
+            :DEFINE_FLAG => "",
+            :OBJECT_FILE_FLAG => "",
+            :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 => ""
+          },
+          :C => {
+            :COMMAND => "",
+            :DEFINE_FLAG => "",
+            :OBJECT_FILE_FLAG => "",
+            :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 => ""
+          },
+          :ASM => {
+            :COMMAND => "",
+            :DEFINE_FLAG => "",
+            :OBJECT_FILE_FLAG => "",
+            :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 => ""
+          }
+        },
+
+        :ARCHIVER =>
+        {
+          :COMMAND => "",
+          :ARCHIVE_FLAGS => "",
+          :FLAGS => "",
+          :ERROR_PARSER => nil
+        },
+
+        :LINKER =>
+        {
+          :COMMAND => "",
+          :MUST_FLAGS => "",
+          :SCRIPT => "",
+          :USER_LIB_FLAG => "",
+          :EXE_FLAG => "",
+          :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 => "",
+        :DEP_FILE_SINGLE_LINE => false
+      }
+
+      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/ti'
+require 'bake/toolchain/greenhills'
+require 'bake/toolchain/keil'

data/lib/bake/toolchain/ti.rb

@@ -0,0 +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

data/lib/bake/util.rb

@@ -1,32 +1,37 @@
 require 'bake/model/metamodel_ext'
 require 'bake/model/metamodel'
 require 'set'
-require 'cxxproject/utils/printer'
-require 'cxxproject/utils/exit_helper'
-require 'cxxproject/utils/utils'
+require 'bake/toolchain/colorizing_formatter'
+require 'common/exit_helper'
+require 'common/utils'
+
+
+def remove_empty_strings_and_join(a, j=' ')
+  return a.reject{|e|e.to_s.empty?}.join(j)
+end
 
 def adjustFlags(orgStr, flags)
-  orgSplitted = Cxxproject::Utils::flagSplit(orgStr, false)
+  orgSplitted = Bake::Utils::flagSplit(orgStr, false)
 
   flags.each do |f|
     if f.overwrite != ""
-      orgSplitted = Cxxproject::Utils::flagSplit(f.overwrite, false)
+      orgSplitted = Bake::Utils::flagSplit(f.overwrite, false)
     end
     
     if f.remove != ""
-      rmSplitted = Cxxproject::Utils::flagSplit(f.remove, false)
+      rmSplitted = Bake::Utils::flagSplit(f.remove, false)
       orgSplitted.delete_if {|o| rmSplitted.any? { |r|
         begin
           o.match("\\A"+r+"\\Z")
         rescue Exception => e
-          Cxxproject::Printer.printError "Error: #{f.file_name}(#{f.line_number}): " + e.message
-          Cxxproject::ExitHelper.exit(1)
+          Bake.formatter.printError(e.message, f)
+          Bake::ExitHelper.exit(1)
         end
       }}
     end
     
     if f.add != ""
-      Cxxproject::Utils::flagSplit(f.add, false).each do |a|
+      Bake::Utils::flagSplit(f.add, false).each do |a|
         orgSplitted << a unless orgSplitted.any? { |o| o==a }
       end
     end
@@ -46,6 +51,7 @@ def integrateToolchain(tcs, toolchain)
     integrateCompiler(tcs, c, c.ctype)
   end
   integrateLintPolicy(tcs, toolchain.lintPolicy)
+  integrateDocu(tcs, toolchain.docu) if toolchain.docu
 end  
 
 def integrateLintPolicy(tcs, policies)
@@ -54,6 +60,10 @@ def integrateLintPolicy(tcs, policies)
   end
 end
 
+def integrateDocu(tcs, docu)
+  tcs[:DOCU] = docu.name if docu.name != ""
+end
+
 def integrateLinker(tcs, linker)
   return tcs unless linker
   tcs[:LINKER][:COMMAND] = linker.command if linker.command != ""
@@ -75,7 +85,7 @@ def integrateCompiler(tcs, compiler, type)
   end
   tcs[:COMPILER][type][:FLAGS] = adjustFlags(tcs[:COMPILER][type][:FLAGS], compiler.flags)
   compiler.define.each do |d|
-    tcs[:COMPILER][type][:DEFINES] << d.str
+    tcs[:COMPILER][type][:DEFINES] << d.str unless tcs[:COMPILER][type][:DEFINES].include? d.str
   end
 end
 
@@ -118,11 +128,13 @@ def calc_def_roots(dir)
   rootsFile = searchRootsFile(dir)
   if (rootsFile)
     File.open(rootsFile).each do |line|
-      line.gsub!(/[\\]/,'/')
-      if File.is_absolute?(line)
-        def_roots << line
-      else
-        def_roots << File.dirname(rootsFile) + "/" + line
+      line = line.split("#")[0].strip.gsub(/[\\]/,'/')
+      if line != ""
+        if File.is_absolute?(line)
+          def_roots << line
+        else
+          def_roots << File.dirname(rootsFile) + "/" + line
+        end
       end
     end
   else