bake-toolkit 2.50.0 → 2.51.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce5efe331210cc1e31546df0f648bf989d173ed5095cd3cd3ebf6e423941fe77
-  data.tar.gz: 8b9e09c9436b098878e281d02159bb2371b53c1d03ab0e1893b2a282dd8646e7
+  metadata.gz: 7be514890067a494671fdac7dfae9504543d2bf1bc6670d27aeaac9f7175a1a4
+  data.tar.gz: c98fb5849e848f75ac62e7baa64a70c3fd43b1b48bb5c1cbe824e6ae78e7349b
 SHA512:
-  metadata.gz: d07d87f5322ad4d941b4da672eeb34c2da3f2d3e310c110b584e30fe01486a793918e74090fdb1adb5aa1e3005e62ad923ecf65a5af49d4a085d3534047cdc22
-  data.tar.gz: 4749a9fe550431e99305835df4c26b109e9145aef758f345f1fde3fd4823ec3c18c6b2e2e28d54da8519d0863aa16b607886b299053cc309383128fcb6956b5e
+  metadata.gz: f6fc7efce7b5c59dddcac4ab3269b0283be77205ddad4d186a88578366aa7da6dcc38b776d214580a0b5e12c9c298152fc51bcf8859ed8ef9e6eb1089a4f2e82
+  data.tar.gz: 6ca78e17679d93e286f23ea6f30ad73648bdb7f3fd6344551a610188e20ba9bda42e56b1ce29a5617a51c63409e40c5ab9f54cf58999086a604fef68ccec340b

data/bin/bake

@@ -11,6 +11,8 @@ STDERR.sync = true
 require 'tocxx'
 require 'socket'
 
+puts "Profiling #{Time.now - $timeStart}: ruby includes parsed..." if ARGV.include?("--profiling")
+
 module Bake
 
   earlyExit = nil
@@ -20,6 +22,7 @@ module Bake
       ExitHelper.exit(1)
     end
 
+    puts "Profiling #{Time.now - $timeStart}: parse options..." if ARGV.include?("--profiling")
     Bake.options = Options.new(ARGV)
     Bake.options.parse_options
 

data/lib/adapt/config/loader.rb

@@ -48,6 +48,10 @@ module Bake
           Bake.formatter.printError("Allowed types are 'replace', 'remove', 'extend' and 'push_front'.",c)
           ExitHelper.exit(1)
         end
+        if not ["", "yes", "no", "all"].include?c.mergeInc
+          Bake.formatter.printError("Allowed modes are 'all', 'yes', 'no' and unset.",c)
+          ExitHelper.exit(1)
+        end
       end
     end
 

data/lib/bake/config/checks.rb

@@ -78,11 +78,9 @@ module Bake
             end
           end if config.respond_to?("includeDir")
 
-          config.dependency.each do |d|
-            if not ["front", "back", ""].include?d.inject
-              Bake.formatter.printError("inject of Dependency must be 'front' or 'back'", d)
-              ExitHelper.exit(1)
-            end
+          if not ["", "yes", "no", "all"].include?config.mergeInc
+            Bake.formatter.printError("Allowed modes are 'all', 'yes', 'no' and unset.",config)
+            ExitHelper.exit(1)
           end
 
         end

data/lib/bake/libElement.rb

@@ -29,19 +29,12 @@ module Bake
 
       levels = @@linker[:LINK_ONLY_DIRECT_DEPS] ? 1 : -1
       collect_recursive(block, levels)
-
-      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!
+      @@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!
 
       return [@@source_libraries + @@withpath, @@linker_libs_array]
     end
@@ -49,7 +42,7 @@ module Bake
     def self.adaptPath(path, block, prefix)
       adaptedPath = path
       if not File.is_absolute?(path)
-        prefix ||= File.rel_from_to_project(@@projectDir,block.projectDir)
+        prefix ||= File.rel_from_to_project(@@projectDir, block.projectDir)
         adaptedPath = prefix + path if prefix
         adaptedPath = Pathname.new(adaptedPath).cleanpath.to_s
       end
@@ -75,59 +68,50 @@ module Bake
 
       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
