bake-toolkit 2.61.0 → 2.62.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b7e3e8cf8a2ce67781a4f5701c0c7a3323ebe2d6b3a3b026bfd496655b3c545
-  data.tar.gz: 148d025bfbf226d78986655c586c6291c1f18c5f4925cc5c700324483db1ed58
+  metadata.gz: b32e4c31cf5d36f26b6f3287b4c31ec250b5f6ad49118d9b8823351fcccc7a63
+  data.tar.gz: d83e5c807aaa312b9ada14d0f330cf5b0177a7e78489ebd038f32c49c08caaf8
 SHA512:
-  metadata.gz: 0b9fe89d71c63358256e78d1d5aa196a7d6606361fe833dfd01169dbb520c327f62ba7cd4033505b84af3c9c7430f4f64d49fc2e677b9c0836b229d300246860
-  data.tar.gz: a4b40affee87172e2b69cbb03896b112999ff578bf49cc48f53e010f181e123aa0e301e4c0f0ae35529f1abce1f200d0593c519da69cc9e8a14ef92390855bc1
+  metadata.gz: f3fcbdebee31ec340a3967c11df66e905355551d7a32daa2646573c1e1b004bfcb5aab944bda38fe36bf04fe15b7c91d91948dc4822beb972b7503af72d2f092
+  data.tar.gz: 5981dcc38b1dd5f0001b0fd4218d247499a9ae840619ed851a22f61ba940f0db3e1e840491c393079910f207262b9ceab6464403c9ae8b41aff4599ffb7ea0ee

data/lib/blocks/blockBase.rb

@@ -131,7 +131,6 @@ module Bake
               if metadata_json = Bake.options.dev_features.include?("no-error-parser")
                 error_descs = []
                 console_output_full = x[0]
-                incList = []
               else
                 error_descs, console_output_full, incList = error_parser.scan_lines(x, @projectDir)
               end

data/lib/blocks/compile.rb

@@ -264,16 +264,17 @@ module Bake
           success = true
           consoleOutput = ""
           incList = nil
+
           if !Bake.options.diabCaseCheck
             success, consoleOutput = ProcessHelper.run(realCmd, false, false, nil, [0], @projectDir) if !Bake.options.dry
             incList = process_result(realCmd, consoleOutput, compiler[:ERROR_PARSER], nil, reason, success)
           end
 
-          if type != :ASM and not Bake.options.analyze and not Bake.options.prepro
+          if type != :ASM && !Bake.options.analyze && !Bake.options.prepro
             Dir.mutex.synchronize do
               if !Bake.options.diabCaseCheck
                 Dir.chdir(@projectDir) do
-                  incList = Compile.read_depfile(dep_filename, @projectDir, @block.tcs[:COMPILER][:DEP_FILE_SINGLE_LINE]) if incList.nil?
+                  incList = Compile.read_depfile(dep_filename, @projectDir, @block.tcs[:COMPILER][:DEP_FILE_SINGLE_LINE], compiler[:COMMAND]) if incList.nil?
                   Compile.write_depfile(source, incList, dep_filename_conv, @projectDir)
                 end
               end
@@ -291,7 +292,7 @@ module Bake
                       raise SystemCommandFailed.new
                     end
                     Dir.chdir(@projectDir) do
-                      incList = Compile.read_depfile(dep_filename, @projectDir, @block.tcs[:COMPILER][:DEP_FILE_SINGLE_LINE])
+                      incList = Compile.read_depfile(dep_filename, @projectDir, @block.tcs[:COMPILER][:DEP_FILE_SINGLE_LINE], compiler[:COMMAND])
                       Compile.write_depfile(source, incList, dep_filename_conv, @projectDir)
                     end
                     ergs = consoleOutput.scan(/# \d+ "([^"]+)" \d+/)
@@ -341,14 +342,12 @@ module Bake
             SyncOut.flushOutput()
           end
         end
-
-
-
       end
 
-      def self.read_depfile(dep_filename, projDir, lineType)
+      def self.read_depfile(dep_filename, projDir, lineType, command = "")
         deps = []
         begin
+          lineType = :single if command.include?("cafeCC")
           if lineType == :single
             File.readlines(dep_filename).each do |line|
               splitted = line.split(": ")

data/lib/common/version.rb

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

metadata

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