bake-toolkit 2.13.1 → 2.14.0

data/lib/bake/cache.rb

@@ -2,6 +2,7 @@ require 'common/exit_helper'
 require 'bake/toolchain/colorizing_formatter'
 require 'common/options/parser'
 require 'common/version'
+require 'adapt/config/loader'
 
 module Bake
 
@@ -15,6 +16,7 @@ module Bake
     attr_accessor :exclude_filter
     attr_accessor :no_autodir
     attr_accessor :build_config
+    attr_accessor :adapt_filenames
   end
   
   class CacheAccess
@@ -83,6 +85,23 @@ module Bake
                 end
               end
             end
+            
+            if (cache != nil)
+              if (not AdaptConfig.filenames.eql?(cache.adapt_filenames))
+                Bake.formatter.printInfo("Info: adapt config filenames have been changed, reloading meta information")
+                cache = nil
+              end
+            end
+            
+            if (cache != nil and not AdaptConfig.filenames.empty?)
+              AdaptConfig.filenames.each do |f|
+                adaptTime = File.mtime(f)
+                if adaptTime > cacheTime + 1
+                  Bake.formatter.printInfo("Info: #{f} has been changed, reloading meta information")
+                  cache = nil
+                end
+              end
+            end            
 
             if cache != nil
               if cache.workspace_roots.length == Bake.options.roots.length
@@ -115,8 +134,12 @@ module Bake
           else
             Bake.formatter.printInfo("Info: cache not found, reloading meta information")
           end
-        rescue Exception
+        rescue Exception => e
           Bake.formatter.printWarning("Warning: cache file corrupt, reloading meta information (cache might be written by an older bake version)")
+          if Bake.options.debug
+            puts e.message
+            puts e.backtrace
+          end
           cache = nil
         end      
         
@@ -140,6 +163,7 @@ module Bake
         cache.exclude_filter = Bake.options.exclude_filter
         cache.workspace_roots = Bake.options.roots
         cache.build_config = Bake.options.build_config
+        cache.adapt_filenames = AdaptConfig.filenames
         bbdump = Marshal.dump(cache)
         begin
           File.delete(@cacheFilename)

data/lib/bake/config/checks.rb

@@ -0,0 +1,61 @@
+module Bake
+  module Configs
+
+    class Checks
+    
+      def self.symlinkCheck(filename)
+        dirOfProjMeta = File.dirname(filename)
+        Dir.chdir(dirOfProjMeta) do
+          if Dir.pwd != dirOfProjMeta and File.dirname(Dir.pwd) != File.dirname(dirOfProjMeta)
+            isSym = false
+            begin
+              isSym = File.symlink?(dirOfProjMeta)
+            rescue
+            end
+            if isSym
+              Bake.formatter.printError("Symlinks only allowed with the same parent dir as the target: #{dirOfProjMeta} --> #{Dir.pwd}", filename)
+              ExitHelper.exit(1)
+            end
+          end
+        end
+      end
+      
+      def self.commonMetamodelCheck(configs, filename)
+        
+        if configs.length == 0
+          Bake.formatter.printError("No config found", filename)
+          ExitHelper.exit(1)
+        end
+        
+        configs.each do |config|
+          if config.respond_to?("toolchain") and config.toolchain
+            config.toolchain.compiler.each do |c|
+              if not c.internalDefines.nil? and c.internalDefines != ""
+                Bake.formatter.printError("InternalDefines only allowed in DefaultToolchain", c.internalDefines)
+                ExitHelper.exit(1)
+              end
+            end
+          end
+          
+          config.includeDir.each do |inc|
+            if not ["front", "back", ""].include?inc.inject
+              Bake.formatter.printError("inject of IncludeDir must be 'front' or 'back'", inc) 
+              ExitHelper.exit(1)
+            end
+            if not ["front", "back", ""].include?inc.infix
+              Bake.formatter.printError("infix of IncludeDir must be 'front' or 'back'", inc) 
+              ExitHelper.exit(1)
+            end
+            if (inc.infix != "" and inc.inject != "")
+              Bake.formatter.printError("IncludeDir must have inject OR infix (deprecated)", inc) 
+              ExitHelper.exit(1)
+            end
+          end if config.respond_to?("includeDir")
+        end
+        
+      end
+      
+    end
+    
+  end
+end

