bake-toolkit 2.57.0 → 2.58.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de8aa9824c1fc601919ff68ed00c587802372dd08151ea455f1c35db78c82bcc
-  data.tar.gz: bf24308e90685510c1a3177d5aa8b862cedb1638a7a54490807bde24e0111d53
+  metadata.gz: 92addd494a772c8a32120eaa64a9da77b6619d8e76186884a16e412c1e5fd572
+  data.tar.gz: 5c977f46064f6ccdaf85fa2aed7f4edb7e8110a356c1baa5964bc253466f7f47
 SHA512:
-  metadata.gz: bd49acd8b6184ce3c1cbd2d8767082481b4a2c34731fa8287777335dc79a5e35cdbd389b0e8d7c74b16ce919a288ac3131ed3979d7f92565ff1cb1626bded74b
-  data.tar.gz: 150e063635569071d3f3c9ff26a2f30ef777c3806b9fd0d341becc9b255da30ac743842b30f412db18b8e9a2981d012a06b527e772dd0de441a38f71ff551d2b
+  metadata.gz: 4697797cb5e752c782cf8fe5067a1483b95863fbe46847f53eea17392e66ffc16c489bd53bd78c5a288b8ef2a38f2ef58be42dd8aed405fdca8de82531535537
+  data.tar.gz: ad4435464ba38b3a8fa09e92dd79a980f31dfe8ca8880aa976e6ceeb27ccf6e66a9ee44ae2c41906b8312b40289234dc0efc78fda9c0300df3b7cfe0da463f81

data/lib/bake/options/options.rb

@@ -344,6 +344,7 @@ module Bake
     end
 
     def set_threads(num)
+      return if num == nil # -j without number shall behave the same as not set
       checkNum(num)
       @threads = String === num ? num.to_i : num
       if @threads <= 0

data/lib/blocks/compile.rb

@@ -561,7 +561,14 @@ module Bake
             icf = integrateCompilerFile(Utils.deep_copy(@block.tcs),sources)
           end
           res.each do |f|
-            @fileTcs[f] = icf if !@fileTcs.has_key?(f)
+            if @fileTcs.has_key?(f)
+              singleFile = res.length == 1 && res[0] == pr
+              if singleFile && icf
+                Bake.formatter.printWarning("Flags/Defines for '#{sources.name}' will be ignored", sources)
+              end
+            else
+              @fileTcs[f] = icf
+            end
             next if exclude_files.include?(f)
             next if source_files.include?(f)
             source_files << f

data/lib/blocks/executable.rb

@@ -180,7 +180,7 @@ module Bake
           else
             ToCxx.linkBlock
 
-            BlockBase.prepareOutput(@exe_name, @block)
+            BlockBase.prepareOutput(File.expand_path(@exe_name,@projectDir), @block)
 
             printCmd(cmdLinePrint, "Linking   #{@projectName} (#{@config.name}): #{@exe_name}", reason, false)
             BlockBase.writeCmdLineFile(cmd, cmdLineFile)

data/lib/common/options/parser.rb

@@ -76,12 +76,16 @@ module Bake
           else
             option, inPlaceArg = get_block(arg)
             hasArgument = (pos+1 < @argv.length and @argv[pos+1][0] != "-")
-            if option.parameters.length == 3 && (hasArgument || inPlaceArg)
-              if inPlaceArg
-                option.call(inPlaceArg, nil, nil)
+            if option.parameters.length == 3
+              if (hasArgument || inPlaceArg)
+                if inPlaceArg
+                  option.call(inPlaceArg, nil, nil)
+                else
+                  option.call(@argv[pos+1], nil, nil) # do not use inplace value
+                  pos = pos + 1
+                end
               else
-                option.call(@argv[pos+1], nil, nil) # do not use inplace value
-                pos = pos + 1
+                option.call(nil, nil, nil)
               end
             elsif option.parameters.length == 2
               if hasArgument

data/lib/common/version.rb

@@ -1,7 +1,7 @@
 module Bake
   class Version
     def self.number
-      "2.57.0"
+      "2.58.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.57.0
+  version: 2.58.0
 platform: ruby
 authors:
 - Alexander Schaal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-24 00:00:00.000000000 Z
+date: 2020-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rtext