cxxproject 0.6.1 → 0.6.2

data/lib/cxxproject/context.rb

@@ -0,0 +1,23 @@
+
+module Cxxproject
+  module Context
+    
+    def check_hash(hash,allowed)
+      hash.keys.map do |k|
+        error_string = ["error while evaluating \"#{@current_working_dir}/#{@current_project_file}\"",
+                        "\"#{k}\" is not a valid specifier!",
+                        "allowd specifiers: #{allowed}"].join($/)
+        raise error_string unless allowed.include?(k)
+      end
+    end
+
+    def get_as_array(hash, s)
+      res = hash[s]
+      if res.is_a?(Array)
+        return res
+      end
+      return [res]
+    end
+
+  end
+end

data/lib/cxxproject/eval_context.rb

@@ -1,3 +1,4 @@
+require 'cxxproject/context'
 
 module Cxxproject
   class BinaryLibs
@@ -13,13 +14,14 @@ module Cxxproject
   end
 
   class EvalContext
+    include Context
 
-    attr_accessor :myblock, :all_blocks
+    attr_accessor :all_blocks
 
     # must be called to add building blocks
     def cxx_configuration(&block)
-      @myblock = block
       @all_blocks = []
+      block.call
     end
 
     def eval_project(project_text, project_file, pwd)
@@ -28,28 +30,6 @@ module Cxxproject
       instance_eval(project_text)
     end
 
-    def configuration(*args, &block)
-      name = args[0]
-      raise "no name given" unless name.is_a?(String) && !name.strip.empty?
-      instance_eval(&block)
-    end
-
-    def check_hash(hash,allowed)
-      hash.keys.map do |k|
-        error_string = ["error while evaluating \"#{@current_working_dir}/#{@current_project_file}\"",
-                        "\"#{k}\" is not a valid specifier!"].join($/)
-        raise error_string unless allowed.include?(k)
-      end
-    end
-
-    def get_as_array(hash, s)
-      res = hash[s]
-      if res.is_a?(Array)
-        return res
-      end
-      return [res]
-    end
-
     # specify an executable
     # hash supports:
     # * :sources
@@ -59,7 +39,7 @@ module Cxxproject
     # * :output_dir
     def exe(name, hash)
       raise "not a hash" unless hash.is_a?(Hash)
-      check_hash hash,[:sources,:includes,:dependencies,:libpath,:output_dir]
+      check_hash(hash,[:sources,:includes,:dependencies,:libpath,:output_dir])
       bblock = Executable.new(name)
       bblock.set_sources(hash[:sources]) if hash.has_key?(:sources)
       bblock.set_includes(get_as_array(hash, :includes)) if hash.has_key?(:includes)
@@ -94,7 +74,7 @@ module Cxxproject
     # * :output_dir
     def source_lib(name, hash)
       raise "not a hash" unless hash.is_a?(Hash)
-      check_hash hash,[:sources, :includes, :dependencies, :toolchain, :file_dependencies, :output_dir]
+      check_hash(hash,[:sources, :includes, :dependencies, :toolchain, :file_dependencies, :output_dir])
       raise ":sources need to be defined" unless hash.has_key?(:sources)
       bblock = SourceLibrary.new(name)
       bblock.set_sources(hash[:sources])
@@ -122,7 +102,7 @@ module Cxxproject
 
     def compile(name, hash)
       raise "not a hash" unless hash.is_a?(Hash)
-      check_hash hash,[:sources,:includes]
+      check_hash(hash,[:sources,:includes])
       bblock = SingleSource.new(name)
       bblock.set_sources(hash[:sources]) if hash.has_key?(:sources)
       bblock.set_includes(hash[:includes]) if hash.has_key?(:includes)
@@ -131,7 +111,7 @@ module Cxxproject
 
     def custom(name, hash)
       raise "not a hash" unless hash.is_a?(Hash)
-      check_hash hash,[:execute, :dependencies]
+      check_hash(hash,[:execute, :dependencies])
       bblock = CustomBuildingBlock.new(name)
       bblock.set_actions(hash[:execute]) if hash.has_key?(:execute)
       if hash.has_key?(:dependencies)

data/lib/cxxproject/plugin_context.rb