data/lib/bake/config/loader.rb

@@ -1,11 +1,12 @@
 require 'bake/model/loader'
+require 'bake/config/checks'
 
 module Bake
 
   class Config
     attr_reader :referencedConfigs
     
-    def getFullProject(configs, configname) # note: configs is never empty
+    def getFullProjectInternal(configs, configname, isMain) # note: configs is never empty
       
       if (configname == "")
         if configs[0].parent.default != ""
@@ -33,8 +34,24 @@ module Bake
       end
       
       if config.extends != ""
-        parent,parentConfigName = getFullProject(configs, config.extends)
-        MergeConfig.new(config, parent).merge()
+        parent,parentConfigName = getFullProjectInternal(configs, config.extends, isMain)
+        MergeConfig.new(config, parent).merge(:merge)
+      end
+      
+      [config, configname]
+    end
+    
+    def getFullProject(configs, configname, isMain)
+      config, configname = getFullProjectInternal(configs, configname, isMain)
+
+
+      # check if config has to be manipulated
+      @adaptConfigs.each do |c|
+       if c.project == config.parent.name or (isMain and c.project == "__MAIN__") or c.project == "__ALL__"
+          if c.name == config.name or (isMain and c.name == "__MAIN__") or c.name == "__ALL__"
+            MergeConfig.new(c, config).merge(c.type.to_sym)
+          end
+        end
       end
       
       [config, configname]
@@ -98,7 +115,7 @@ module Bake
     
     def loadProjMeta(filename)
       
-      symlinkCheck(filename)
+      Bake::Configs::Checks.symlinkCheck(filename)
       
       @project_files << filename
       f = @loader.load(filename)
@@ -109,43 +126,25 @@ module Bake
         Bake.formatter.printError("Config file must have exactly one 'Project' element as root element", filename)
         ExitHelper.exit(1)
       end
-      
-      reqVersion = f.root_elements[0].getRequiredBakeVersion
+      proj = f.root_elements[0]
 
+      reqVersion = proj.getRequiredBakeVersion
       checkVer(reqVersion)
      
-      configs = f.root_elements[0].getConfig
+      configs = proj.getConfig
+      Bake::Configs::Checks::commonMetamodelCheck(configs, filename)
       
-      if configs.length == 0
-        Bake.formatter.printError("No config found", filename)
-        ExitHelper.exit(1)
-      end
-      
-      configs.each do |config|
-        if config.respond_to?("toolchain") and config.toolchain
-          config.toolchain.compiler.each do |c|
-            if not c.internalDefines.nil? and c.internalDefines != ""
-              Bake.formatter.printError("InternalDefines only allowed in DefaultToolchain", c.internalDefines)
-              ExitHelper.exit(1)
-            end
-          end
+      configs.each do |c|
+        if not c.project.empty?
+          Bake.formatter.printError("Attribute 'project' must only be used in adapt config.",c) 
+          ExitHelper.exit(1)
+        end
+        if not c.type.empty?
+          Bake.formatter.printError("Attribute 'type' must only be used in adapt config.",c) 
+          ExitHelper.exit(1)
         end
-        
-        config.includeDir.each do |inc|
-          if not ["front", "back", ""].include?inc.inject
-            Bake.formatter.printError("inject of IncludeDir must be 'front' or 'back'", inc) 
-            ExitHelper.exit(1)
-          end
-          if not ["front", "back", ""].include?inc.infix
-            Bake.formatter.printError("infix of IncludeDir must be 'front' or 'back'", inc) 
-            ExitHelper.exit(1)
-          end
-          if (inc.infix != "" and inc.inject != "")
-            Bake.formatter.printError("IncludeDir must have inject OR infix (deprecated)", inc) 
-            ExitHelper.exit(1)
-          end
-        end if config.respond_to?("includeDir")
       end
+      
       configs
     end
     
@@ -204,7 +203,7 @@ module Bake
       end
             
       # get config