-          @@withpath << adaptedPath
-        when LibElement::SEARCH_PATH
-          adaptedPath, prefix = adaptPath(elem.value, block, prefix)
-          lpf = "#{@@linker[:LIB_PATH_FLAG]}#{adaptedPath}"
-
-          if not Bake.options.oldLinkOrder
+      if levels != 0
+        lib_elements = calcLibElements(block)
+        lib_elements += block.lib_elements unless block.lib_elements.nil?
+
+        lib_elements.reverse.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
+            @@withpath << adaptedPath
+          when LibElement::SEARCH_PATH
+            adaptedPath, prefix = adaptPath(elem.value, block, prefix)
+            lpf = "#{@@linker[:LIB_PATH_FLAG]}#{adaptedPath}"
+  
             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, levels-1)
-          else
-            # TODO: warning or error?
+  
+          when LibElement::DEPENDENCY
+            if Blocks::ALL_BLOCKS.include?elem.value
+              bb = Blocks::ALL_BLOCKS[elem.value]
+              collect_recursive(bb, levels-1)
+            else
+              # TODO: warning or error?
+            end
           end
         end
-      end if levels != 0
-
-      addOwnLib(block) if not Bake.options.oldLinkOrder
+      end
+      addOwnLib(block)
     end
 
 
@@ -135,7 +119,6 @@ module Bake
       lib_elements = [] # value = array pairs [type, name/path string]
 
       block.config.libStuff.each do |l|
-
         if (Metamodel::UserLibrary === l)
           ln = l.name
           ls = nil

data/lib/bake/mergeConfig.rb

@@ -39,6 +39,13 @@ module Bake
 
 
     def replace()
+      if Metamodel::BaseConfig_INTERNAL === @child &&
+        Metamodel::BaseConfig_INTERNAL ===  @parent
+        if @child.mergeInc != "" && @parent.mergeInc != "no"
+          @parent.mergeInc = @child.mergeInc
+        end
+      end
+
       @child.class.ecore.eAllReferences.each do |f|
         next unless @parent.class.ecore.eAllReferences.include?f
         next unless f.containment
@@ -78,6 +85,13 @@ module Bake
 
     def removeChilds(childElem, parentElem)
       return if childElem.nil? or parentElem.nil?
+      
+      if Metamodel::BaseConfig_INTERNAL === childElem &&
+        Metamodel::BaseConfig_INTERNAL ===  parentElem
+        if childElem.mergeInc == parentElem.mergeInc
+          parentElem.mergeInc = ""
+        end
+      end
 
       childElem.class.ecore.eAllReferences.each do |f|
         next unless f.containment
@@ -128,6 +142,13 @@ module Bake
      end
 
      def extend(child, parent, push_front)
+       if Metamodel::BaseConfig_INTERNAL === child &&
+         Metamodel::BaseConfig_INTERNAL ===  parent
+         if child.mergeInc != "" && parent.mergeInc != "no"
+           parent.mergeInc = child.mergeInc
+         end
+       end
+
        (parent.class.ecore.eAllReferences & child.class.ecore.eAllReferences).each do |f|
          next unless f.containment
          parentData = parent.getGeneric(f.name)

data/lib/bake/model/metamodel.rb

@@ -148,6 +148,9 @@ module Bake
       class BaseElement < ModelElement
       end
 
+      class LibStuff < BaseElement
+      end
+
       class IncludeDir < BaseElement
         has_attr 'name', String, :defaultValueLiteral => ""
         has_attr 'infix', String, :defaultValueLiteral => ""
@@ -156,8 +159,7 @@ module Bake
         has_attr 'system', Boolean, :defaultValueLiteral => "false"
       end
 
-      class LibStuff < BaseElement
-      end
+
 
       class ExternalLibrary < LibStuff
         has_attr 'name', String, :defaultValueLiteral => ""
@@ -273,6 +275,7 @@ module Bake
         has_attr 'type', String, :defaultValueLiteral => ""
         has_attr 'project', String, :defaultValueLiteral => ""
         has_attr 'private', Boolean, :defaultValueLiteral => "false"
+        has_attr 'mergeInc', String, :defaultValueLiteral => ""
         contains_one 'description', Description, 'parent'
         contains_one 'startupSteps', StartupSteps, 'parent'
         contains_one 'preSteps', PreSteps, 'parent'

