RubyGems - bake-toolkit - Versions diffs - 2.10.3 → 2.11.0 - Mend

bake-toolkit 2.10.3 → 2.11.0

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 (14) hide show

checksums.yaml CHANGED

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ffeb560153458991dc570f4bc2593cb71224438
-  data.tar.gz: fb35507be4a8527f87ff3b0e5f0d851d05de3ff8
+  metadata.gz: a06224eab0b59f7915bdd8ebeb389470f8261a4a
+  data.tar.gz: f57931da0df7084b81af5db918a826c2b3c146ba
 SHA512:
-  metadata.gz: bee037b5e82b3fcb85179ec4b190f19238fdf61d4c664b50a27d4a19a0963462cb4bca93a3cfc7338d2ecebff2fb8cbb235b61936c21d19fe08840824536f232
-  data.tar.gz: 4f561295d1dfba867a7dbb097914e784a5047dfa511fe3f424adbbfd8f86ce5f958795a2634c9bc84076e539358b264d56a9b467854b1fd37f30a2d9d594adf7
+  metadata.gz: 96214b36c6587ae06530ec7f6670e42460092fc913916a8982645f4fdce06db0c40c3da7d095f6389308cdb03fd28df13e7a58d1242b161745074aeb36e2b02a
+  data.tar.gz: 1619512c3c3e6260487069944b32218e7e0792bdb3f70c29f4b25de354bcd07af79c2545ef92e9fe2ee5889ad235c3a09be6f2ed8be4eeff55babd95205a4fd0

data/doc/further/change.html CHANGED

@@ -7,6 +7,14 @@
 <body>
 <h1>Changelog</h1>
+July 31, 2015 - bake-toolkit 2.11.0<br>
+<ul>
+<li><b>Added: new parameters for <i>includeDir</i>: <i>inherit</i> and <i>infix</i></b>
+<li><b>Added: dependency output for conversion tool</b>
+<li><b>Bugfix: makefile flags where not used when cleaning the workspace</b>
+</ul>
 July 6, 2015 - bake-toolkit 2.10.3<br>
 <ul>
 <li><b>Bugfix: Build stopped unintentionally when using -r</b>

data/doc/index.html CHANGED

@@ -74,7 +74,7 @@ bake is used to build software <font color="#009900"><b>fast</b></font> and <fon
 <p>
 <hr>
-<table width="100%" border="0"><tr><td align="left">Described bake-toolkit version: 2.10.3</td><td align="right">July 6, 2015</td></tr></table>
+<table width="100%" border="0"><tr><td align="left">Described bake-toolkit version: 2.11.0</td><td align="right">July 31, 2015</td></tr></table>
 </body>

data/doc/syntax/syntax.html CHANGED

@@ -163,7 +163,7 @@ z-index: 100;
 &nbsp; &nbsp; &nbsp; <span class="help" onMouseover="showFilesDefine()" onMouseout="notip()">Define</span> &#60;define&#62;<br>
 &nbsp; &nbsp; }<br>
 &nbsp; &nbsp; <span class="help" onMouseover="showExcludeFiles()" onMouseout="notip()">ExcludeFiles</span> &#60;pattern&#62;<br>
-&nbsp; &nbsp; <span class="help" onMouseover="showIncludeDir()" onMouseout="notip()">IncludeDir</span> &#60;dir&#62;<br>
+&nbsp; &nbsp; <span class="help" onMouseover="showIncludeDir()" onMouseout="notip()">IncludeDir</span> &#60;dir&#62;, <span class="help" onMouseover="showInherit()" onMouseout="notip()">inherit</span>: true|false, <span class="help" onMouseover="showInfix()" onMouseout="notip()">infix</span>: front|back<br>
 </span><br></span>
@@ -465,6 +465,16 @@ function showIncludeDir() {
   ddrivetip("IncludeDir", "No","0..n","-",str)
 }
