RubyGems - bake-toolkit - Versions diffs - 2.12.1 → 2.12.2 - Mend

bake-toolkit 2.12.1 → 2.12.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (51) hide show

data/documentation/_build/html/tips_and_tricks/how_to_use_bake_with_cygwin.html CHANGED

@@ -5,7 +5,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>How to use bake with cygwin &mdash; bake 2.12.1 documentation</title>
+    <title>How to use bake with cygwin &mdash; bake 2.12.2 documentation</title>
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -15,7 +15,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '2.12.1',
+        VERSION:     '2.12.2',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -29,7 +29,7 @@
     <script type="text/javascript" src="../_static/bootstrap-3.3.4/js/bootstrap.min.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
     <link rel="shortcut icon" href="../_static/logo_tiny_32.ico"/>
-    <link rel="top" title="bake 2.12.1 documentation" href="../index.html" />
+    <link rel="top" title="bake 2.12.2 documentation" href="../index.html" />
     <link rel="up" title="Tips and Tricks" href="tips_and_tricks.html" />
     <link rel="next" title="Clang Analyze" href="the_clang.html" />
     <link rel="prev" title="Static Code Analysis" href="static_code_analysis.html" />

data/documentation/_build/html/tips_and_tricks/static_code_analysis.html CHANGED

@@ -5,7 +5,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>Static Code Analysis &mdash; bake 2.12.1 documentation</title>
+    <title>Static Code Analysis &mdash; bake 2.12.2 documentation</title>
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -15,7 +15,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '2.12.1',
+        VERSION:     '2.12.2',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -29,7 +29,7 @@
     <script type="text/javascript" src="../_static/bootstrap-3.3.4/js/bootstrap.min.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
     <link rel="shortcut icon" href="../_static/logo_tiny_32.ico"/>
-    <link rel="top" title="bake 2.12.1 documentation" href="../index.html" />
+    <link rel="top" title="bake 2.12.2 documentation" href="../index.html" />
     <link rel="up" title="Tips and Tricks" href="tips_and_tricks.html" />
     <link rel="next" title="How to use bake with cygwin" href="how_to_use_bake_with_cygwin.html" />
     <link rel="prev" title="The Bakery" href="the_bakery.html" />

data/documentation/_build/html/tips_and_tricks/the_bakery.html CHANGED

@@ -5,7 +5,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>The Bakery &mdash; bake 2.12.1 documentation</title>
+    <title>The Bakery &mdash; bake 2.12.2 documentation</title>
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -15,7 +15,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '2.12.1',
+        VERSION:     '2.12.2',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -29,7 +29,7 @@
     <script type="text/javascript" src="../_static/bootstrap-3.3.4/js/bootstrap.min.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
     <link rel="shortcut icon" href="../_static/logo_tiny_32.ico"/>
-    <link rel="top" title="bake 2.12.1 documentation" href="../index.html" />
+    <link rel="top" title="bake 2.12.2 documentation" href="../index.html" />
     <link rel="up" title="Tips and Tricks" href="tips_and_tricks.html" />
     <link rel="next" title="Static Code Analysis" href="static_code_analysis.html" />
     <link rel="prev" title="Tips and Tricks" href="tips_and_tricks.html" />

data/documentation/_build/html/tips_and_tricks/the_clang.html CHANGED

@@ -5,7 +5,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>Clang Analyze &mdash; bake 2.12.1 documentation</title>
+    <title>Clang Analyze &mdash; bake 2.12.2 documentation</title>
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -15,7 +15,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '2.12.1',
+        VERSION:     '2.12.2',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -29,7 +29,7 @@
     <script type="text/javascript" src="../_static/bootstrap-3.3.4/js/bootstrap.min.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
     <link rel="shortcut icon" href="../_static/logo_tiny_32.ico"/>
-    <link rel="top" title="bake 2.12.1 documentation" href="../index.html" />
+    <link rel="top" title="bake 2.12.2 documentation" href="../index.html" />
     <link rel="up" title="Tips and Tricks" href="tips_and_tricks.html" />
     <link rel="next" title="Performance" href="../performance/performance.html" />
     <link rel="prev" title="How to use bake with cygwin" href="how_to_use_bake_with_cygwin.html" />