@@ -0,0 +1,132 @@
+require 'cxxproject/context'
+require 'cxxproject/toolchain/provider'
+
+module Cxxproject
+  # context in which plugins are evaluated
+  # a cxx_plugin is a gem that:
+  # - follows the naming convention cxxplugin_name
+  # - that has a plugin.rb file in lib and
+  # - that calls cxx_plugin
+  #
+  # the context contains
+  # - @cxxproject2rake
+  # - @building_blocks
+  # - @log
+  class PluginContext
+    include Context
+
+    def initialize(cxxproject2rake, building_blocks, log)
+      @cxxproject2rake = cxxproject2rake
+      @building_blocks = building_blocks
+      @log = log
+    end
+
+    # method for plugins to get the
+    # cxxproject2rake
+    # building_blocks
+    # log
+    def cxx_plugin(&blk)
+      blk.call(@cxxproject2rake, @building_blocks, @log)
+    end
+
+    # specify a toolchain
+    # hash supports:
+    # * :command
+    def toolchain(name, tc)
+      raise "not a tc" unless tc.is_a?(Hash)
+      check_hash(tc,Provider.default.keys)
+      check_compiler(tc[:COMPILER]) if tc[:COMPILER]
+      check_linker(tc[:LINKER]) if tc[:LINKER]
+      check_archiver(tc[:ARCHIVER]) if tc[:ARCHIVER]
+      PluginContext::expand(tc)
+      Provider.add(name)
+      Provider.merge(Provider[name], tc)
+    end
+
+    def self.expand(toolchain)
+      to_expand = nil
+      from = nil
+      while (needs_expansion(toolchain)) do
+        to_expand = find_toolchain_subhash(toolchain)
+        from = find_toolchain_element(toolchain,to_expand[:BASED_ON])
+        to_expand.delete(:BASED_ON)
+        Cxxproject::Toolchain::Provider.merge(to_expand,from,false)
+      end
+      return toolchain
+    end
+
+    def self.needs_expansion(tc)
+      res = false
+      tc.each do |k,v|
+        if k == :BASED_ON
+          res = true
+        elsif v.is_a?(Hash) 
+          res = needs_expansion(v)
+        end
+        if res
+          break
+        end
+      end
+      return res
+    end
+
+    def self.find_toolchain_subhash(tc)
+      res = []
+      loop = lambda do |res,tc|
+        tc.each do |k,v|
+          if(k == :BASED_ON)
+            res << tc
+          elsif v.is_a?(Hash) 
+            loop.call(res,v)
+          end
+        end
+      end
+      loop.call(res,tc)
+      return res[0] if res.length > 0
+    end
+   
+
+    def self.find_toolchain_element(tc,name)
+      res = []
+      loop = lambda do |res,tc,name|
+        tc.each do |k,v|
+          if k == name
+            res << v
+          elsif v.is_a?(Hash)
+            loop.call(res,v,name)
+          end
+        end
+      end
+      loop.call(res,tc,name)
+      return res[0] if res.length > 0
+    end
+
+
+    def check_compiler(hash)
+      raise "not a hash" unless hash.is_a?(Hash)
+      check_hash(hash,Provider.default[:COMPILER].keys)
+      
+      check_hash(hash[:CPP],Provider.default[:COMPILER][:CPP].keys << :BASED_ON) if hash[:CPP]
+      check_hash(hash[:C],Provider.default[:COMPILER][:C].keys << :BASED_ON) if hash[:C]
+      check_hash(hash[:ASM],Provider.default[:COMPILER][:ASM].keys << :BASED_ON) if hash[:ASM]
+    end
+
+    def check_linker(hash)
+      raise "not a hash" unless hash.is_a?(Hash)
+      check_hash(hash,Provider.default[:LINKER].keys)
+    end
+
+    def check_archiver(hash)
+      raise "not a hash" unless hash.is_a?(Hash)
+      check_hash(hash,Provider.default[:ARCHIVER].keys)
+    end
+
+    # will use the content of the plugin.rb file and evaluate it
+    # this will in turn result in a call to cxx_plugin
+    def eval_plugin(plugin_text)
+      instance_eval(plugin_text)
+    end
+
+  end
+
+end

data/lib/cxxproject/toolchain/provider.rb

@@ -18,7 +18,7 @@ module Cxxproject
             :FLAGS => "",
             :SOURCE_FILE_ENDINGS => [".cxx", ".cpp", ".c++", ".cc", ".C"],
             :DEP_FLAGS => "",
-            :DEP_FLAGS => true,
+            :DEP_FLAGS_SPACE => false,
             :ERROR_PARSER => nil,
             :PREPRO_FLAGS => ""
           },
@@ -32,6 +32,7 @@ module Cxxproject
             :FLAGS => "",
             :SOURCE_FILE_ENDINGS => [".c"],
             :DEP_FLAGS => "",
+            :DEP_FLAGS_SPACE => false,
             :ERROR_PARSER => nil,
             :PREPRO_FLAGS => ""
           },
@@ -93,12 +94,35 @@ module Cxxproject
         chain
       end
 
+      # merge hashB into hashA
+      # recurse on sub-hash-structures
+      # elements present in hashA only will be taken from hashA
+      # elements present in hashB only will be taken from hashB
+      # elements present in both will be taken from hashB
+      #
+      def self.merge(hashA,hashB,overwrite=true)
+        missingKeys = hashB.keys - hashA.keys
+        missingKeys.each do |k|
+          hashA[k] = hashB[k]
+        end
+        hashA.each do |k,v|
+          if v.is_a? Hash
+            merge(v,hashB[k],overwrite) if hashB[k]
+          else
+            hashA[k] = hashB[k] if hashB[k] and overwrite
+          end
+        end
+        hashA
+      end
+
       def self.default
         @@default
       end
 
       def self.modify_cpp_compiler(based_on, h)
-        chain = Marshal.load(Marshal.dump(@@settings[based_on]))
+        # chain = Marshal.load(Marshal.dump(@@settings[based_on]))
+        chain = @@settings[based_on]
+        raise "unknown toolchain: #{based_on}" unless chain
         chain[:COMPILER][:CPP].update(h)
         chain
       end