-      config, dep.config = getFullProject(@loadedConfigs[dep_name], dep.config)
+      config, dep.config = getFullProject(@loadedConfigs[dep_name], dep.config, false)
       dep.name = dep_name
       
       # config not referenced yet
@@ -237,7 +236,7 @@ module Bake
         ConfigNames.print(configs, nil, mainMeta)
       end
       
-      config, Bake.options.build_config = getFullProject(configs,Bake.options.build_config)
+      config, Bake.options.build_config = getFullProject(configs,Bake.options.build_config, true)
       @referencedConfigs = {}
       @referencedConfigs[Bake.options.main_project_name] = [config]
         
@@ -257,10 +256,10 @@ module Bake
           r = r + Bake.options.main_project_name # glob would not work otherwise on windows (ruby bug?)
         end
         r = r+"/**{,/*/**}/Project.meta"
-        @potentialProjs.concat(Dir.glob(r))
+        @potentialProjs.concat(Dir.glob(r).sort)
       end
       
-      @potentialProjs = @potentialProjs.uniq.sort
+      @potentialProjs = @potentialProjs.uniq
     end
     
     
@@ -297,7 +296,9 @@ module Bake
       end
     end
 
-    def load()
+    def load(adaptConfigs)
+      @adaptConfigs = adaptConfigs
+      
       @loader = Loader.new
       cache = CacheAccess.new()
       @referencedConfigs = cache.load_cache unless Bake.options.nocache

data/lib/bake/libElement.rb

@@ -59,30 +59,28 @@ module Bake
         end
       end
      
-      block.lib_elements.each_key.sort.each do |line_num|
-        block.lib_elements[line_num].each do |elem|
+      block.lib_elements.each do |elem|
        
-          case elem.type
-          when LibElement::LIB
-            @@linker_libs_array << "#{@@linker[:LIB_FLAG]}#{elem.value}"
-          when LibElement::USERLIB
-            @@linker_libs_array << "#{@@linker[:USER_LIB_FLAG]}#{elem.value}"
-          when LibElement::LIB_WITH_PATH
-            adaptedPath, prefix = adaptPath(elem.value, block, prefix)
-            @@linker_libs_array <<  adaptedPath
-          when LibElement::SEARCH_PATH
-            adaptedPath, prefix = adaptPath(elem.value, block, prefix)
-            if not @@lib_path_set.include?adaptedPath
-              @@lib_path_set << adaptedPath
-              @@linker_libs_array << "#{@@linker[:LIB_PATH_FLAG]}#{adaptedPath}" if @@linker[:LIST_MODE] == false
-            end
-          when LibElement::DEPENDENCY
-            if Blocks::ALL_BLOCKS.include?elem.value
-              bb = Blocks::ALL_BLOCKS[elem.value]
-              collect_recursive(bb)
-            else
-              # TODO: warning or error?
-            end
+        case elem.type
+        when LibElement::LIB
+          @@linker_libs_array << "#{@@linker[:LIB_FLAG]}#{elem.value}"
+        when LibElement::USERLIB
+          @@linker_libs_array << "#{@@linker[:USER_LIB_FLAG]}#{elem.value}"
+        when LibElement::LIB_WITH_PATH
+          adaptedPath, prefix = adaptPath(elem.value, block, prefix)
+          @@linker_libs_array <<  adaptedPath
+        when LibElement::SEARCH_PATH
+          adaptedPath, prefix = adaptPath(elem.value, block, prefix)
+          if not @@lib_path_set.include?adaptedPath
+            @@lib_path_set << adaptedPath
+            @@linker_libs_array << "#{@@linker[:LIB_PATH_FLAG]}#{adaptedPath}" if @@linker[:LIST_MODE] == false
+          end
+        when LibElement::DEPENDENCY
+          if Blocks::ALL_BLOCKS.include?elem.value
+            bb = Blocks::ALL_BLOCKS[elem.value]
+            collect_recursive(bb)
+          else
+            # TODO: warning or error?
           end
         end
       end
@@ -92,42 +90,43 @@ module Bake
     
     
     def self.calcLibElements(block)