data/documentation/_build/html/tips_and_tricks/tips_and_tricks.html CHANGED

@@ -5,7 +5,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>Tips and Tricks &mdash; bake 2.12.1 documentation</title>
+    <title>Tips and Tricks &mdash; bake 2.12.2 documentation</title>
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -15,7 +15,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '2.12.1',
+        VERSION:     '2.12.2',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -29,7 +29,7 @@
     <script type="text/javascript" src="../_static/bootstrap-3.3.4/js/bootstrap.min.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
     <link rel="shortcut icon" href="../_static/logo_tiny_32.ico"/>
-    <link rel="top" title="bake 2.12.1 documentation" href="../index.html" />
+    <link rel="top" title="bake 2.12.2 documentation" href="../index.html" />
     <link rel="next" title="The Bakery" href="the_bakery.html" />
     <link rel="prev" title="How to Debug in Visual Studio" href="../ide/vs/how_to_debug_in_vs.html" />
 <meta charset='utf-8'>

data/documentation/_build/html/why_bake/why_bake.html CHANGED

@@ -5,7 +5,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>Why you should use bake &mdash; bake 2.12.1 documentation</title>
+    <title>Why you should use bake &mdash; bake 2.12.2 documentation</title>
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -15,7 +15,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '2.12.1',
+        VERSION:     '2.12.2',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -29,9 +29,9 @@
     <script type="text/javascript" src="../_static/bootstrap-3.3.4/js/bootstrap.min.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
     <link rel="shortcut icon" href="../_static/logo_tiny_32.ico"/>
-    <link rel="top" title="bake 2.12.1 documentation" href="../index.html" />
+    <link rel="top" title="bake 2.12.2 documentation" href="../index.html" />
     <link rel="next" title="Install bake" href="../install/install_bake.html" />
-    <link rel="prev" title="bake 2.12.1" href="../index.html" />
+    <link rel="prev" title="bake 2.12.2" href="../index.html" />
 <meta charset='utf-8'>
 <meta http-equiv='X-UA-Compatible' content='IE=edge,chrome=1'>
 <meta name='viewport' content='width=device-width, initial-scale=1.0, maximum-scale=1'>
@@ -108,7 +108,7 @@
   <li>
-    <a href="../index.html" title="Previous Chapter: bake 2.12.1"><span class="glyphicon glyphicon-chevron-left visible-sm"></span><span class="hidden-sm hidden-tablet">&laquo; bake 2.12.1</span>
+    <a href="../index.html" title="Previous Chapter: bake 2.12.2"><span class="glyphicon glyphicon-chevron-left visible-sm"></span><span class="hidden-sm hidden-tablet">&laquo; bake 2.12.2</span>
     </a>
   </li>
   <li>

data/lib/bake/config/loader.rb CHANGED

@@ -90,10 +90,18 @@ module Bake
         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

data/lib/bake/libElement.rb CHANGED

@@ -51,10 +51,12 @@ module Bake
       prefix = nil
-      if block.library
-        adaptedPath, prefix = adaptPath(block.library.archive_name, block, prefix)
-        @@linker_libs_array << adaptedPath
-        @@source_libraries << adaptedPath
+      if block.library
+        if (not block.library.compileBlock.objects.empty?) or block.library.compileBlock.calcSources(true)
+          adaptedPath, prefix = adaptPath(block.library.archive_name, block, prefix)
+          @@linker_libs_array << adaptedPath
+          @@source_libraries << adaptedPath
+        end
       end
       block.lib_elements.each_key.sort.each do |line_num|

data/lib/bake/mergeConfig.rb CHANGED

@@ -13,13 +13,13 @@ module Bake
         ct.compiler.each do |cc|
           if cc.ctype == pc.ctype
             found = true
-            cc.setFlags(pc.flags + cc.flags)
-            cc.setDefine(pc.define + cc.define)
+            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(pc.internalDefines)
+              cc.setInternalDefines(clone(pc.internalDefines))
             end
             if cc.command == "" and pc.command != ""
-              cc.setCommand(pc.command)
+              cc.setCommand(clone(pc.command))
             end
           end
         end