@@ -125,7 +149,3 @@ module Cxxproject
   end
 end
 
-require 'cxxproject/toolchain/diab'
-require 'cxxproject/toolchain/gcc'
-require 'cxxproject/toolchain/clang'
-require 'cxxproject/toolchain/ti'

data/lib/cxxproject/torake.rb

@@ -12,76 +12,35 @@ require 'cxxproject/buildingblocks/custom_building_block'
 require 'cxxproject/buildingblocks/command_line'
 require 'cxxproject/toolchain/colorizing_formatter'
 require 'cxxproject/eval_context'
+require 'cxxproject/plugin_context'
 
 require 'rubygems'
 
 module Cxxproject
 
-  # context in which plugins are evaluated
-  # a cxx_plugin is a gem that:
-  # - follows the naming convention cxxplugin_name
-  # - that has a plugin.rb file in lib and
-  # - that calls cxx_plugin
-  #
-  # the context contains
-  # - @cxxproject2rake
-  # - @building_blocks
-  # - @log
-  class PluginContext
-    def initialize(cxxproject2rake, building_blocks, log)
-      @cxxproject2rake = cxxproject2rake
-      @building_blocks = building_blocks
-      @log = log
-    end
-    def load_plugin(gem)
-      path = File.join(gem.full_gem_path, 'lib', 'plugin.rb')
-      content = File.read(path)
-      instance_eval(content)
-    end
-
-    # method for plugins to get the
-    # cxxproject2rake
-    # building_blocks
-    # log
-    def cxx_plugin(&blk)
-      blk.call(@cxxproject2rake, @building_blocks, @log)
-    end
-  end
-
   class CxxProject2Rake
     attr_accessor :base, :all_tasks
-    def load_cxx_plugins
-      prefix = 'cxxproject_'
-      gems_to_load = Gem::Specification.find_all do |gem|
-        gem.name.index(prefix)
-      end
-      gems_to_load.each do |gem|
-        context = PluginContext.new(self, ALL_BUILDING_BLOCKS, @log)
-        context.load_plugin(gem)
-      end
-    end
 
-    def initialize(projects, build_dir, toolchain, base='.')
+    def initialize(projects, build_dir, toolchain_name, base='.')
+      load_cxx_plugins
+      toolchain = Provider[toolchain_name]
+      raise "no provider with name \"#{toolchain_name}\" found" unless toolchain
       @base = base
       cd(@base, :verbose => false) do
         @projects = projects.to_a
       end
-      @build_dir = build_dir
-      @toolchain = toolchain
-      @rel_projects = @projects#.map { |p| File.join(@base, p) }
 
       # TODO: this should be cleaned up somehow...
-      if Utils::OS.linux?
-        toolchain[:LINKER][:LIB_PREFIX_FLAGS] = "-Wl,--whole-archive"
-        toolchain[:LINKER][:LIB_POSTFIX_FLAGS] = "-Wl,--no-whole-archive"
-      end
+      # if Utils::OS.linux?
+      #   toolchain[:LINKER][:LIB_PREFIX_FLAGS] = "-Wl,--whole-archive"
+      #   toolchain[:LINKER][:LIB_POSTFIX_FLAGS] = "-Wl,--no-whole-archive"
+      # end
 
       Rake::application.deriveIncludes = true
 
-      initialize_logging
-      @all_tasks = instantiate_tasks
+      initialize_logging(build_dir)
+      @all_tasks = instantiate_tasks(toolchain, build_dir)
 
-      load_cxx_plugins
 
       create_generic_tasks
       create_console_colorization
@@ -91,11 +50,33 @@ module Cxxproject
       create_console_task
     end
 
+    def load_cxx_plugins
+      prefix = 'cxxproject_'
+      gems_to_load = Gem::Specification.find_all do |gem|
+        gem.name.index(prefix)
+      end
+      context = PluginContext.new(self, ALL_BUILDING_BLOCKS, @log)
+      gems_to_load.each do |gem|
+        load_plugin(gem, context)
+      end
+    end
+
+    def load_plugin(gem, pluginContext)
+      begin 
+        path = File.join(gem.full_gem_path, 'lib', 'plugin.rb')
+        content = File.read(path)
+        pluginContext.eval_plugin(content)
+      rescue Exception => e
+        puts "problems with gem #{gem} in dir: #{path}: #{e}"
+        raise e
+      end
+    end
+
     def create_console_task
       require 'cxxproject/utils/console'
     end
 
