bake-toolkit 2.64.0 → 2.64.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 459f3b345548e018870f1c2a341e83fcdc538d980d87ef672bb1da409638f24f
-  data.tar.gz: 7f9d86b3570dd9decaf74842d6c41fdd3eb4a7e8afd5d6de7b6212c46e63bff7
+  metadata.gz: dd55725b65ac6296092196df2fe85d8dead231341649db552cac76415643ba54
+  data.tar.gz: c8fc064f5c929e3968218bde7aee9b2548ee00bfcc9d55bc762f0e1ab917f0da
 SHA512:
-  metadata.gz: 9fd1f9557d04c089a791cfb4eea47883a96ecede424ae428515db3d0153f93974dff1b7c52b7267942bef993c03ebf2df8e908c07b98463afd47e3d401710f3f
-  data.tar.gz: 5170787b33c63a9e11aeb08d33d221f2c75f91febe2ea10248f78445eac18b5cc911780d46b6febe677e4c4d4493ace519cc48d8fd5bff73d29eb12efa038c50
+  metadata.gz: 8cad40c4ee60207533b867a29b53fb6efa8e0d5d12d1f9d929535fe5a682bc08a585ea0c64b5af3b3bcdcb80b920b3a924c460a2441ab33e1edda790bccd5b70
+  data.tar.gz: 577f622dc1d27c4abfa72b0ec484ffe2054f4bc75e67ae1afb4e48c598447d928ec463e6bd4cf3126fed0e9eeee743436852f1741cd54e7fa1d7809670256ccc

data/lib/blocks/compile.rb

@@ -52,7 +52,7 @@ module Bake
 
     class Compile < BlockBase
 
-      attr_reader :objects, :source_files, :include_list, :source_files_ignored_in_lib, :object_files_ignored_in_lib
+      attr_reader :objects, :source_files, :source_files_compiled, :include_list, :source_files_ignored_in_lib, :object_files_ignored_in_lib
 
       def mutex
         @mutex ||= Mutex.new
@@ -426,6 +426,7 @@ module Bake
           Utils.gitIgnore(odir) if !Bake.options.dry
 
           fileListBlock = Set.new if Bake.options.filelist
+          @source_files_compiled = @source_files.dup
           compileJobs = Multithread::Jobs.new(@source_files) do |jobs|
             while source = jobs.get_next_or_nil do
 
@@ -544,7 +545,7 @@ module Bake
       end
 
       def calcSources(cleaning = false, keep = false)
-        return @source_files if @source_files and not @source_files.empty?
+        return @source_files if @source_files && !@source_files.empty?
         @source_files = []
         @source_files_ignored_in_lib = []
         @source_files_link_directly = []

data/lib/common/version.rb

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

data/lib/tocxx.rb

@@ -885,8 +885,8 @@ module Bake
                 inCompilation = Set.new
                 Blocks::ALL_BLOCKS.each do |name,block|
                   block.mainSteps.each do |b|
-                    if Blocks::Compile === b
-                      b.source_files.each do |s|
+                    if Blocks::Compile === b && !b.source_files_compiled.nil?
+                      b.source_files_compiled.each do |s|
                         inCompilation << File.expand_path(s, b.projectDir)
                         type = b.get_source_type(s)
                         if type != :ASM

metadata

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