bake-toolkit 2.65.1 → 2.65.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 02d88a06a0d80fbac0d25a134ad432e52cd63ba7f99ba89f4623704a84be2abf
-  data.tar.gz: 35954f6e1a375a04c8959a9fbd67fc372208b5e79d159ea369260a6753e94e14
+  metadata.gz: e7940840d0fb9f3cc5a45d0445ccb05f7b1c18391a7dcc0ae48b1fb90c3e5915
+  data.tar.gz: 5298ad5317ae06506708e9db31bdc10e7ac98d1f56b98f078656f78cf67f299e
 SHA512:
-  metadata.gz: 94ff89a2f8b098e2ff5ac7c2b6737f9379bc499444ade76aee30829b06975093831b619e8b729f58ce62424f005b10ad9366c7039641e5fce0876f9fa460d6c1
-  data.tar.gz: 490fd16f8285638f1a882af9e74f3efda987a4c2cda40a22a45f0e428c571a63ba7c70f91291e0ee77668b60b1e341a04ea25e8b0153f864d2e47e7f9afa81ed
+  metadata.gz: ffefb7d0b223fb47ece543a0dab7ff405b845b9c5fb4bc5d281e79de23a85a91f8b5f79bce8868de8361ebf5a9571dfdd3adb345f8bacf6958a9f4179f27bd58
+  data.tar.gz: 578bdae05e43d4cde5c4e5443123850a014373a8e27ed7f225e1f0ed7a749e9c04d65c440715b6255c87123094863df1e242ae523f31a6acace005eb36b3bc1a

data/lib/bake/model/loader.rb

@@ -113,7 +113,8 @@ module Bake
           applyFilterOnElement(elem)
         end
       end
-      toRemove.each { |r| r.parent = nil }
+      toRemove.each { |r| r.parent = nil if r.respond_to?(:parent=) }
+      return toRemove
     end
 
     def applyFilterOnElement(elem)
@@ -167,7 +168,8 @@ module Bake
         ExitHelper.exit(1)
       end
 
-      applyFilterOnArray(frag.root_elements)
+      tor = applyFilterOnArray(frag.root_elements)
+      frag.root_elements.delete_if {|re| tor.include?(re)}
 
       return frag
 

data/lib/common/version.rb

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

data/lib/tocxx.rb

@@ -894,10 +894,13 @@ module Bake
                           o = b.object_files[s]
                           dep_filename = b.calcDepFile(o, type)
                           dep_filename_conv = b.calcDepFileConv(dep_filename)
-                          File.readlines(File.expand_path(dep_filename_conv, b.projectDir)).map{|line| line.strip}.each do |dep|
-                            header = File.expand_path(dep, b.projectDir)
-                            if File.exist?(header)
-                              inCompilation << header
+                          fname = File.expand_path(dep_filename_conv, b.projectDir)
+                          if File.exist?(fname)
+                            File.readlines(fname).map{|line| line.strip}.each do |dep|
+                              header = File.expand_path(dep, b.projectDir)
+                              if File.exist?(header)
+                                inCompilation << header
+                              end
                             end
                           end
                         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bake-toolkit
 version: !ruby/object:Gem::Version
-  version: 2.65.1
+  version: 2.65.2
 platform: ruby
 authors:
 - Alexander Schaal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-07 00:00:00.000000000 Z
+date: 2020-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rtext