bake-toolkit 2.20.4 → 2.21.0

data/lib/bake/libElement.rb

@@ -1,176 +1,176 @@
-module Bake
-
-  class LibElement
-
-    LIB = 1
-    USERLIB = 2
-    LIB_WITH_PATH = 3
-    SEARCH_PATH = 4
-    DEPENDENCY = 5
-
-    attr_reader :type, :value
-
-    def initialize(type, value)
-      @type = type
-      @value = value
-    end
-  end
-
-  class LibElements
-
-    def self.calc_linker_lib_string(block, tcs)
-      @@lib_path_set = []
-      @@dep_set = Set.new
-      @@linker = tcs[:LINKER]
-      @@projectDir = block.projectDir
-      @@source_libraries = []
-      @@linker_libs_array = []
-
-      collect_recursive(block)
-
-      if Bake.options.oldLinkOrder
-        if @@linker[:LIST_MODE] and not @@lib_path_set.empty?
-          @@linker_libs_array << (@@linker[:LIB_PATH_FLAG] + @@lib_path_set.join(","));
-        end
-      else
-        @@source_libraries.reverse!
-        @@lib_path_set.reverse!
-        if @@linker[:LIST_MODE] and not @@lib_path_set.empty?
-          @@linker_libs_array.unshift (@@linker[:LIB_PATH_FLAG] + @@lib_path_set.join(","));
-        end
-        @@linker_libs_array.reverse!
-      end
-
-      return [@@source_libraries, @@linker_libs_array]
-    end
-
-    def self.adaptPath(path, block, prefix)
-      adaptedPath = path
-      if not File.is_absolute?(path)
-        prefix ||= File.rel_from_to_project(@@projectDir,block.projectDir)
-        adaptedPath = prefix + path if prefix
-      end
-      #adaptedPath = "\"" + adaptedPath + "\"" if adaptedPath.include?(" ")
-      [adaptedPath, prefix]
-    end
-
-    def self.addOwnLib(block)
-      if block.library
-        adaptedPath, prefix = adaptPath(block.library.archive_name, block, prefix)
-        if (block.prebuild and File.exist?adaptedPath) or
-           (not block.library.compileBlock.objects.empty?) or
-           (not block.library.compileBlock.calcSources(true, true).empty?)
-          @@linker_libs_array << adaptedPath
-          @@source_libraries << adaptedPath
-        end
-      end
-    end
-
-    def self.collect_recursive(block)
-      return if @@dep_set.include?block
-      @@dep_set << block
-
-      prefix = nil
-
-      if Bake.options.oldLinkOrder
-        addOwnLib(block)
-        elems = block.lib_elements
-      else
-        elems = block.lib_elements.reverse
-      end
-
-      elems.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)
-          lpf = "#{@@linker[:LIB_PATH_FLAG]}#{adaptedPath}"
-
-          if not Bake.options.oldLinkOrder
-            if not @@lib_path_set.include?adaptedPath
-              @@lib_path_set << adaptedPath
-              @@linker_libs_array << lpf if @@linker[:LIST_MODE] == false
-            end
-          end
-
-          if not Bake.options.oldLinkOrder
-            # must be moved to the end, so delete it...
-            ind1 = @@lib_path_set.index(adaptedPath)
-            ind2 = @@linker_libs_array.index(lpf)
-            @@lib_path_set.delete_at(ind1)      if not ind1.nil?
-            @@linker_libs_array.delete_at(ind2) if not ind2.nil?
-          end
-
-          if (not Bake.options.oldLinkOrder) or (not @@lib_path_set.include?adaptedPath)
-            # end place it at the end again
-            @@lib_path_set << adaptedPath
-            @@linker_libs_array << lpf 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
-
-      addOwnLib(block) if not Bake.options.oldLinkOrder
-
-    end
-
-
-
-
-    def self.calcLibElements(block)
-      lib_elements = [] # value = array pairs [type, name/path string]
-
-      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
-
-      return lib_elements
-    end
-
-  end
-
-end
+module Bake
+
+  class LibElement
+
+    LIB = 1
+    USERLIB = 2
+    LIB_WITH_PATH = 3
+    SEARCH_PATH = 4
+    DEPENDENCY = 5
+
+    attr_reader :type, :value
+
+    def initialize(type, value)
+      @type = type
+      @value = value
+    end
+  end
+
+  class LibElements
+
+    def self.calc_linker_lib_string(block, tcs)
+      @@lib_path_set = []
+      @@dep_set = Set.new
+      @@linker = tcs[:LINKER]
+      @@projectDir = block.projectDir
+      @@source_libraries = []
+      @@linker_libs_array = []
+
+      collect_recursive(block)
+
+      if Bake.options.oldLinkOrder
+        if @@linker[:LIST_MODE] and not @@lib_path_set.empty?
+          @@linker_libs_array << (@@linker[:LIB_PATH_FLAG] + @@lib_path_set.join(","));
+        end
+      else
+        @@source_libraries.reverse!
+        @@lib_path_set.reverse!
+        if @@linker[:LIST_MODE] and not @@lib_path_set.empty?
+          @@linker_libs_array.unshift (@@linker[:LIB_PATH_FLAG] + @@lib_path_set.join(","));
+        end
+        @@linker_libs_array.reverse!
+      end
+
+      return [@@source_libraries, @@linker_libs_array]
+    end
+
+    def self.adaptPath(path, block, prefix)
+      adaptedPath = path
+      if not File.is_absolute?(path)
+        prefix ||= File.rel_from_to_project(@@projectDir,block.projectDir)
+        adaptedPath = prefix + path if prefix
+      end
+      #adaptedPath = "\"" + adaptedPath + "\"" if adaptedPath.include?(" ")
+      [adaptedPath, prefix]
+    end
+
+    def self.addOwnLib(block)
+      if block.library
+        adaptedPath, prefix = adaptPath(block.library.archive_name, block, prefix)
+        if (block.prebuild and File.exist?adaptedPath) or
+           (not block.library.compileBlock.objects.empty?) or
+           (not block.library.compileBlock.calcSources(true, true).empty?)
+          @@linker_libs_array << adaptedPath
+          @@source_libraries << adaptedPath
+        end
+      end
+    end
+
+    def self.collect_recursive(block)
+      return if @@dep_set.include?block
+      @@dep_set << block
+
+      prefix = nil
+
+      if Bake.options.oldLinkOrder
+        addOwnLib(block)
+        elems = block.lib_elements
+      else
+        elems = block.lib_elements.reverse
+      end
+
+      elems.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)
+          lpf = "#{@@linker[:LIB_PATH_FLAG]}#{adaptedPath}"
+
+          if not Bake.options.oldLinkOrder
+            if not @@lib_path_set.include?adaptedPath
+              @@lib_path_set << adaptedPath
+              @@linker_libs_array << lpf if @@linker[:LIST_MODE] == false
+            end
+          end
+
+          if not Bake.options.oldLinkOrder
+            # must be moved to the end, so delete it...
+            ind1 = @@lib_path_set.index(adaptedPath)
+            ind2 = @@linker_libs_array.index(lpf)
+            @@lib_path_set.delete_at(ind1)      if not ind1.nil?
+            @@linker_libs_array.delete_at(ind2) if not ind2.nil?
+          end
+
+          if (not Bake.options.oldLinkOrder) or (not @@lib_path_set.include?adaptedPath)
+            # end place it at the end again
+            @@lib_path_set << adaptedPath
+            @@linker_libs_array << lpf 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
+
+      addOwnLib(block) if not Bake.options.oldLinkOrder
+
+    end
+
+
+
+
+    def self.calcLibElements(block)
+      lib_elements = [] # value = array pairs [type, name/path string]
+
+      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
+
+      return lib_elements
+    end
+
+  end
+
+end