-    def initialize_logging
+    def initialize_logging(build_dir)
       @log = Logger.new(STDOUT)
       @log.formatter = proc { |severity, datetime, progname, msg|
         "#{severity}: #{msg}\n"
@@ -106,7 +87,7 @@ module Cxxproject
       @log.level = Logger::ERROR
       @log.level = Logger::INFO if RakeFileUtils.verbose == true
       @log.level = Logger::DEBUG if Rake::application.options.trace
-      @log.debug "initializing for build_dir: \"#{@build_dir}\", base: \"#{@base}\""
+      @log.debug "initializing for build_dir: \"#{build_dir}\", base: \"#{@base}\""
     end
     def describe_clean_task
       Rake::Task[:clean].add_description('clean')
@@ -176,7 +157,7 @@ module Cxxproject
       end
     end
 
-    def instantiate_tasks
+    def instantiate_tasks(toolchain, build_dir)
       check_for_project_configs
 
       if @log.debug?
@@ -185,7 +166,7 @@ module Cxxproject
       end
       register_projects()
       ALL_BUILDING_BLOCKS.values.each do |block|
-        prepare_block(block)
+        prepare_block(block, toolchain, build_dir)
       end
       ALL_BUILDING_BLOCKS.values.inject([]) do |memo,block|
         @log.debug "creating tasks for block: #{block.name}/taskname: #{block.get_task_name} (#{block})"
@@ -201,9 +182,9 @@ module Cxxproject
       end
     end
 
-    def prepare_block(block)
-      block.set_tcs(@toolchain) unless block.has_tcs?
-      block.set_output_dir(Dir.pwd + "/" + @build_dir)
+    def prepare_block(block, toolchain, build_dir)
+      block.set_tcs(toolchain) unless block.has_tcs?
+      block.set_output_dir(Dir.pwd + "/" + build_dir)
       block.complete_init()
     end
 
@@ -228,13 +209,6 @@ module Cxxproject
         puts "problems with #{File.join(b, project_file)} in dir: #{Dir.pwd}"
         raise e
       end
-      begin
-        loadContext.myblock.call()
-      rescue Exception => e
-        error_string = "error while evaluating \"#{Dir.pwd}/#{project_file}\""
-        puts error_string
-        raise e
-      end
 
       loadContext.all_blocks.each do |block|
         block.
@@ -248,7 +222,6 @@ module Cxxproject
     def define_project_info_task
       desc "shows your defined projects"
       task :project_info do
-        p "ProjectBase: #{@base}"
         ALL_BUILDING_BLOCKS.each_value do |bb|
           pp bb
         end

data/lib/cxxproject/version.rb

@@ -1,7 +1,7 @@
 module Cxxproject
   class Version
     def self.cxxproject
-      "0.6.1"
+      "0.6.2"
     end
   end
 end

data/lib/cxxproject.rb

@@ -17,7 +17,12 @@ require 'cxxproject/utils/rbcurse'
 require 'cxxproject/utils/progress'
 require 'cxxproject/utils/rbcurse'
 require 'cxxproject/utils/stats'
+require 'cxxproject/version'
 
 include Cxxproject::Toolchain
 CxxProject2Rake = Cxxproject::CxxProject2Rake
 BinaryLibs = Cxxproject::BinaryLibs
+
+def version_info
+  Cxxproject::Version.cxxproject
+end

data/spec/building_block_spec.rb

@@ -38,9 +38,10 @@ describe Cxxproject::BuildingBlock do
     lib2 = Cxxproject::SourceLibrary.new('lib2').set_sources(['test.cc']).set_output_dir('build2')
     lib2.set_project_dir(File.join(Dir.pwd, 'lib2'))
 
-    cxx = CxxProject2Rake.new([], 'build', GCCChain)
-    cxx.prepare_block(lib1)
-    cxx.prepare_block(lib2)
+    cxx = CxxProject2Rake.new([], 'build', "clang")
+    
+    cxx.prepare_block(lib1, Provider["clang"], "build")
+    cxx.prepare_block(lib2, Provider["clang"], "build")
 
     lib1.complete_output_dir.should eq(File.join(Dir.pwd, 'build'))
     lib2.complete_output_dir.should eq(File.join(Dir.pwd, 'lib2', 'build2'))
@@ -49,7 +50,7 @@ describe Cxxproject::BuildingBlock do
   it 'should raise exception if building block cannot be resolved' do
     expect do
       lib1 = Cxxproject::SourceLibrary.new('1').set_dependencies(['unresolved'])
-      cxx = CxxProject2Rake.new([], 'build', GCCChain)
+      cxx = CxxProject2Rake.new([], 'build', "clang")
     end.to raise_exception(RuntimeError, 'Error: while reading config file for 1: dependent building block "unresolved" was specified but not found!')
   end
 

data/spec/cxxproject_2_rake_spec.rb

@@ -66,7 +66,7 @@ end
 def fresh_cxx
   Cxxproject::Utils.cleanup_rake
   outputdir = 'output'
-  CxxProject2Rake.new(Dir.glob('**/project.rb'), outputdir, GCCChain)
+  CxxProject2Rake.new(Dir.glob('**/project.rb'), outputdir, "clang")
 end
 
 def cleanup

data/spec/object_dependency_spec.rb

@@ -17,7 +17,7 @@ describe Rake::Task do
     file 'test.cc' => 'compiler'
     File.delete('test.cc') if File.exists?('test.cc')
     sl = Cxxproject::SourceLibrary.new('testlib').set_sources(['test.cc']).set_project_dir(".")
-    cxx = CxxProject2Rake.new([], 'build', GCCChain)
+    cxx = CxxProject2Rake.new([], 'build', "clang")
 
     task = Rake::application['lib:testlib']
     task.invoke
@@ -35,7 +35,7 @@ describe Rake::Task do
     end
 
     sl = Cxxproject::SourceLibrary.new('testlib').set_sources(['test.cc']).set_project_dir(".")
-    CxxProject2Rake.new([], 'build', GCCChain)
+    CxxProject2Rake.new([], 'build', "clang")
 
     task = Rake::application['lib:testlib']
     task.invoke
@@ -48,7 +48,7 @@ describe Rake::Task do
     end
 
     sl = Cxxproject::SourceLibrary.new('testlib').set_sources(['test.cc']).set_project_dir(".")
-    CxxProject2Rake.new([], 'build', GCCChain)
+    CxxProject2Rake.new([], 'build', "clang")
 
     task = Rake::application['build/libs/libtestlib.a']
     task.invoke
@@ -69,7 +69,7 @@ describe Rake::Task do
     end
 
     sl = Cxxproject::SourceLibrary.new('testlib').set_sources(['test.cc']).set_project_dir(".")
-    CxxProject2Rake.new([], 'build', GCCChain)
+    CxxProject2Rake.new([], 'build', "clang")
 
     task = Rake::application['build/libs/libtestlib.a']
     task.invoke

data/spec/plugin_context_spec.rb

@@ -0,0 +1,57 @@
+require 'cxxproject/plugin_context'
+
+
+describe Cxxproject::PluginContext do
+  it "should copy cpp settings to c settings" do
+    toolchain = {:COMPILER => {
+                  :CPP => { :DEFINE_FLAG => "-D", :COMMAND => "clang++" },
+                  :C => { :BASED_ON => :CPP, :COMMAND => "clang" }
+                }}
+    expected = {:COMPILER => {
+                  :CPP => { :DEFINE_FLAG => "-D", :COMMAND => "clang++" },
+                  :C => { :DEFINE_FLAG => "-D", :COMMAND => "clang" }
+                }}
+    Cxxproject::PluginContext.expand(toolchain).should == expected
+  end
+
+  it "should fully resolve all :BASED_ON sections" do
+    toolchain = {:COMPILER => {
+                  :CPP => { :DEFINE_FLAG => "-D", :COMMAND => "clang++" },
+                  :C => { :BASED_ON => :CPP, :COMMAND => "clang" },
+                  :ASM => { :BASED_ON => :C }
+                }}
+    expected = {:COMPILER => {
+                  :CPP => { :DEFINE_FLAG => "-D", :COMMAND => "clang++" },
+                  :C => { :DEFINE_FLAG => "-D", :COMMAND => "clang" },
+                  :ASM => { :DEFINE_FLAG => "-D", :COMMAND => "clang" }
+                }}
+    Cxxproject::PluginContext.expand(toolchain).should == expected
+  end
+
+  it "should find out if extension is needed" do
+    toolchain = {:COMPILER => {
+                  :CPP => { :DEFINE_FLAG => "-D", :COMMAND => "clang++" },
+                  :C => { :BASED_ON => :CPP, :COMMAND => "clang" } }}
+    toolchain2 = {:COMPILER => {
+                  :CPP => { :DEFINE_FLAG => "-D", :COMMAND => "clang++" },
+                  :C => { :COMMAND => "clang" } }}
+    Cxxproject::PluginContext.needs_expansion(toolchain).should == true
+    Cxxproject::PluginContext.needs_expansion(toolchain2).should == false
+  end
+
+  it "should find a toolchain to expand" do
+    toolchain = {:COMPILER => {
+                  :CPP => { :DEFINE_FLAG => "-D", :COMMAND => "clang++" },
+                  :C => { :BASED_ON => :CPP, :COMMAND => "clang" }
+                }}
+    Cxxproject::PluginContext.find_toolchain_subhash(toolchain).should == toolchain[:COMPILER][:C]
+  end
+
+  it "should find a toolchain element by name" do
+    toolchain = {:COMPILER => {
+                  :CPP => { :DEFINE_FLAG => "-D", :COMMAND => "clang++" },
+                  :C => { :BASED_ON => :CPP, :COMMAND => "clang" }
+                }}
+    Cxxproject::PluginContext.find_toolchain_element(toolchain, :CPP).should == toolchain[:COMPILER][:CPP]
+  end
+end

data/spec/project_path_spec.rb

@@ -18,7 +18,7 @@ describe CxxProject2Rake do
     cd base do # have to be relative to base
       project_configs = Dir.glob('**/project.rb')
     end
-    CxxProject2Rake.new(project_configs, outputdir, GCCChain, base)
+    CxxProject2Rake.new(project_configs, outputdir, "clang", base)
   end
 
 

data/spec/provider_spec.rb

@@ -0,0 +1,39 @@
+require 'rspec'
+require 'cxxproject/toolchain/provider'
+
+describe Cxxproject::Toolchain::Provider do
+
+  it 'should merge without overwrite' do
+    cpp = { :DEFINE_FLAG => "-D", :COMMAND => "clang++" }
+    c = { :COMMAND => "clang" }
+    expected = { :DEFINE_FLAG => "-D", :COMMAND => "clang" }
+    Cxxproject::Toolchain::Provider.merge(c, cpp, false).should == expected
+  end
+
+  it 'should merge two simple hashes' do
+    hashA = { :a => 1, :b => 2 }
+    hashB = { :a => 3, :c => 2 }
+    merged = Cxxproject::Toolchain::Provider.merge(hashA, hashB)
+    merged.should == { :a => 3, :b => 2, :c => 2 }
+  end
+
+  it 'should merge nested hashes' do
+    hashA = { :n => { :a => 1, :b => 2 }}
+    hashB = { :n => { :a => 3, :c => 2 }}
+    merged = Cxxproject::Toolchain::Provider.merge(hashA, hashB)
+    merged.should == { :n => { :a => 3, :b => 2, :c => 2 }}
+  end
+
+  it 'should merge multiple level nested hashes' do
+    hashA = {:COMPILER => {
+                :CPP => {:COMMAND => "",:DEFINE_FLAG => "",:SOURCE_FILE_ENDINGS => [".cxx", ".cpp", ".c++", ".cc", ".C"]}}}
+    hashB = {:COMPILER =>
+              {:CPP => { :COMMAND => "clang++", :SOURCE_FILE_ENDINGS => [".cxx", ".cpp"]}}}
+    merged = Cxxproject::Toolchain::Provider.merge(hashA, hashB)
+    expected = {:COMPILER =>
+              {:CPP => { :COMMAND => "clang++", :DEFINE_FLAG => "", :SOURCE_FILE_ENDINGS => [".cxx", ".cpp"]}}}
+    merged.should == expected
+  end
+
+end
+

data/spec/testdata/multiple_levels/libs/lib2/project.rb

@@ -15,5 +15,5 @@ cxx_configuration do
     :sources => FileList['**/*.cpp'],
     :dependencies => deps,
     :includes => ['.'],
-    :toolchain => Provider.modify_cpp_compiler("GCC", unittest_flags)
+    :toolchain => Provider.modify_cpp_compiler("gcc", unittest_flags)
 end

data/spec/testdata/onlyOneHeader/Rakefile.rb

@@ -1,4 +1,4 @@
 $:.unshift File.join(File.dirname(__FILE__),"..","..","lib")
 require 'cxxproject'
 BuildDir='output'
-CxxProject2Rake.new(['project.rb'], BuildDir, GCCChain)
+CxxProject2Rake.new(['project.rb'], BuildDir, "clang")

metadata

@@ -2,7 +2,7 @@
 name: cxxproject
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors: 
 - oliver mueller
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-04 00:00:00 Z
+date: 2012-07-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: highline
@@ -54,85 +54,78 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- lib/cxxproject/errorparser/ti_linker_error_parser.rb
-- lib/cxxproject/errorparser/diab_linker_error_parser.rb
-- lib/cxxproject/errorparser/gcc_linker_error_parser.rb
-- lib/cxxproject/errorparser/diab_compiler_error_parser.rb
-- lib/cxxproject/errorparser/gcc_compiler_error_parser.rb
-- lib/cxxproject/errorparser/ti_compiler_error_parser.rb
+- lib/cxxproject.rb
+- lib/tools/project_wizard.rb
+- lib/cxxproject/context.rb
 - lib/cxxproject/errorparser/error_parser.rb
-- lib/cxxproject/utils/optional.rb
-- lib/cxxproject/utils/cleanup.rb
-- lib/cxxproject/utils/exit_helper.rb
-- lib/cxxproject/utils/rbcurse_progress.rb
-- lib/cxxproject/utils/process.rb
-- lib/cxxproject/utils/ubigraph.rb
-- lib/cxxproject/utils/printer.rb
-- lib/cxxproject/utils/stats.rb
-- lib/cxxproject/utils/rbcurse.rb
-- lib/cxxproject/utils/progress_helper.rb
-- lib/cxxproject/utils/rbcurse_executable_ext.rb
-- lib/cxxproject/utils/utils.rb
-- lib/cxxproject/utils/rbcurse_tasktable.rb
-- lib/cxxproject/utils/console.rb
-- lib/cxxproject/utils/progress.rb
-- lib/cxxproject/utils/graphstream.rb
-- lib/cxxproject/toolchain/toolchain_benchmark.rb
-- lib/cxxproject/toolchain/diab.rb
-- lib/cxxproject/toolchain/gcc.rb
-- lib/cxxproject/toolchain/provider.rb
-- lib/cxxproject/toolchain/clang.rb
-- lib/cxxproject/toolchain/ti.rb
-- lib/cxxproject/toolchain/colorizing_formatter.rb
-- lib/cxxproject/toolchain/toolchain.rb
 - lib/cxxproject/version.rb
+- lib/cxxproject/torake.rb
+- lib/cxxproject/plugin_context.rb
 - lib/cxxproject/ide_interface.rb
-- lib/cxxproject/ext/rake_listener.rb
+- lib/cxxproject/ext/file.rb
+- lib/cxxproject/ext/rake_dirty.rb
 - lib/cxxproject/ext/filelist.rb
 - lib/cxxproject/ext/string.rb
+- lib/cxxproject/ext/rake_listener.rb
+- lib/cxxproject/ext/stdout.rb
 - lib/cxxproject/ext/rake.rb
 - lib/cxxproject/ext/progressbar.rb
-- lib/cxxproject/ext/stdout.rb
-- lib/cxxproject/ext/rake_dirty.rb
-- lib/cxxproject/ext/file.rb
-- lib/cxxproject/torake.rb
-- lib/cxxproject/buildingblocks/building_block.rb
 - lib/cxxproject/buildingblocks/has_libraries_mixin.rb
-- lib/cxxproject/buildingblocks/custom_building_block.rb
-- lib/cxxproject/buildingblocks/makefile.rb
+- lib/cxxproject/buildingblocks/executable.rb
 - lib/cxxproject/buildingblocks/has_includes_mixin.rb
-- lib/cxxproject/buildingblocks/has_sources_mixin.rb
+- lib/cxxproject/buildingblocks/has_dependencies_mixin.rb
+- lib/cxxproject/buildingblocks/custom_building_block.rb
 - lib/cxxproject/buildingblocks/binary_library.rb
-- lib/cxxproject/buildingblocks/executable.rb
 - lib/cxxproject/buildingblocks/module.rb
-- lib/cxxproject/buildingblocks/single_source.rb
-- lib/cxxproject/buildingblocks/has_dependencies_mixin.rb
+- lib/cxxproject/buildingblocks/building_block.rb
 - lib/cxxproject/buildingblocks/source_library.rb
+- lib/cxxproject/buildingblocks/single_source.rb
+- lib/cxxproject/buildingblocks/makefile.rb
 - lib/cxxproject/buildingblocks/command_line.rb
+- lib/cxxproject/buildingblocks/has_sources_mixin.rb
+- lib/cxxproject/utils/rbcurse_progress.rb
+- lib/cxxproject/utils/ubigraph.rb
+- lib/cxxproject/utils/graphstream.rb
+- lib/cxxproject/utils/progress.rb
+- lib/cxxproject/utils/stats.rb
+- lib/cxxproject/utils/utils.rb
+- lib/cxxproject/utils/optional.rb
+- lib/cxxproject/utils/console.rb
+- lib/cxxproject/utils/progress_helper.rb
+- lib/cxxproject/utils/exit_helper.rb
+- lib/cxxproject/utils/cleanup.rb
+- lib/cxxproject/utils/rbcurse_tasktable.rb
+- lib/cxxproject/utils/rbcurse_executable_ext.rb
+- lib/cxxproject/utils/rbcurse.rb
+- lib/cxxproject/utils/printer.rb
+- lib/cxxproject/utils/process.rb
+- lib/cxxproject/toolchain/provider.rb
+- lib/cxxproject/toolchain/toolchain.rb
+- lib/cxxproject/toolchain/colorizing_formatter.rb
 - lib/cxxproject/eval_context.rb
-- lib/tools/project_wizard.rb
-- lib/cxxproject.rb
 - Rakefile.rb
-- spec/string_spec.rb
-- spec/project_path_spec.rb
-- spec/ide_interface_spec.rb
-- spec/spec_helper.rb
-- spec/object_dependency_spec.rb
-- spec/building_block_spec.rb
-- spec/file_ext_spec.rb
-- spec/testdata/basic/exe12/project.rb
-- spec/testdata/basic/lib1/project.rb
-- spec/testdata/basic/lib2/project.rb
 - spec/testdata/onlyOneHeader/Rakefile.rb
 - spec/testdata/onlyOneHeader/project.rb
+- spec/testdata/basic/lib1/project.rb
+- spec/testdata/basic/lib2/project.rb
+- spec/testdata/basic/exe12/project.rb
+- spec/testdata/multiple_levels/mainproject/basic/project.rb
 - spec/testdata/multiple_levels/libs/lib1/project.rb
 - spec/testdata/multiple_levels/libs/lib2/project.rb
-- spec/testdata/multiple_levels/mainproject/basic/project.rb
+- spec/string_spec.rb
 - spec/cxxproject_2_rake_spec.rb
-- spec/toolchain_spec.rb
+- spec/provider_spec.rb
+- spec/project_path_spec.rb
+- spec/building_block_spec.rb
+- spec/plugin_context_spec.rb
+- spec/file_ext_spec.rb
+- spec/spec_helper.rb
+- spec/ide_interface_spec.rb
+- spec/object_dependency_spec.rb
 - spec/rake_listener_ext_spec.rb
-- lib/tools/Rakefile.rb.template
+- spec/toolchain_spec.rb
 - lib/tools/project.rb.template
+- lib/tools/Rakefile.rb.template
 - bin/cxx
 homepage: https://github.com/marcmo/cxxproject
 licenses: []
@@ -147,7 +140,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -1979026599221260154
+      hash: 3389425425970571321
       segments: 
       - 0
       version: "0"

data/lib/cxxproject/errorparser/diab_compiler_error_parser.rb

@@ -1,40 +0,0 @@
-require 'cxxproject/errorparser/error_parser'
-
-module Cxxproject
-  class DiabCompilerErrorParser < ErrorParser
-
-    def initialize()
-      @error_expression_start = /\"(.+)\", line ([0-9]+): (?!included)(catastrophic |fatal )*([A-Za-z]+)[:]* (.+)/  
-      @error_expression_end = /^[ \t]*\^/ # well, it may end without "^"... in this case the error will last the next one starts or console text ends
-    end
-
-    def scan_lines(consoleOutput, proj_dir)
-      res = []
-      error_severity = 255
-      consoleOutputFullnames = ""
-      consoleOutput.each_line do |l|
-        d = ErrorDesc.new
-        lstripped = l.rstrip
-        scan_res = lstripped.scan(@error_expression_start)
-        if scan_res.length == 0
-          d.severity = error_severity
-          d.message = lstripped 
-          if lstripped.scan(@error_expression_end).length > 0
-            error_severity = 255 
-          end
-        else
-          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])
-          error_severity = d.severity
-          l.gsub!(scan_res[0][0],d.file_name)
-        end
-        res << d
-        consoleOutputFullnames << l
-      end
-      [res, consoleOutputFullnames]
-    end
-
-  end
-end