+function showInherit() {
+  str = 'Inherits the include to all projects, which depend on this project.'
+  ddrivetip("inherit", "No","0..1","false",str)
+}
+function showInfix() {
+  str = 'Injects the include path to all childs, either at the front (e.g. for mocking code) or at the end.'
+  ddrivetip("infix", "No","0..1","-",str)
+}
 function showSet() {
   str = 'Sets a variable for this and all dependent projects.<br>'+
   'The variable can be a simple value or the result of a cmd, e.g. \"cat myVar.txt\".'

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

@@ -88,6 +88,13 @@ module Bake
             end
           end
         end
+        config.includeDir.each do |inc|
+          if not ["front", "back", ""].include?inc.infix
+            Bake.formatter.printError("infix of IncludeDir must be 'front' or 'back'", inc)
+            ExitHelper.exit(1)
+          end
+        end if config.respond_to?("includeDir")
       end
       configs
     end

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

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

data/lib/blocks/block.rb CHANGED

@@ -15,7 +15,7 @@ module Bake
     class Block
-      attr_reader :lib_elements, :projectDir, :library, :config
+      attr_reader :lib_elements, :projectDir, :library, :config, :projectName
       attr_accessor :visited, :inDeps, :result
       def startupSteps
@@ -41,7 +41,15 @@ module Bake
       def dependencies
         @dependencies ||= []
       end
+      def childs
+        @childs ||= []
+      end
+      def parents
+        @parents ||= []
+      end
       def set_library(library)
         @library = library
       end

data/lib/blocks/blockBase.rb CHANGED

@@ -56,8 +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 environment variables used for toolchain have been changed" if (Bake.options.envToolchain)
-        false
+        return "because command line has been changed (IncludeDir inherit/infix, environment variables, ...)"
       end
       def self.isCmdLineEqual?(cmd, cmdLineFile)

data/lib/blocks/compile.rb CHANGED

@@ -119,6 +119,7 @@ module Bake
         reason = needed?(source, object, type, dep_filename_conv)
         if not reason
           cmdLineCheck = true
+          # currently this returns always != nil
           reason = config_changed?(cmdLineFile)
         end
         return true unless reason
@@ -402,10 +403,54 @@ module Bake
       end
+      def getSubBlocks(b, method)
+        b.send(method).each do |child_b|
+          if not @otherBlocks.include?child_b
+            @otherBlocks << child_b
+            getSubBlocks(child_b, method)
+          end
+        end
+      end
+      def getBlocks(method)
+        @otherBlocks = []
+        getSubBlocks(@block, method)
+        return @otherBlocks
+      end
+      def mapInclude(inc, projDir)
+        (inc.name == "___ROOTS___") ? (Bake.options.roots.map { |r| File.rel_from_to_project(projDir,r,false) }) : @block.convPath(inc)
+      end
       def calcIncludes
         @include_list = @config.includeDir.uniq.map do |dir|
-          (dir.name == "___ROOTS___") ? (Bake.options.roots.map { |r| File.rel_from_to_project(@projectDir,r,false) }) : @block.convPath(dir)
-        end.flatten.uniq
+          mapInclude(dir, @projectDir)
+        end
+        getBlocks(:childs).each do |b|
+          b.config.includeDir.each do |inc|
+            if inc.inherit == true
+              @include_list << mapInclude(inc, b.config.parent.get_project_dir)
+            end
+          end if b.config.respond_to?("includeDir")
+        end
+        getBlocks(:parents).each do |b|
+          if b.config.respond_to?("includeDir")
+            include_list_front = []
+            b.config.includeDir.each do |inc|
+              if inc.infix == "front"
+                include_list_front << mapInclude(inc, b.config.parent.get_project_dir)
+              elsif inc.infix == "back"
+                @include_list << mapInclude(inc, b.config.parent.get_project_dir)
+              end
+            end
+            @include_list = include_list_front + @include_list
+          end
+        end
+        @include_list = @include_list.flatten.uniq
         @include_array = {}
         [:CPP, :C, :ASM].each do |type|

data/lib/blocks/convert.rb CHANGED

@@ -21,6 +21,10 @@ module Bake
           @include_list.each { |s| puts "  #{s}" }
           puts " BAKE_DEFINES"
           (@tcs[:COMPILER][:CPP][:DEFINES] + @tcs[:COMPILER][:C][:DEFINES] + @tcs[:COMPILER][:ASM][:DEFINES]).uniq.each { |s| puts "  #{s}" }
+          puts " BAKE_DEPENDENCIES"
+          @block.childs.each { |dep| puts "  #{dep.projectName}" }
+          puts " BAKE_DEPENDENCIES_FILTERED"
+          @block.childs.each { |dep| puts "  #{dep.projectName}" unless @projectName == dep.projectName or dep.projectName == "gmock" or dep.projectName == "gtest" }
           puts "END_INFO"
         end
         return true

data/lib/blocks/makefile.rb CHANGED

@@ -36,7 +36,8 @@ module Bake
       def calcCleanLine
         @cleanLine = remove_empty_strings_and_join([
-          MAKE_COMMAND, MAKE_CLEAN,
+          MAKE_COMMAND, MAKE_CLEAN,
+          @flags,
           MAKE_DIR_FLAG,  File.dirname(@makefile),
           MAKE_FILE_FLAG, File.basename(@makefile),
           @path_to])

data/lib/common/version.rb CHANGED

@@ -1,7 +1,7 @@
 module Bake
   class Version
     def self.number
-      "2.10.3"
+      "2.11.0"
     end
   end

data/lib/tocxx.rb CHANGED

@@ -91,24 +91,47 @@ module Bake
       end if configSteps
     end
-    def addDependencies(block, configDeps)
-      configDeps.each do |dep|
-        @loadedConfig.referencedConfigs[dep.name].each do |config|
-          if config.name == dep.config
-            block.dependencies << config.qname
+    def addDependencies(block, config)
+      config.dependency.each do |dep|
+        @loadedConfig.referencedConfigs[dep.name].each do |configRef|
+          if configRef.name == dep.config
+            block.dependencies << configRef.qname if not Bake.options.project# and not Bake.options.filename
+            blockRef = Blocks::ALL_BLOCKS[configRef.qname]
+            block.childs << blockRef
+            blockRef.parents << block
             break
           end
         end
       end
     end
-    def convert2bb
+    def makeBlocks
       @loadedConfig.referencedConfigs.each do |projName, configs|
         configs.each do |config|
           block = Blocks::Block.new(config, @loadedConfig.referencedConfigs)
           Blocks::ALL_BLOCKS[config.qname] = block
+        end
+      end
+    end
+    def makeGraph
+        @loadedConfig.referencedConfigs.each do |projName, configs|
+          configs.each do |config|
+            block = Blocks::ALL_BLOCKS[config.qname]
+              addDependencies(block, config)
+          end
+        end
+        Blocks::ALL_BLOCKS.each do |name,block|
+          block.dependencies.uniq!
+          block.childs.uniq!
+          block.parents.uniq!
+        end
+    end
+    def convert2bb
+      @loadedConfig.referencedConfigs.each do |projName, configs|
+        configs.each do |config|
+          block = Blocks::ALL_BLOCKS[config.qname]
           addSteps(block, block.startupSteps,  config.startupSteps)
           addSteps(block, block.exitSteps,  config.exitSteps)
@@ -141,9 +164,7 @@ module Bake
             end
           end
-          if not Bake.options.project# and not Bake.options.filename
-            addDependencies(block, config.dependency)
-          end
         end
       end
@@ -284,6 +305,8 @@ module Bake
         @@linkBlock = 0
+        makeBlocks
+        makeGraph
         convert2bb
         Blocks::Show.includes if Bake.options.show_includes

metadata CHANGED

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bake-toolkit
 version: !ruby/object:Gem::Version
-  version: 2.10.3
+  version: 2.11.0
 platform: ruby
 authors:
 - Alexander Schaal
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-07-06 00:00:00.000000000 Z
+date: 2015-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rtext