data/lib/bake/mergeConfig.rb

@@ -1,209 +1,209 @@
-require 'common/ext/rtext'
-
-module Bake
-
-  class MergeConfig
-
-    def initialize(child, parent)
-      @child = child
-      @parent = parent
-    end
-
-    def self.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
-    end
-
-    def self.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
-        elsif f.is_a?(RGen::ECore::EAttribute)
-          cpy.setGeneric(f.name, value) if obj.eIsSet(f.name)
-        end
-      end
-      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
-      end
-    end
-
-    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 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 removeChilds(childElem, parentElem)
-      return if childElem.nil? or parentElem.nil?
-
-      childElem.class.ecore.eAllReferences.each do |f|
-        next unless f.containment
-        begin
-          childData = childElem.getGeneric(f.name)
-          parentData = parentElem.getGeneric(f.name)
-        rescue Exception => ex
-          next # how to check fast if f.name is valid?
-        end
-        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
-    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 Bake.options.debug
-        s.puts "\n>>>> child <<<<"
-        ser.serialize(@child, s)
-        s.puts "\n>>>> parent <<<<"
-        ser.serialize(@parent, s)
-      end
-
-      if (type == :remove)
-        removeChilds(@child, @parent)
-      elsif (type == :replace)
-        replace
-      elsif (type == :extend)
-        c = MergeConfig.clone(@child)
-        extend(c, @parent)
-        copyChildToParent(c, @parent)
-      elsif (type == :merge)
-        extend(@child, MergeConfig.clone(@parent))
-      end
-
-      if Bake.options.debug
-        s.puts "\n>>>> result of #{type.to_s} <<<<"
-        ser.serialize(type == :merge ? @child : @parent, s)
-        puts "#{s.string}"
-      end
-
-
-    end
-
-  end
-
+require 'common/ext/rtext'
+
+module Bake
+
+  class MergeConfig
+
+    def initialize(child, parent)
+      @child = child
+      @parent = parent
+    end
+
+    def self.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
+    end
+
+    def self.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
+        elsif f.is_a?(RGen::ECore::EAttribute)
+          cpy.setGeneric(f.name, value) if obj.eIsSet(f.name)
+        end
+      end
+      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
+      end
+    end
+
+    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 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 removeChilds(childElem, parentElem)
+      return if childElem.nil? or parentElem.nil?
+
+      childElem.class.ecore.eAllReferences.each do |f|
+        next unless f.containment
+        begin
+          childData = childElem.getGeneric(f.name)
+          parentData = parentElem.getGeneric(f.name)
+        rescue Exception => ex
+          next # how to check fast if f.name is valid?
+        end
+        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
+    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 Bake.options.debug
+        s.puts "\n>>>> child <<<<"
+        ser.serialize(@child, s)
+        s.puts "\n>>>> parent <<<<"
+        ser.serialize(@parent, s)
+      end
+
+      if (type == :remove)
+        removeChilds(@child, @parent)
+      elsif (type == :replace)
+        replace
+      elsif (type == :extend)
+        c = MergeConfig.clone(@child)
+        extend(c, @parent)
+        copyChildToParent(c, @parent)
+      elsif (type == :merge)
+        extend(@child, MergeConfig.clone(@parent))
+      end
+
+      if Bake.options.debug
+        s.puts "\n>>>> result of #{type.to_s} <<<<"
+        ser.serialize(type == :merge ? @child : @parent, s)
+        puts "#{s.string}"
+      end
+
+
+    end
+
+  end
+
 end