@@ -28,105 +28,112 @@ module Bake
       if not pt.archiver.nil?
         if (ct.archiver.nil?)
-          ct.setArchiver(pt.archiver)
+          ct.setArchiver(clone(pt.archiver))
         else
           if ct.archiver.command == "" and pt.archiver.command != ""
-            ct.archiver.setCommand(pt.archiver.command)
+            ct.archiver.setCommand(clone(pt.archiver.command))
           end
-          ct.archiver.setFlags(pt.archiver.flags + ct.archiver.flags)
+          ct.archiver.setFlags(clone(pt.archiver.flags) + ct.archiver.flags)
         end
       end
       if not pt.linker.nil?
         if (ct.linker.nil?)
-          ct.setLinker(pt.linker)
+          ct.setLinker(clone(pt.linker))
         else
           if ct.linker.command == "" and pt.linker.command != ""
-            ct.linker.setCommand(pt.linker.command)
+            ct.linker.setCommand(clone(pt.linker.command))
           end
-          ct.linker.setFlags(pt.linker.flags + ct.linker.flags)
-          ct.linker.setLibprefixflags(pt.linker.libprefixflags + ct.linker.libprefixflags)
-          ct.linker.setLibpostfixflags(pt.linker.libpostfixflags + ct.linker.libpostfixflags)
+          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)
         end
       end
       if ct.outputDir == "" and pt.outputDir != ""
-        ct.setOutputDir(pt.outputDir)
+        ct.setOutputDir(clone(pt.outputDir))
       end
       if ct.docu.nil? and not pt.docu.nil?
-        ct.setDocu(pt.docu)
+        ct.setDocu(clone(pt.docu))
       end
-      ct.setLintPolicy(pt.lintPolicy + ct.lintPolicy)
+      ct.setLintPolicy(clone(pt.lintPolicy) + ct.lintPolicy)
       if (isDefault)
         if ct.basedOn == "" and pt.basedOn != ""
-          ct.setBasedOn(pt.basedOn)
+          ct.setBasedOn(clone(pt.basedOn))
         end
         if pt.eclipseOrder # is that a good idea?
-          ct.setEclipseOrder(pt.eclipseOrder)
+          ct.setEclipseOrder(clone(pt.eclipseOrder))
         end
         if ct.internalIncludes.nil? and not pt.internalIncludes.nil?
-          ct.setInternalIncludes(pt.internalIncludes)
+          ct.setInternalIncludes(clone(pt.internalIncludes))
         end
       end
     end
     def manipulateLineNumbers(ar)
-      ar.each { |l| l.line_number -= 1000000 if l.line_number > 0 }
+      ar.each { |l| l.line_number -= 100000  }
+    end
+    def clone(obj)
+      Marshal.load(Marshal.dump(obj))
     end
     def merge()
       # Valid for all config types
-      deps = @parent.dependency
+      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(@parent.set + @child.set)
+      @child.setSet(clone(@parent.set) + @child.set)
-      manipulateLineNumbers(@parent.exLib)
-      manipulateLineNumbers(@parent.exLibSearchPath)
-      manipulateLineNumbers(@parent.userLibrary)
+      cExLib = clone(@parent.exLib)
+      cExLibSearchPath = clone(@parent.exLibSearchPath)
+      cUserLibrary = clone(@parent.userLibrary)
+      manipulateLineNumbers(cExLib)
+      manipulateLineNumbers(cExLibSearchPath)
+      manipulateLineNumbers(cUserLibrary)
-      @child.setExLib(@parent.exLib           + @child.exLib)
-      @child.setExLibSearchPath(@parent.exLibSearchPath + @child.exLibSearchPath)
-      @child.setUserLibrary(@parent.userLibrary     + @child.userLibrary)
+      @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(@parent.startupSteps)
+          @child.setStartupSteps(clone(@parent.startupSteps))
         else
-          @child.startupSteps.setStep(@parent.startupSteps.step + @child.startupSteps.step)
+          @child.startupSteps.setStep(clone(@parent.startupSteps.step) + @child.startupSteps.step)
         end
       end
       if not @parent.preSteps.nil?
         if (@child.preSteps.nil?)