data/lib/bake/model/metamodel_ext.rb

@@ -23,10 +23,22 @@ module Bake
 
       end
 
+      module Dependency::ClassModule
+        def setInjected
+          @injected = true
+        end
+        def injected?
+          @injected ||= false
+        end
+      end
+      
       module BaseConfig_INTERNAL::ClassModule
         def qname
           @qname ||= parent.name + "," + name
         end
+        def depInc
+          baseElement.find_all { |l| Dependency === l || IncludeDir === l}
+        end
         def dependency
           baseElement.find_all { |l| Dependency === l }
         end

data/lib/bake/options/options.rb

@@ -23,7 +23,7 @@ module Bake
     attr_reader :main_dir, :project, :filename, :main_project_name, :buildDirDelimiter, :dot, :cc2j_filename # String
     attr_reader :include_filter, :exclude_filter, :adapt # String List
     attr_reader :conversion_info, :stopOnFirstError, :clean, :rebuild, :show_includes, :show_includes_and_defines, :projectPaths, :qac, :dry, :syncedOutput, :debug_threads, :skipBuildingLine # Boolean
-    attr_reader :linkOnly, :compileOnly, :no_autodir, :clobber, :docu, :debug, :prepro, :oldLinkOrder, :prebuild, :printTime, :json, :wparse, :caseSensitivityCheck, :fileCmd, :mergeInc # Boolean
+    attr_reader :linkOnly, :compileOnly, :no_autodir, :clobber, :docu, :debug, :prepro, :prebuild, :printTime, :json, :wparse, :caseSensitivityCheck, :fileCmd, :profiling # Boolean
     attr_reader :threads, :socket # Fixnum
     attr_reader :vars, :include_filter_args # map
     attr_reader :verbose
@@ -49,7 +49,6 @@ module Bake
       @prebuild = false
       @printTime = false
       @buildDirDelimiter = "/"
-      @oldLinkOrder = false
       @conversion_info = false
       @envToolchain = false
       @analyze = false
@@ -86,10 +85,10 @@ module Bake
       @main_project_name = ""
       @adapt = []
       @syncedOutput = false
+      @profiling = false
       @diabCaseCheck = false
       @defines = []
       @fileCmd = false
-      @mergeInc = false
 
       add_option(["-b",                   ""                     ], lambda { |x| set_build_config(x)                     })
       add_option(["-m"                                           ], lambda { |x| @main_dir = x                           })
@@ -101,6 +100,7 @@ module Bake
       add_option(["-r"                                           ], lambda {     @stopOnFirstError = true                })
       add_option(["-O"                                           ], lambda {     @syncedOutput = true                    })
       add_option(["--rebuild"                                    ], lambda {     @rebuild = true                         })
+      add_option(["--profiling"                                  ], lambda {     @profiling = true                         })
       add_option(["--prepro"                                     ], lambda {     @prepro = true                          })
       add_option(["--link-only",          "--link_only"          ], lambda {     @linkOnly = true;                       })
       add_option(["--compile-only",       "--compile_only"       ], lambda {     @compileOnly = true;                    })
@@ -124,7 +124,6 @@ module Bake
       add_option(["-nb"                                          ], lambda {     @skipBuildingLine = true                })
       add_option(["--no-case-check"                              ], lambda {     @caseSensitivityCheck = false           })
       add_option(["--file-cmd"                                   ], lambda {     @fileCmd = true                         })
-      add_option(["--merge-inc"                                   ], lambda {    @mergeInc = true                        })
       add_option(["--clobber"                                    ], lambda {     @clobber = true; @clean = true          })
       add_option(["--ignore-cache",       "--ignore_cache"       ], lambda {     @nocache = true                         })
       add_option(["-j",                   "--threads"            ], lambda { |x, dummy1, dummy2| set_threads(x)          })
@@ -159,7 +158,6 @@ module Bake
       add_option(["--version"                                    ], lambda {     Bake::Usage.version                     })
       add_option(["--list",               "--show_configs"       ], lambda {     @showConfigs = true                     })
       add_option(["--compilation-db"                             ], lambda { |x,dummy| @cc2j_filename = (x ? x : "compile_commands.json" )})