-      lib_elements = {} # key = line number, value = array pairs [type, name/path string]
-        
-      block.config.userLibrary.each do |l|
-        ln = l.lib
-        ls = nil
-        if l.lib.include?("/")
-          pos = l.lib.rindex("/")
-          ls = block.convPath(l.lib[0..pos-1], l)
-          ln = l.lib[pos+1..-1]
-        end
-        lib_elements[l.line_number] = ls.nil? ? [] : [LibElement.new(LibElement::SEARCH_PATH, ls)] 
-        lib_elements[l.line_number] << LibElement.new(LibElement::USERLIB, ln)
-      end
+      lib_elements = [] # value = array pairs [type, name/path string]
       
-      block.config.exLib.each do |exLib|
-        ln = exLib.name
-        ls = nil
-        if exLib.name.include?("/")
-          pos = exLib.name.rindex("/")
-          ls = block.convPath(exLib.name[0..pos-1], exLib)
-          ln = exLib.name[pos+1..-1]
-        end
-        if exLib.search
-          lib_elements[exLib.line_number] = ls.nil? ? [] : [LibElement.new(LibElement::SEARCH_PATH, ls)] 
-          lib_elements[exLib.line_number] << LibElement.new(LibElement::LIB, ln)
-        else
-          ln = ls + "/" + ln unless ls.nil?
-          lib_elements[exLib.line_number] = [LibElement.new(LibElement::LIB_WITH_PATH, ln)]
+      block.config.libStuff.each do |l|
+        
+        if (Metamodel::UserLibrary === l)
+          ln = l.name
+          ls = nil
+          if l.name.include?("/")
+            pos = l.name.rindex("/")
+            ls = block.convPath(l.name[0..pos-1], l)
+            ln = l.name[pos+1..-1]
+          end
+          lib_elements << LibElement.new(LibElement::SEARCH_PATH, ls) if !ls.nil?
+          lib_elements << LibElement.new(LibElement::USERLIB, ln)
+        elsif (Metamodel::ExternalLibrarySearchPath === l)
+          lib_elements << LibElement.new(LibElement::SEARCH_PATH, block.convPath(l))
+        elsif (Metamodel::ExternalLibrary === l)
+          ln = l.name
+          ls = nil
+          if l.name.include?("/")
+            pos = l.name.rindex("/")
+            ls = block.convPath(l.name[0..pos-1], l)
+            ln = l.name[pos+1..-1]
+          end
+          if l.search
+            lib_elements << LibElement.new(LibElement::SEARCH_PATH, ls) if !ls.nil?
+            lib_elements << LibElement.new(LibElement::LIB, ln)
+          else
+            ln = ls + "/" + ln unless ls.nil?
+            lib_elements << LibElement.new(LibElement::LIB_WITH_PATH, ln)
+          end        
+        elsif (Metamodel::Dependency === l)
+          lib_elements << LibElement.new(LibElement::DEPENDENCY, l.name+","+l.config)
         end
-      end
-      
-      block.config.exLibSearchPath.each do |exLibSP|
-        lib_elements[exLibSP.line_number] = [LibElement.new(LibElement::SEARCH_PATH, block.convPath(exLibSP))] 
+        
       end
     
-      block.config.dependency.each { |dep| lib_elements[dep.line_number] = [LibElement.new(LibElement::DEPENDENCY, dep.name+","+dep.config)]}
       return lib_elements
     end      
      

data/lib/bake/mergeConfig.rb

@@ -1,3 +1,5 @@
+require 'rtext/serializer'
+
 module Bake
 
   class MergeConfig
@@ -7,181 +9,195 @@ module Bake
       @parent = parent
     end
     
-    def mergeToolchain(pt,ct, isDefault)
-      pt.compiler.each do |pc|
-        found = false
-        ct.compiler.each do |cc|
-          if cc.ctype == pc.ctype
-            found = true
-            cc.setFlags(clone(pc.flags) + cc.flags)
-            cc.setDefine(clone(pc.define) + cc.define)
-            if cc.internalDefines.nil? and not pc.internalDefines.nil?
-              cc.setInternalDefines(clone(pc.internalDefines))
-            end 
-            if cc.command == "" and pc.command != ""
-              cc.setCommand(clone(pc.command))
-            end
-          end
-        end
-        ct.addCompiler(pc) if not found
+    def clone(obj)
+      if obj.is_a?(Metamodel::ModelElement)
+        cloneModelElement(obj)
+      elsif Array === obj
+        obj.map { |o| clone(o) }
+      else
+        obj # no clone, should not happen
       end