-          @child.setPreSteps(@parent.preSteps)
+          @child.setPreSteps(clone(@parent.preSteps))
         else
-          @child.preSteps.setStep(@parent.preSteps.step + @child.preSteps.step)
+          @child.preSteps.setStep(clone(@parent.preSteps.step) + @child.preSteps.step)
         end
       end
       if not @parent.postSteps.nil?
         if (@child.postSteps.nil?)
-          @child.setPostSteps(@parent.postSteps)
+          @child.setPostSteps(clone(@parent.postSteps))
         else
-          @child.postSteps.setStep(@parent.postSteps.step + @child.postSteps.step)
+          @child.postSteps.setStep(clone(@parent.postSteps.step) + @child.postSteps.step)
         end
       end
       if not @parent.exitSteps.nil?
         if (@child.exitSteps.nil?)
-          @child.setExitSteps(@parent.exitSteps)
+          @child.setExitSteps(clone(@parent.exitSteps))
         else
-          @child.exitSteps.setStep(@parent.exitSteps.step + @child.exitSteps.step)
+          @child.exitSteps.setStep(clone(@parent.exitSteps.step) + @child.exitSteps.step)
         end
       end
@@ -135,7 +142,7 @@ module Bake
       if not pt.nil?
         if (ct.nil?)
-          @child.setDefaultToolchain(pt)
+          @child.setDefaultToolchain(clone(pt))
         else
           mergeToolchain(pt,ct,true)
         end
@@ -146,7 +153,7 @@ module Bake
       if not pt.nil?
         if (ct.nil?)
-          @child.setToolchain(pt)
+          @child.setToolchain(clone(pt))
         else
           mergeToolchain(pt,ct,false)
         end
@@ -155,23 +162,23 @@ module Bake
       # Valid for custom config
       if (Metamodel::CustomConfig === @child && Metamodel::CustomConfig === @parent)
-        @child.setStep(@parent.step) if @child.step.nil? and not @parent.step.nil?
+        @child.setStep(clone(@parent.step)) if @child.step.nil? and not @parent.step.nil?
       end
       # Valid for library and exe config
       if ((Metamodel::LibraryConfig === @child || Metamodel::ExecutableConfig === @child) && (Metamodel::LibraryConfig === @parent || Metamodel::ExecutableConfig === @parent))
-        @child.setFiles(@parent.files + @child.files)
-        @child.setExcludeFiles(@parent.excludeFiles + @child.excludeFiles)
-        @child.setIncludeDir(@parent.includeDir + @child.includeDir)
+        @child.setFiles(clone(@parent.files) + @child.files)
+        @child.setExcludeFiles(clone(@parent.excludeFiles) + @child.excludeFiles)
+        @child.setIncludeDir(clone(@parent.includeDir) + @child.includeDir)
       end
       # Valid for exe config
       if (Metamodel::ExecutableConfig === @child && Metamodel::ExecutableConfig === @parent)
-        @child.setLinkerScript(@parent.linkerScript) if @child.linkerScript.nil? and not @parent.linkerScript.nil?
-        @child.setArtifactName(@parent.artifactName) if @child.artifactName.nil? and not @parent.artifactName.nil?
-        @child.setMapFile(@parent.mapFile) if @child.mapFile.nil?  and not @parent.mapFile.nil?
+        @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

data/lib/bake/model/metamodel.rb CHANGED

@@ -123,6 +123,7 @@ module Bake
       class IncludeDir < ModelElement
         has_attr 'name', String, :defaultValueLiteral => ""
         has_attr 'infix', String, :defaultValueLiteral => ""
+        has_attr 'inject', String, :defaultValueLiteral => ""
         has_attr 'inherit', Boolean, :defaultValueLiteral => "false"
       end

data/lib/blocks/blockBase.rb CHANGED

@@ -56,7 +56,7 @@ module Bake
         cmdTime = File.mtime(cmdLineFile)
         return "because config file has been changed" if cmdTime < File.mtime(@config.file_name)
         return "because DefaultToolchain has been changed" if cmdTime < defaultToolchainTime