-      add_option(["--link-2-17",          "--link_2_17"          ], lambda {     @oldLinkOrder = true                    })
       add_option(["--build_",                                    ], lambda {     @buildDirDelimiter = "_"                })
 
       # deprecated and not replaced by new command

data/lib/bake/options/usage.rb

@@ -62,8 +62,7 @@ module Bake
       puts " --crc32 <string>         Calulates the CRC32 of string (0x4C11DB7, init 0, final xor 0, input and result not reflected), used for Uid variable calculation"
       puts " --diab-case-check        When compiling with DCC, this switches to the case check on Windows machines. No actual compilation is done."
       puts " --file-cmd               Writes arguments into a file and hands it over the compiler/archiver/linker. Works only for supported compilers."
-      puts " --merge-inc              Merges includes together, so the compiler gets only one include directory."
-      puts " --link-2-17              DEPRECATED: Using link order of libraries which was used until bake 2.17"
+      puts " --link-beta              Improved linking, order of libs changed. Experimental."
       puts " --build_                 DEPRECATED: build directories will be build_<name> instead of build/<name>"
       puts " --version                Print version."
       puts " --time                   Print elapsed time at the end."

data/lib/bake/toolchain/gcc.rb

@@ -49,7 +49,7 @@ module Bake
 
     GCCChain[:ARCHIVER][:COMMAND] = "ar"
     GCCChain[:ARCHIVER][:ARCHIVE_FLAGS] = "-rc"
-    GCCChain[:ARCHIVER][:FILE_COMMAND] = "@"
+    GCCChain[:ARCHIVER][:FILE_COMMAND] = (Bake::Utils::OS.name == "Mac" ? "" : "@")
  
     GCCChain[:LINKER][:COMMAND] = "g++"
     GCCChain[:LINKER][:SCRIPT] = "-T"

data/lib/bakeqac/filter.rb

@@ -20,7 +20,11 @@ module Bake
 
     def self.localFile(str)
       return true if (not is_valid?) || (not @@options.qacfilefilter)
-      projects.any? { |fil| str.include?(fil+"/") and not str.include?(fil+"/test/") and not str.include?(fil+"/mock/") and not str.include?(fil+"/.qacdata/") }
+      projects.any? { |fil| str.include?(fil+"/") &&
+        !str.include?(fil+"/test/") &&
+        !str.include?(fil+"/mock/") &&
+        !str.include?(fil+"/.qacdata/") &&
+        !str.include?("/mergedIncludes") }
     end
 
     def self.writeFilter(filter)

data/lib/blocks/block.rb

@@ -22,8 +22,8 @@ module Bake
       @@delayed_result = true
       @@threads = []
 
-      attr_reader :lib_elements, :projectDir, :library, :config, :projectName, :prebuild, :output_dir, :tcs
-      attr_accessor :visited, :inDeps, :result
+      attr_reader :lib_elements, :projectDir, :library, :config, :projectName, :configName, :prebuild, :output_dir, :tcs
+      attr_accessor :visited, :inDeps, :result, :bes
 
       def startupSteps
         @startupSteps ||= []
@@ -52,7 +52,7 @@ module Bake
       def dependencies
         @dependencies ||= []
       end
-
+      
       def childs
         @childs ||= []
       end
@@ -61,10 +61,6 @@ module Bake
         @parents ||= []
       end
 
-      def depToBlock
-        @depToBlock ||= {}
-      end
-
       def set_library(library)
         @library = library
       end
@@ -81,8 +77,8 @@ module Bake
         @projectDir = config.get_project_dir
         @result = true
         @tcs = tcs
-
-        @lib_elements = Bake::LibElements.calcLibElements(self)
+        @bes = []
+        @lib_elements = []
 
         calcOutputDir
       end
@@ -352,7 +348,6 @@ module Bake
         @config.writeEnvVars()
         Thread.current[:lastCommand] = nil
         allSteps = (preSteps + mainSteps + postSteps)
-
         # check if we have to delay the output (if the last step of this block is not in a thread)
         @outputStep = nil
         allSteps.each { |step| @outputStep = independent?(method, step) ? step : nil }

data/lib/blocks/blockBase.rb

@@ -197,6 +197,14 @@ module Bake
         end
         args = cmd.drop(onlyCmd.length)
         argsFlat = args.join(' ')
