cxxproject 0.4.6 → 0.5.47

data/lib/cxxproject/toolchain/clang.rb

@@ -0,0 +1,39 @@
+require 'cxxproject/utils/utils'
+require 'cxxproject/toolchain/provider'
+require 'cxxproject/errorparser/error_parser'
+require 'cxxproject/errorparser/gcc_compiler_error_parser'
+
+module Cxxproject
+  module Toolchain
+    gccCompilerErrorParser = GCCCompilerErrorParser.new
+
+    CLANG_CHAIN = Provider.add("CLANG")
+
+    CLANG_CHAIN[:COMPILER][:CPP].update({
+      :COMMAND => "llvm-g++",
+      :DEFINE_FLAG => "-D",
+      :OBJECT_FILE_FLAG => "-o",
+      :INCLUDE_PATH_FLAG => "-I",
+      :COMPILE_FLAGS => "-c ",
+      :DEP_FLAGS => "-MMD -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] = "llvm-gcc"
+
+    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[:LINKER][:COMMAND] = "llvm-g++"
+    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"
+  end
+end

data/lib/cxxproject/toolchain/colorizing_formatter.rb

@@ -0,0 +1,99 @@
+require 'cxxproject/utils/optional'
+
+module Cxxproject
+  include Utils
+
+  class ColorizingFormatter
+    class << self
+      attr_accessor :enabled
+    end
+    def enabled?
+      false
+    end
+  end
+
+  define_colorizin_formatter = lambda do
+    require 'colored'
+
+    # simple class to colorize compiler output
+    # the class depends on the rainbow gem
+    class ColorizingFormatter
+    
+      # colors are not instance vars due to caching the building blocks
+      def self.setColorScheme(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
+      ColorizingFormatter.setColorScheme(:black) # default
+
+      def printError(str)
+        [@@error_color,:bold].inject(str) {|m,x| m.send(x)}
+      end
+
+      def printWarning(str)
+        [@@warning_color,:bold].inject(str) {|m,x| m.send(x)}
+      end
+
+      def printInfo(str)
+        [@@info_color,:bold].inject(str) {|m,x| m.send(x)}
+      end
+
+      def printAdditionalInfo(str)
+        [@@additional_info_color,:bold].inject(str) {|m,x| m.send(x)}
+      end
+
+      def printSuccess(str)
+        [@@success_color,:bold].inject(str) {|m,x| m.send(x)}
+      end
+
+      # formats several lines of usually compiler output
+      def format(compiler_output, error_descs, error_parser)
+        return compiler_output if not enabled?
+        res = ""
+        begin
+          zipped = compiler_output.split($/).zip(error_descs)
+          zipped.each do |l,desc|
+            if desc.severity != 255
+              coloring = {}
+              if desc.severity == ErrorParser::SEVERITY_WARNING
+                res << printWarning(l)
+              elsif desc.severity == ErrorParser::SEVERITY_ERROR
+                res << printError(l)
+              else
+                res << printInfo(l)
+              end
+            else
+              res << l
+            end
+            res << "\n" 
+          end
+        rescue Exception => e
+          puts "Error while parsing compiler output: #{e}"
+          return compiler_output
+        end
+        res
+      end
+
+      # getter to access the static variable with an instance
+      def enabled?
+        return ColorizingFormatter.enabled
+      end
+
+    end
+
+  end
+
+  Utils.optional_package(define_colorizin_formatter, nil)
+
+end

data/lib/cxxproject/toolchain/diab.rb

@@ -1,47 +1,50 @@
-require 'cxxproject/toolchain/base'
+require 'cxxproject/toolchain/provider'
 require 'cxxproject/utils/utils'
+require 'cxxproject/errorparser/diab_compiler_error_parser'
+require 'cxxproject/errorparser/diab_linker_error_parser'
 
 module Cxxproject
   module Toolchain
 
-    DiabChainDebug = Provider.add("Diab_Debug")
+    DiabChain = Provider.add("Diab")
 
-    DiabChainDebug[:COMPILER][:C].update({
+    DiabChain[:COMPILER][:C].update({
       :COMMAND => "dcc",
-      :FLAGS => "-tPPCE200Z6VEN:simple -O -XO -Xsize-opt -Xsmall-const=0 -Xenum-is-best -Xexceptions-off -g",
+      :FLAGS => "",
       :DEFINE_FLAG => "-D",
-      :OBJECT_FILE_FLAG => "-o",
+      :OBJECT_FILE_FLAG => "-o ",
       :INCLUDE_PATH_FLAG => "-I",
       :COMPILE_FLAGS => "-c",
-      :DEP_FLAGS => "-Xmake-dependency=6 -Xmake-dependency-savefile="
+      :DEP_FLAGS => "-Xmake-dependency=6 -Xmake-dependency-savefile=",
+      :DEP_FLAGS_SPACE => false
     })
 
-    DiabChainDebug[:COMPILER][:CPP] = Utils.deep_copy(DiabChainDebug[:COMPILER][:C])
-    DiabChainDebug[:COMPILER][:CPP][:FLAGS] = DiabChainDebug[:COMPILER][:CPP][:FLAGS] + " -Xrtti-off"
-    DiabChainDebug[:COMPILER][:CPP][:SOURCE_FILE_ENDINGS] = Provider.default[:COMPILER][:CPP][:SOURCE_FILE_ENDINGS]
-
-    DiabChainDebug[:COMPILER][:ASM] = Utils.deep_copy(DiabChainDebug[:COMPILER][:C])
-    DiabChainDebug[:COMPILER][:ASM][:COMMAND] = "das"
-    DiabChainDebug[:COMPILER][:ASM][:FLAGS] = "-tPPCE200Z6VEN:simple -Xisa-vle -g -Xasm-debug-on"
-    DiabChainDebug[:COMPILER][:ASM][:COMPILE_FLAGS] = ""
-    DiabChainDebug[:COMPILER][:ASM][:SOURCE_FILE_ENDINGS] = Provider.default[:COMPILER][:ASM][:SOURCE_FILE_ENDINGS]
-
-    DiabChainDebug[:ARCHIVER][:COMMAND] = "dar"
-    DiabChainDebug[:ARCHIVER][:ARCHIVE_FLAGS] = "-r"
-
-    DiabChainDebug[:LINKER][:COMMAND] = "dcc"
-    DiabChainDebug[:LINKER][:SCRIPT] = "-Wm"
-    DiabChainDebug[:LINKER][:USER_LIB_FLAG] = "-l:"
-    DiabChainDebug[:LINKER][:EXE_FLAG] = "-o"
-    DiabChainDebug[:LINKER][:LIB_FLAG] = "-l"
-    DiabChainDebug[:LINKER][:LIB_PATH_FLAG] = "-L"
-    DiabChainDebug[:LINKER][:MAP_FILE_FLAG] = "-Wl,-m6" # no map file if this string is empty, otherwise -Wl,-m6>abc.map
-    DiabChainDebug[:LINKER][:FLAGS] = "-ulink_date_time -uResetConfigurationHalfWord -Wl,-Xstop-on-redeclaration -Wl,-Xstop-on-warning -tPPCE200Z6VEN:simple -Wl,-Xremove-unused-sections -Wl,-Xunused-sections-list"
-    DiabChainDebug[:LINKER][:OUTPUT_ENDING] = ".elf"
-
-    DiabChainRelease = Provider.add("Diab_Release", "Diab_Debug")
-    DiabChainRelease[:COMPILER][:C][:FLAGS] = "-tPPCE200Z6VEN:simple -XO -Xsize-opt -Xsmall-const=0 -Xenum-is-best -Xsection-split -Xforce-declarations"
-    DiabChainRelease[:COMPILER][:CPP][:FLAGS] = "-tPPCE200Z6VEN:simple -XO -Xsize-opt -Xsmall-const=0 -Xenum-is-best -Xrtti-off -Xexceptions-off -Xsection-split"
-
+    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[: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

data/lib/cxxproject/toolchain/gcc.rb

@@ -1,18 +1,22 @@
-require 'cxxproject/toolchain/base'
 require 'cxxproject/utils/utils'
+require 'cxxproject/toolchain/provider'
+require 'cxxproject/errorparser/error_parser'
+require 'cxxproject/errorparser/gcc_compiler_error_parser'
+require 'cxxproject/errorparser/gcc_linker_error_parser'
 
 module Cxxproject
   module Toolchain
-
+
     GCCChain = Provider.add("GCC")
 
     GCCChain[:COMPILER][:CPP].update({
       :COMMAND => "g++",
       :DEFINE_FLAG => "-D",
-      :OBJECT_FILE_FLAG => "-o",
+      :OBJECT_FILE_FLAG => "-o ",
       :INCLUDE_PATH_FLAG => "-I",
       :COMPILE_FLAGS => "-c ",
-      :DEP_FLAGS => "-MMD -MF " # empty space at the end is important!
+      :DEP_FLAGS => "-MMD -MF",
+      :DEP_FLAGS_SPACE => true
     })
 
     GCCChain[:COMPILER][:C] = Utils.deep_copy(GCCChain[:COMPILER][:CPP])
@@ -23,7 +27,7 @@ module Cxxproject
     GCCChain[:COMPILER][:ASM][:SOURCE_FILE_ENDINGS] = Provider.default[:COMPILER][:ASM][:SOURCE_FILE_ENDINGS]
 
     GCCChain[:ARCHIVER][:COMMAND] = "ar"
-    GCCChain[:ARCHIVER][:ARCHIVE_FLAGS] = "-r"
+    GCCChain[:ARCHIVER][:ARCHIVE_FLAGS] = "-rc"
 
     GCCChain[:LINKER][:COMMAND] = "g++"
     GCCChain[:LINKER][:SCRIPT] = "-T"
@@ -31,9 +35,13 @@ module Cxxproject
     GCCChain[:LINKER][:EXE_FLAG] = "-o"
     GCCChain[:LINKER][:LIB_FLAG] = "-l"
     GCCChain[:LINKER][:LIB_PATH_FLAG] = "-L"
-    GCCChain[:LINKER][:FLAGS] = "-all_load"
-    GCCChain[:LINKER][:LIB_PREFIX_FLAGS] = "-Wl,--whole-archive"
-    GCCChain[:LINKER][:LIB_POSTFIX_FLAGS] = "-Wl,--no-whole-archive"
 
+    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/cxxproject/toolchain/provider.rb

@@ -1,18 +1,128 @@
-require 'cxxproject/toolchain/diab'
-require 'cxxproject/toolchain/gcc'
+require 'cxxproject/toolchain/colorizing_formatter'
 
 module Cxxproject
   module Toolchain
 
     class Provider
+      @@settings = {}
+      @@default = {
+        :COMPILER =>
+        {
+          :CPP => {
+            :COMMAND => "",
+            :DEFINE_FLAG => "",
+            :OBJECT_FILE_FLAG => "",
+            :INCLUDE_PATH_FLAG => "",
+            :COMPILE_FLAGS => "",
+            :DEFINES => [],
+            :FLAGS => "",
+            :SOURCE_FILE_ENDINGS => [".cxx", ".cpp", ".c++", ".cc", ".C"],
+            :DEP_FLAGS => "",
+            :DEP_FLAGS => true,
+            :ERROR_PARSER => nil
+          },
+          :C => {
+            :COMMAND => "",
+            :DEFINE_FLAG => "",
+            :OBJECT_FILE_FLAG => "",
+            :INCLUDE_PATH_FLAG => "",
+            :COMPILE_FLAGS => "",
+            :DEFINES => [],
+            :FLAGS => "",
+            :SOURCE_FILE_ENDINGS => [".c"],
+            :DEP_FLAGS => "",
+            :ERROR_PARSER => nil
+          },
+          :ASM => {
+            :COMMAND => "",
+            :DEFINE_FLAG => "",
+            :OBJECT_FILE_FLAG => "",
+            :INCLUDE_PATH_FLAG => "",
+            :COMPILE_FLAGS => "",
+            :DEFINES => [],
+            :FLAGS => "",
+            :SOURCE_FILE_ENDINGS => [".asm", ".s", ".S"],
+            :DEP_FLAGS => "",
+            :ERROR_PARSER => nil
+          }
+        },
+
+        :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 => "",
+          :OUTPUT_ENDING => ".exe", # or .elf
+          :ERROR_PARSER => nil
+        },
+
+        :MAKE =>
+        {
+          :COMMAND => "make",
+          :FLAGS => "-j",
+          :FILE_FLAG => "-f",
+          :DIR_FLAG => "-C",
+          :CLEAN => "clean"
+        },
+        
+        :CONSOLE_HIGHLIGHTER => ColorizingFormatter.new
+      }
+
+      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)
+      
+        if name == "TI"
+          if not ENV['TI_HOME']
+            Printer.printError "Error: Please set TI_HOME"
+            ExitHelper.exit(1)
+          end
+        end
+      
         return @@settings[name] if @@settings.include? name
         nil
       end
 
+      def self.list
+        return @@settings
+      end
 
     end
 
   end
 end
+
+require 'cxxproject/toolchain/diab'
+require 'cxxproject/toolchain/gcc'
+require 'cxxproject/toolchain/clang'
+require 'cxxproject/toolchain/ti'

data/lib/cxxproject/toolchain/ti.rb

@@ -0,0 +1,50 @@
+require 'cxxproject/utils/utils'
+require 'cxxproject/toolchain/provider'
+require 'cxxproject/errorparser/error_parser'
+require 'cxxproject/errorparser/ti_compiler_error_parser'
+require 'cxxproject/errorparser/ti_linker_error_parser'
+
+module Cxxproject
+  module Toolchain
+
+    TiChain = Provider.add("TI")
+
+    ti_home = ENV['TI_HOME'] 
+
+    TiChain[:COMPILER][:CPP].update({
+      :COMMAND => "#{ti_home}/ccsv5/tools/compiler/tms470/bin/cl470",
+      :FLAGS => "-mv7A8 -g --include_path=\"#{ti_home}/ccsv5/tools/compiler/tms470/include\" --diag_warning=225 -me --abi=eabi --code_state=32 --preproc_with_compile",
+      :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_home}/ccsv5/tools/compiler/tms470/bin/ar470"
+    TiChain[:ARCHIVER][:ARCHIVE_FLAGS] = "r"
+
+    TiChain[:LINKER][:COMMAND] = "#{ti_home}/ccsv5/tools/compiler/tms470/bin/cl470"
+    TiChain[:LINKER][:FLAGS] = "-mv7A8 -g --diag_warning=225 -me --abi=eabi --code_state=32 -z --warn_sections -i\"#{ti_home}/ccsv5/tools/compiler/tms470/lib\" -i\"#{ti_home}/ccsv5/tools/compiler/tms470/include\""
+    TiChain[:LINKER][:MAP_FILE_FLAG] = '-m'
+    TiChain[:LINKER][:EXE_FLAG] = "-o"
+    TiChain[:LINKER][:LIB_PREFIX_FLAGS] = '-lDebug/configPkg/linker.cmd'
+    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/cxxproject/toolchain/toolchain.rb

@@ -0,0 +1,38 @@
+require 'yaml'
+
+class Hash
+  def method_missing(m, *args, &block)
+    if m.to_s =~ /(.*)=$/ # was assignment
+      self[$1] = args[0]
+    else
+      fetch(m.to_s, nil)
+    end
+  end
+  def recursive_merge(h)
+    self.merge!(h) {|key, _old, _new| if _old.class == Hash then _old.recursive_merge(_new) else _new end  } 
+  end
+
+end
+
+class Toolchain
+  attr_reader :toolchain
+  def initialize(toolchain_file)
+    @toolchain = YAML::load(File.open(toolchain_file))
+    if @toolchain.base
+      @based_on = @toolchain.base
+    else
+      @based_on = "base"
+    end
+    basechain = YAML::load(File.open(File.join(File.dirname(__FILE__),"#{@based_on}.json")))
+    @toolchain = basechain.recursive_merge(@toolchain)
+  end
+  def method_missing(m, *args, &block)  
+    if @toolchain[m.to_s]
+      self.class.send(:define_method, m) { @toolchain[m.to_s] }
+      @toolchain[m.to_s]
+    else
+      return super
+    end
+  end  
+
+end

data/lib/cxxproject/toolchain/toolchain_benchmark.rb

@@ -0,0 +1,23 @@
+$:.unshift File.dirname(__FILE__)
+require 'toolchain'
+require 'benchmark'
+
+Benchmark.bm do |x|
+
+  n = 1000
+  x.report("load Toolchain #{n}-times") do
+    n.times do
+      tc = Toolchain.new('gcc.json')
+    end
+  end
+
+  tc = Toolchain.new('gcc.json')
+  n = 1000000
+  x.report("access fields as methods #{n}-times") do
+    n.times do
+      x = tc.compiler.c.source_file_endings
+    end
+  end
+	
+end
+