-
-      if not pt.archiver.nil?
-        if (ct.archiver.nil?)
-          ct.setArchiver(clone(pt.archiver))
-        else
-          if ct.archiver.command == "" and pt.archiver.command != ""
-            ct.archiver.setCommand(clone(pt.archiver.command))
-          end
-          ct.archiver.setFlags(clone(pt.archiver.flags) + ct.archiver.flags)
-        end
-      end 
- 
-      if not pt.linker.nil?
-        if (ct.linker.nil?)
-          ct.setLinker(clone(pt.linker))
-        else
-          if ct.linker.command == "" and pt.linker.command != ""
-            ct.linker.setCommand(clone(pt.linker.command))
+    end
+    
+    def cloneModelElement(obj)
+      cpy = obj.class.new
+      cpy.file_name = obj.file_name
+      obj.class.ecore.eAllStructuralFeatures.each do |f|
+        value = obj.getGeneric(f.name)
+        if f.is_a?(RGen::ECore::EReference) && f.containment
+          if value.is_a?(Array)
+            cpy.setGeneric(f.name, value.collect{|v| clone(v)})
+          elsif !value.nil?
+            cpy.setGeneric(f.name, clone(value))
           end
-          ct.linker.setFlags(clone(pt.linker.flags) + ct.linker.flags)
-          ct.linker.setLibprefixflags(clone(pt.linker.libprefixflags) + ct.linker.libprefixflags)
-          ct.linker.setLibpostfixflags(clone(pt.linker.libpostfixflags) + ct.linker.libpostfixflags)
+        elsif f.is_a?(RGen::ECore::EAttribute)
+          cpy.setGeneric(f.name, value) if obj.eIsSet(f.name)
         end
-      end 
-      
-      if ct.outputDir == "" and pt.outputDir != ""
-        ct.setOutputDir(clone(pt.outputDir))
       end
-
-      if ct.docu.nil? and not pt.docu.nil?
-        ct.setDocu(clone(pt.docu))
-      end
-      
-      ct.setLintPolicy(clone(pt.lintPolicy) + ct.lintPolicy)
-      
-      if (isDefault)
-        if ct.basedOn == "" and pt.basedOn != ""
-          ct.setBasedOn(clone(pt.basedOn))
-        end
-        if pt.eclipseOrder # is that a good idea?
-          ct.setEclipseOrder(clone(pt.eclipseOrder))
+      cpy
+    end
+    
+   
+    def replace()
+      @child.class.ecore.eAllReferences.each do |f|
+        next unless @parent.class.ecore.eAllReferences.include?f
+        next unless f.containment
+        childData = @child.getGeneric(f.name)
+        if Metamodel::ModelElement === childData 
+          @parent.setGeneric(f.name,childData) if !childData.nil?
+        elsif Array === childData
+          if !childData.empty?
+            parentData = @parent.getGeneric(f.name)
+            cclasses = childData.map { |c| c.class }.uniq
+            parentData.delete_if { |p| cclasses.include?p.class }
+            parentData += childData
+            @parent.setGeneric(f.name,parentData)
+          end
         end
-        if ct.internalIncludes.nil? and not pt.internalIncludes.nil?
-          ct.setInternalIncludes(clone(pt.internalIncludes))
-        end 
       end
-      
     end
     
-    def manipulateLineNumbers(ar)
-      ar.each { |l| l.line_number -= 100000  }
+    def hasSubNodes(elem)
+      elem.class.ecore.eAllReferences.each do |f|
+        next unless f.containment
+        elemData = elem.getGeneric(f.name)
+        return true if (Array === elemData && !elemData.empty?)
+        return true if (Metamodel::ModelElement === elemData)
+      end
+      false
     end