+
+        splittedArgs = argsFlat.split("\"")
+        argsFlat = ""
+        splittedArgs.each_with_index do |s,i|
+          argsFlat << s
+          argsFlat << (i%2 == 0 ? "\"\\\"" : "\\\"\"") if i != splittedArgs.length - 1 
+        end
+
         cmdFile = orgOut + ".file" + postfix
         cmdFileLong = File.expand_path(cmdFile, @projectDir)
         FileUtils.mkdir_p(File.dirname(cmdFileLong))

data/lib/blocks/compile.rb

@@ -41,7 +41,6 @@ end
 
 
 
-
 module Bake
 
   module Blocks
@@ -60,10 +59,7 @@ module Bake
         @object_files = {}
         @system_includes = Set.new
 
-        calcFileTcs
-        calcIncludes
-        calcDefines # not for files with changed tcs
-        calcFlags   # not for files with changed tcs
+
       end
 
       def get_object_file(source)
@@ -408,12 +404,18 @@ module Bake
       end
 
       def execute
-        #Dir.chdir(@projectDir) do
-
+          return true if @config.files.empty?
+          
           SyncOut.mutex.synchronize do
+            calcFileTcs
+            calcIncludes
+            calcDefines # not for files with changed tcs
+            calcFlags   # not for files with changed tcs
             calcSources
             calcObjects
+            puts "Profiling #{Time.now - $timeStart}: prepareIncludes (#{@projectName+","+@config.name}) start..." if Bake.options.profiling
             prepareIncludes
+            puts "Profiling #{Time.now - $timeStart}: prepareIncludes (#{@projectName+","+@config.name}) stop..." if Bake.options.profiling
           end
 
           fileListBlock = Set.new if Bake.options.filelist
@@ -592,78 +594,124 @@ module Bake
         @source_files
       end
 
-      def mapInclude(inc, orgBlock)
-
-        if inc.name == "___ROOTS___"
-          return Bake.options.roots.map { |r| File.rel_from_to_project(@projectDir,r.dir,false) }
-        end
-
-        i = orgBlock.convPath(inc,nil,true)
-        if orgBlock != @block
-          if not File.is_absolute?(i)
-            i = File.rel_from_to_project(@projectDir,orgBlock.config.parent.get_project_dir) + i
-          end
-        end
-
-        Pathname.new(i).cleanpath
-      end
-
       def calcIncludesInternal(block)
+        # puts "#{block.projectName},#{block.configName} " + block.to_s
+        noDeps = @blocksRead.include?(block)
         @blocksRead << block
-        block.config.baseElement.each do |be|
+        block.bes.each do |be|
           if Metamodel::IncludeDir === be
+            # puts "-- #{be.name}"
             if be.inherit == true || block == @block
-              mappedInc = mapInclude(be, block)
-              @include_list << mappedInc
-              @system_includes << mappedInc if be.system
+              mappedInc = File.rel_from_to_project(@projectDir,be.name,false)
+              mappedInc  = "." if mappedInc.empty?
+              if !@include_set.include?(mappedInc) # todo set!!
+                @include_list << mappedInc
+                @include_set << mappedInc
+                if !@include_merge.has_key?(mappedInc)
+                  if be.parent.mergeInc == "no"
+                    @include_merge[mappedInc] = false
+                  elsif @config.mergeInc == "all"
+                    @include_merge[mappedInc] = true
+                  elsif @block.config != be.parent && @config.mergeInc == "yes"
+                    @include_merge[mappedInc] = true
+                  else
+                    @include_merge[mappedInc] = false
+                  end
+                end
+                @system_includes << mappedInc if be.system
+              end
             end
           elsif Metamodel::Dependency === be
-            childBlock = block.depToBlock[be.name + "," + be.config]
-            calcIncludesInternal(childBlock) if !@blocksRead.include?(childBlock)
+            if (!noDeps)
+              childBlock = Blocks::ALL_BLOCKS[be.name + "," + be.config]
+              if block.projectName == be.parent.parent.name &&
+                block.configName == be.parent.name
+                next if @blocksRead.include?(childBlock)
+              end
+              calcIncludesInternal(childBlock)
+            end
           end
         end
       end
 
       def calcIncludes