data/lib/cxxproject/errorparser/diab_linker_error_parser.rb

@@ -1,41 +0,0 @@
-require 'cxxproject/errorparser/error_parser'
-
-module Cxxproject
-  class DiabLinkerErrorParser < ErrorParser
-
-    def initialize()
-      @error_expression = /dld: ([A-Za-z]+): (.+)/
-      @error_expression_linkerscript = /dld: \"([^\"]+)\", line ([0-9]+): (.+)/
-    end
-
-    def scan_lines(consoleOutput, proj_dir)
-      res = []
-      error_severity = 255
-      consoleOutput.each_line do |l|
-        l.rstrip!
-        d = ErrorDesc.new
-        scan_res = l.scan(@error_expression)
-        scan_res2 = l.scan(@error_expression_linkerscript)
-        if scan_res.length == 0 and scan_res2.length == 0 # msg will end with the beginning of the next message
-          d.severity = error_severity
-          d.message = l
-        elsif scan_res.length > 0
-          d.file_name = proj_dir
-          d.line_number = 0
-          d.message = scan_res[0][1]
-          d.severity = get_severity(scan_res[0][0])
-          error_severity = d.severity
-        else
-          d.file_name = proj_dir+"/"+scan_res2[0][0]
-          d.line_number = scan_res2[0][1].to_i
-          d.message = scan_res2[0][2]
-          d.severity = SEVERITY_ERROR
-          error_severity = d.severity
-        end
-        res << d
-      end
-      [res, consoleOutput]
-    end
-
-  end
-end