-        return "because command line has been changed (IncludeDir inherit/infix, environment variables, ...)"
+        return "because command line has been changed (IncludeDir inherit/inject, environment variables, ...)"
       end
       def self.isCmdLineEqual?(cmd, cmdLineFile)

data/lib/blocks/compile.rb CHANGED

@@ -345,62 +345,64 @@ module Bake
       end
       def calcSources(cleaning = false)
-        @source_files = []
-        exclude_files = Set.new
-        @config.excludeFiles.each do |p|
-          Dir.glob(p.name).each {|f| exclude_files << f}
-        end
-        source_files = Set.new
-        @config.files.each do |sources|
-          p = sources.name
-          res = Dir.glob(p).sort
-          if res.length == 0 and cleaning == false
-            if not p.include?"*" and not p.include?"?"
-              Bake.formatter.printError("Source file '#{p}' not found", sources)
-              raise SystemCommandFailed.new
-            elsif Bake.options.verbose >= 1
-              Bake.formatter.printInfo("Source file pattern '#{p}' does not match to any file", sources)
-            end
-          end
-          res.each do |f|
-            next if exclude_files.include?(f)
-            source_files << f
-          end
-        end
-        if Bake.options.filename
-          source_files.keep_if do |source|
-            source.include?Bake.options.filename
+        Dir.chdir(@projectDir) do
+          @source_files = []
+          exclude_files = Set.new
+          @config.excludeFiles.each do |p|
+            Dir.glob(p.name).each {|f| exclude_files << f}
           end
-          if source_files.length == 0 and cleaning == false
-            Bake.formatter.printInfo("#{Bake.options.filename} does not match to any source", @config)
+          source_files = Set.new
+          @config.files.each do |sources|
+            p = sources.name
+            res = Dir.glob(p).sort
+            if res.length == 0 and cleaning == false
+              if not p.include?"*" and not p.include?"?"
+                Bake.formatter.printError("Source file '#{p}' not found", sources)
+                raise SystemCommandFailed.new
+              elsif Bake.options.verbose >= 1
+                Bake.formatter.printInfo("Source file pattern '#{p}' does not match to any file", sources)
+              end
+            end
+            res.each do |f|
+              next if exclude_files.include?(f)
+              source_files << f
+            end
           end
-        end
-        @source_files = source_files.sort.to_a
-        if Bake.options.eclipseOrder # directories reverse order, files in directories in alphabetical order
-          dirs = []
-          filemap = {}
-          @source_files.reverse.each do |o|
-            d = File.dirname(o)
-            if filemap.include?(d)
-              filemap[d] << o
-            else
-              filemap[d] = [o]
-              dirs << d
+          if Bake.options.filename
+            source_files.keep_if do |source|
+              source.include?Bake.options.filename
+            end
+            if source_files.length == 0 and cleaning == false
+              Bake.formatter.printInfo("#{Bake.options.filename} does not match to any source", @config)
             end
           end
-          @source_files = []
-          dirs.each do |d|
-            filemap[d].reverse.each do |f|
-              @source_files << f
+          @source_files = source_files.sort.to_a
+          if Bake.options.eclipseOrder # directories reverse order, files in directories in alphabetical order
+            dirs = []
+            filemap = {}
+            @source_files.reverse.each do |o|
+              d = File.dirname(o)
+              if filemap.include?(d)
+                filemap[d] << o
+              else
+                filemap[d] = [o]
+                dirs << d
+              end
+            end
+            @source_files = []
+            dirs.each do |d|
+              filemap[d].reverse.each do |f|
+                @source_files << f
+              end
             end
           end
         end
+        return (not @source_files.empty?)
       end
       def getSubBlocks(b, method)
@@ -452,7 +454,11 @@ module Bake
           if b.config.respond_to?("includeDir")
             include_list_front = []
             b.config.includeDir.each do |inc|
-              if inc.infix == "front"
+              if inc.inject == "front"
+                include_list_front << mapInclude(inc, b)
+              elsif inc.inject == "back"
+                @include_list << mapInclude(inc, b)
+              elsif inc.infix == "front"
                 include_list_front << mapInclude(inc, b)
               elsif inc.infix == "back"
                 @include_list << mapInclude(inc, b)