-
         @blocksRead = Set.new
+        @include_set = Set.new
         @include_list = []
+        @include_merge = {}
         @system_includes = Set.new
+        
+          #puts @block.bes.length
+          #@block.bes.each {|b| puts "#{b.class}: #{b.name}, #{b.respond_to?(:config) ? b.config : ""}"}
+          #exit(1)
+        
+
+        
         calcIncludesInternal(@block) # includeDir and child dependencies with inherit: true
+        # exit(1)
+        @include_list = @include_list.flatten.uniq
+      end
 
-        @block.getBlocks(:parents).each do |b|
-          if b.config.respond_to?("includeDir")
-            include_list_front = []
-            b.config.includeDir.each do |inc|
-              if inc.inject == "front" || inc.infix == "front"
-                mappedInc = mapInclude(inc, b)
-                include_list_front << mappedInc
-                @system_includes << mappedInc if inc.system
-              elsif inc.inject == "back" || inc.infix == "back"
-                mappedInc = mapInclude(inc, b)
-                @include_list << mappedInc
-                @system_includes << mappedInc if inc.system
+      def prepareIncludes
+        mergeCounter = 0
+        inmerge = false
+        mdir = nil
+        include_list_new = []
+        filesToCopy = {}
+        destDirs = Set.new
+        merging = false
+        @include_list.reverse.each do |idir|
+          idirs = idir.to_s
+          idirs = File.expand_path(idirs, @projectDir) if !File.is_absolute?(idirs)
+          if @include_merge[idir]
+            if (!inmerge)
+              mergeCounter += 1
+              mdir = File.expand_path(@block.output_dir+"/mergedIncludes#{mergeCounter}", @projectDir)
+              FileUtils.rm_rf(mdir)
+              FileUtils.mkdir_p(mdir)
+              inmerge = true
+            end
+            if !merging
+              puts "Profiling #{Time.now - $timeStart}: glob..." if Bake.options.profiling
+            end
+            merging = true
+
+            toCopy = Dir.glob(idirs+"/**/*").
+              reject { |file| file.start_with?(idirs+"/build/") || file.start_with?(idirs+"/.") }.
+              select { |file| File.file?(file) && /^\.(h|i|cfg)/ === File.extname(file) }
+            toCopy.each do |t|
+              dest = mdir+t[idirs.length..-1]
+              destDirs << File.dirname(dest)
+              if filesToCopy.has_key?(t)
+                filesToCopy[t] << dest
+              else
+                filesToCopy[t] = [dest]
               end
             end
-            @include_list = include_list_front + @include_list
+            include_list_new << (@block.output_dir+"/mergedIncludes#{mergeCounter}")
+          else
+            if (inmerge)
+              inmerge = false
+            end
+            include_list_new << idir
           end
         end
-
-        @include_list = @include_list.flatten.uniq
-
-      end
-
-      def prepareIncludes
-        if Bake.options.mergeInc
-          mdir = File.expand_path(@block.output_dir+"/mergedIncludes", @projectDir)
-          @include_list.each do |idir|
-            FileUtils.mkdir_p(mdir)
-            idir = idir.to_s
-            idir = File.expand_path(idir, @projectDir) if !File.is_absolute?(idir)
-            FileUtils.cp_r(Dir.glob(idir+"/*"), mdir)
+        if merging
+          sizeWarning = 100000
+          sum = filesToCopy.keys.inject(0) do |sum,t|
+            si = File.size(t)
+            puts "Size warning (>#{sizeWarning} byte): #{t} has #{si} byte" if si > sizeWarning and Bake.options.profiling
+            sum + si
           end
-          @include_list = [@block.output_dir+"/mergedIncludes"]
-        end 
+          puts "Profiling #{Time.now - $timeStart}: copy #{sum} byte in #{filesToCopy.length} files..." if Bake.options.profiling
+          destDirs.each {|d| FileUtils.mkdir_p(d)}
+          filesToCopy.each do |t, dest|
+            dest.each do |d|
+              FileUtils.cp_r(t, d, :preserve => true)
+            end
+          end
+        end
+        @include_list = include_list_new.uniq.reverse
 
         @include_array = {}
         [:CPP, :C, :ASM].each do |type|