data/lib/cxxproject/errorparser/gcc_compiler_error_parser.rb

@@ -1,35 +0,0 @@
-require 'cxxproject/errorparser/error_parser'
-
-module Cxxproject
-  class GCCCompilerErrorParser < ErrorParser
-
-    def initialize()
-      @error_expression = /([^:]+):([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]
-          if (scan_res[0][3].include?".")
-            d.severity = SEVERITY_ERROR
-            d.message = scan_res[0][3] + ": " + d.message
-          else
-            d.severity = get_severity(scan_res[0][3])
-          end
-          l.gsub!(scan_res[0][0],d.file_name)
-        end
-        res << d
-        consoleOutputFullnames << l
-      end
-      [res, consoleOutputFullnames]
-    end
-
-  end
-end

data/lib/cxxproject/errorparser/gcc_linker_error_parser.rb

@@ -1,35 +0,0 @@
-require 'cxxproject/errorparser/error_parser'
-
-module Cxxproject
-  class GCCLinkerErrorParser < 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
-        d.file_name = proj_dir
-        d.line_number = 0
-        d.message = l
-        if l.length == 0
-          d.severity = SEVERITY_OK
-        elsif l.include?" Warning:" 
-          d.severity = SEVERITY_WARNING
-        else
-          d.severity = SEVERITY_ERROR
-        end
-        res << d
-      end
-      [res, consoleOutput]
-    end
-
-
-  end
-end

data/lib/cxxproject/errorparser/ti_compiler_error_parser.rb

@@ -1,30 +0,0 @@
-require 'cxxproject/errorparser/error_parser'
-
-module Cxxproject
-  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/cxxproject/errorparser/ti_linker_error_parser.rb

@@ -1,30 +0,0 @@
-require 'cxxproject/errorparser/error_parser'
-
-module Cxxproject
-  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/cxxproject/toolchain/clang.rb

@@ -1,39 +0,0 @@
-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/diab.rb

@@ -1,52 +0,0 @@
-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
-
-    DiabChain = Provider.add("Diab")
-
-    DiabChain[:COMPILER][:C].update({
-      :COMMAND => "dcc",
-      :FLAGS => "",
-      :DEFINE_FLAG => "-D",
-      :OBJECT_FILE_FLAG => "-o ",
-      :INCLUDE_PATH_FLAG => "-I",
-      :COMPILE_FLAGS => "-c",
-      :DEP_FLAGS => "-Xmake-dependency=6 -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

data/lib/cxxproject/toolchain/gcc.rb

@@ -1,48 +0,0 @@
-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 ",
-      :INCLUDE_PATH_FLAG => "-I",
-      :COMPILE_FLAGS => "-c ",
-      :DEP_FLAGS => "-MMD -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/cxxproject/toolchain/ti.rb

@@ -1,50 +0,0 @@
-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_benchmark.rb

@@ -1,23 +0,0 @@
-$:.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
-