bake-toolkit 2.59.0 → 2.60.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f180513d1b93699bc796de737af3092d8f8fca946c4288f807f4457443249cd8
-  data.tar.gz: 3e9351c22a0b019c8898dd481d244111d8d57c58633375a23eacb14db437504d
+  metadata.gz: a05f5baab5566671c4deff626aceaea52a9b0d4274c03f9737823b3809039bb2
+  data.tar.gz: d407fbc0d01b0fded6b7453ac41446494725cfc575bfd472a77c2d4096738a82
 SHA512:
-  metadata.gz: 0d219c7ac0087e19df782494589127baafd9b22978d20ebaadd1a58b12936cec2c1de1447a1620413fd73b84d1edcf7e64e177cec5774032e047dc9f9770b799
-  data.tar.gz: d2c9e76821363aa6eca4d973c4d0f550f5f62c4a7fb1d08f676c07b8f5ad03ad812c3dd73f60f689c5a76646fc7676ec4b6dd3d64b969451ef8e9b46125469bf
+  metadata.gz: 7dc782d118b9fefd102ad6948dc4bfeb38ac7ac0cffcca4581719e994ad69927271523bd1a46472ed92573769754ca44af9c655c139e3ae4fa96a1887bd18862
+  data.tar.gz: e89c99ee42fd0602c6cdcc443ae3924b12af3a7e84ffe308486137ba1a77921bedd991d33a41fcf5e18681c932cda416a5388a9537a1bcae20785cbcc33351ff

data/lib/blocks/block.rb

@@ -23,7 +23,7 @@ module Bake
       @@threads = []
 
       attr_reader :lib_elements, :projectDir, :library, :config, :projectName, :configName, :prebuild, :output_dir, :tcs
-      attr_accessor :visited, :inDeps, :result, :bes
+      attr_accessor :visited, :inDeps, :result, :bes, :besDirect
 
       def startupSteps
         @startupSteps ||= []
@@ -82,6 +82,7 @@ module Bake
         @result = true
         @tcs = tcs
         @bes = []
+        @besDirect = []
         @lib_elements = []
 
         calcOutputDir
@@ -278,9 +279,11 @@ module Bake
       end
 
       def callDeps(method)
+        return true if Bake.options.project
         depResult = true
-        dependencies.each do |dep|
-          depResult = (ALL_BLOCKS[dep].send(method) and depResult)
+        bes.each do |dep|
+          next if Metamodel::IncludeDir === dep
+          depResult = (ALL_BLOCKS[dep.name+","+dep.config].send(method) and depResult)
           break if (!depResult) && Bake.options.stopOnFirstError
         end
         return depResult

data/lib/common/version.rb

@@ -1,7 +1,7 @@
 module Bake
   class Version
     def self.number
-      "2.59.0"
+      "2.60.0"
     end
 
     def self.printBakeVersion(ry = "")

data/lib/tocxx.rb

@@ -156,6 +156,7 @@ module Bake
       block.visited = true
 
       block.bes = []
+      block.besDirect = []
       block.config.depInc.each do |dep|
         if (Metamodel::Dependency === dep)
           @referencedConfigs[dep.name].each do |configRef|
@@ -175,6 +176,7 @@ module Bake
                 block.bes += subDeps
               end
               block.bes << dep
+              block.besDirect << dep
               break
             end
           end
@@ -331,10 +333,10 @@ module Bake
               difr2 = difr
               diba2 = diba
             end
-          
             fde = Blocks::ALL_BLOCKS[dep.name+","+dep.config]
             l1 = fde.bes.length 
             fde.bes = (difr2 + fde.bes + diba2).uniq # .select{|d| !(Metamodel::Dependency===d) || d.name != dep.name || d.config != dep.config }
+            fde.besDirect = (difr2 + fde.besDirect + diba2).uniq
             l2 = fde.bes.length
             counter += 1 if (l2 != l1)
           end
@@ -410,13 +412,15 @@ module Bake
           @referencedConfigs.each do |projName, configs|
             depsToProj = []
             configs.each do |config|
-              config.dependency.each do |d|
+              the_c = Blocks::ALL_BLOCKS[config.parent.name+","+config.name]
+              the_c.besDirect.each do |d|
+                next if Metamodel::IncludeDir === d
                 if onlyProjectName
                   next if config.parent.name != onlyProjectName && d.name != onlyProjectName
                   if onlyConfigName
                     leftSide  = config.name        == onlyConfigName && config.parent.name == onlyProjectName
                     rightSide = d.config           == onlyConfigName && d.name             == onlyProjectName
-                    next if not leftSide and not rightSide
+                    next if !leftSide && !rightSide
                   end
                 end
                 if Bake.options.dotShowProjOnly

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bake-toolkit
 version: !ruby/object:Gem::Version
-  version: 2.59.0
+  version: 2.60.0
 platform: ruby
 authors:
 - Alexander Schaal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-06 00:00:00.000000000 Z
+date: 2020-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rtext