-    
-    def clone(obj)
-      return obj.map {|o| o.dup} if Array === obj
-      return obj.dup
+
+    def sameAttr(childData, parentData)
+      childData.class.ecore.eAllAttributes.all? { |a| 
+        a.eAnnotations.each do |x| x.details.each do |y|
+          return true if (y.key == :internal and y.value == true)
+        end; end
+        a.name == "line_number" || (not childData.eIsSet(a.name)) || (childData.getGeneric(a.name) == parentData.getGeneric(a.name))
+      }
     end
     
-    def merge()
-    
-      # Valid for all config types
-
-      deps = clone(@parent.dependency)
-      @child.dependency.each do |cd|
-        deps << cd if deps.none? {|pd| pd.name == cd.name and pd.config == cd.config }
-      end
-      @child.setDependency(deps)
-      
-      @child.setSet(clone(@parent.set) + @child.set)
-
-      cExLib = clone(@parent.exLib)
-      cExLibSearchPath = clone(@parent.exLibSearchPath)
-      cUserLibrary = clone(@parent.userLibrary)
-      manipulateLineNumbers(cExLib)
-      manipulateLineNumbers(cExLibSearchPath)
-      manipulateLineNumbers(cUserLibrary)
-
-      @child.setExLib(cExLib + @child.exLib)
-      @child.setExLibSearchPath(cExLibSearchPath + @child.exLibSearchPath)
-      @child.setUserLibrary(cUserLibrary + @child.userLibrary)
-
-      if not @parent.startupSteps.nil?
-        if (@child.startupSteps.nil?)
-          @child.setStartupSteps(clone(@parent.startupSteps))
-        else
-          @child.startupSteps.setStep(clone(@parent.startupSteps.step) + @child.startupSteps.step)
-        end
-      end
-      
-      if not @parent.preSteps.nil?
-        if (@child.preSteps.nil?)
-          @child.setPreSteps(clone(@parent.preSteps))
-        else
-          @child.preSteps.setStep(clone(@parent.preSteps.step) + @child.preSteps.step)
-        end
-      end
+    def removeChilds(childElem, parentElem)
+      return if childElem.nil? or parentElem.nil?
       
-      if not @parent.postSteps.nil?
-        if (@child.postSteps.nil?)
-          @child.setPostSteps(clone(@parent.postSteps))
-        else
-          @child.postSteps.setStep(clone(@parent.postSteps.step) + @child.postSteps.step)
-        end
-      end
-
-      if not @parent.exitSteps.nil?
-        if (@child.exitSteps.nil?)
-          @child.setExitSteps(clone(@parent.exitSteps))
-        else
-          @child.exitSteps.setStep(clone(@parent.exitSteps.step) + @child.exitSteps.step)
+      childElem.class.ecore.eAllReferences.each do |f|
+        next unless f.containment
+        childData = childElem.getGeneric(f.name)
+        parentData = parentElem.getGeneric(f.name)
+        next if childData.nil? or parentData.nil?
+        if (Array === childData)
+          if !parentData.empty? && !childData.empty?
+            childData.each do |c|
+              cN = hasSubNodes(c)    
+              toRemove = []
+              parentData.each do |p|
+                next if p.class != c.class
+                if (not cN)
+                  if sameAttr(c, p)  
+                    toRemove << p
+                  end
+                else
+                  removeChilds(c, p);
+                end
+              end
+              toRemove.each do |r|
+                parentElem.removeGeneric(f.name, r)
+              end
+            end
+          end
+        elsif Metamodel::ModelElement === childData
+          if parentData.class == childData.class && sameAttr(childData, parentData)
+            cN = hasSubNodes(childData)
+            if (not cN)
+              parentElem.setGeneric(f.name, nil)
+            else
+              removeChilds(childData, parentData)
+            end
+          end # otherwise not equal, will not be deleted
         end
       end
-      
-      pt = @parent.defaultToolchain
-      ct = @child.defaultToolchain
+    end
+    
+    def extendAttributes(childData, parentData)
+       parentData.class.ecore.eAllAttributes.each do |a| 
+         childData.setGeneric(a.name, parentData.getGeneric(a.name)) if !childData.eIsSet(a.name) && parentData.eIsSet(a.name)
+       end
+     end
+     
+     def extend(child, parent)
+       (parent.class.ecore.eAllReferences & child.class.ecore.eAllReferences).each do |f|
+         next unless f.containment
+         parentData = parent.getGeneric(f.name)
+         next if parentData.nil? or (Array === parentData && parentData.empty?)
+         childData = child.getGeneric(f.name)
+           
+         if Array === parentData
+           if f.name == "compiler"
+             extendedParentData = []
+             parentData.each do |p| 
+               c = childData.find { |c| p.ctype == c.ctype }
+               if c
+                 extendAttributes(c, p)
+                 extend(c, p)
+                 extendedParentData << c
+               else
+                 extendedParentData << p
+               end
+             end
+             restOfChildData = childData.find_all { |c| parentData.find {|p| p.ctype != c.ctype } }
+             child.setGeneric(f.name, extendedParentData + restOfChildData)  
+           else
+             child.setGeneric(f.name, parentData + childData)
+           end
+         elsif Metamodel::ModelElement === parentData
+           if childData.nil? || childData.class != parentData.class
+             child.setGeneric(f.name, parentData)
+           else
+             extendAttributes(childData, parentData)
+             extend(childData, parentData)
+           end
+         end
+       end
+     end    
+    
+     def copyChildToParent(c, p)
+       (p.class.ecore.eAllReferences & c.class.ecore.eAllReferences).each do |f|
+         next unless f.containment
+         childData = c.getGeneric(f.name)
+         next if childData.nil? || (Array === childData && childData.empty?)
+         p.setGeneric(f.name, childData)
+       end        
+     end
+     
+    def merge(type)
+      #s = StringIO.new
+      #ser = RText::Serializer.new(Language)
 
-      if not pt.nil?
-        if (ct.nil?)
-          @child.setDefaultToolchain(clone(pt))
-        else
-          mergeToolchain(pt,ct,true)
-        end
-      end
-      
-      pt = @parent.toolchain
-      ct = @child.toolchain
-      
-      if not pt.nil?
-        if (ct.nil?)
-          @child.setToolchain(clone(pt))
-        else
-          mergeToolchain(pt,ct,false)
-        end
+      if Bake.options.debug
+        #s.puts "\n>>>> child <<<<"
+        #ser.serialize(@child, s)
+        #s.puts "\n>>>> parent <<<<"
+        #ser.serialize(@parent, s)
       end
-
-      # Valid for custom config
       
-      if (Metamodel::CustomConfig === @child && Metamodel::CustomConfig === @parent)
-        @child.setStep(clone(@parent.step)) if @child.step.nil? and not @parent.step.nil?
+      if (type == :remove)
+        removeChilds(@child, @parent)
+      elsif (type == :replace)
+        replace
+      elsif (type == :extend)
+        c = clone(@child)
+        extend(c, @parent)
+        copyChildToParent(c, @parent)
+      elsif (type == :merge)
+        extend(@child, clone(@parent))
       end
 
-      # Valid for library and exe config
-      
-      if ((Metamodel::LibraryConfig === @child || Metamodel::ExecutableConfig === @child) && (Metamodel::LibraryConfig === @parent || Metamodel::ExecutableConfig === @parent))
-        @child.setFiles(clone(@parent.files) + @child.files)
-        @child.setExcludeFiles(clone(@parent.excludeFiles) + @child.excludeFiles)
-        @child.setIncludeDir(clone(@parent.includeDir) + @child.includeDir)
+      if Bake.options.debug
+        #s.puts "\n>>>> #{type.to_s} <<<<"
+        #ser.serialize(type == :merge ? @child : @parent, s)
+        #puts "#{s.string}"
       end
 
-      # Valid for exe config
-      
-      if (Metamodel::ExecutableConfig === @child && Metamodel::ExecutableConfig === @parent)
-        @child.setLinkerScript(clone(@parent.linkerScript)) if @child.linkerScript.nil? and not @parent.linkerScript.nil?
-        @child.setArtifactName(clone(@parent.artifactName)) if @child.artifactName.nil? and not @parent.artifactName.nil?
-        @child.setMapFile(clone(@parent.mapFile)) if @child.mapFile.nil?  and not @parent.mapFile.nil?
-      end
-    
+            
     end
   
   end