bake-toolkit 2.69.0 → 2.70.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9413bb4da104f832f080c5464af7fc78d3ce84a8e2117d94f0f4e6e17a396a80
-  data.tar.gz: 406602ea8421c97a5ec9c35900ac32a4b6ee18350c9e345d3b732e58b4767929
+  metadata.gz: 512387067bf3154e79bfe2993a33c20ab4b8527360b89e85105ed74cf9e724df
+  data.tar.gz: 017f9892593659a0c6567b51aec681751528f2b5de47ace6ef37d54944399a2d
 SHA512:
-  metadata.gz: ee29f4f63153ab875442aa3290081371fdab40b6db69ff054e37ebc0bff0ee0623a29448b6e3877ed2ec9739e3c522d6bb8fe185c0e840cbbde9eb70a9848b30
-  data.tar.gz: 6e54abc0d3c7622f83695202eeef4abe83042b6f027b9495d0659a6a69d3965b9123a3c6c1d357126e09d3e38d0124a0dd52e69b6c359d52ad28bf93ed919cf4
+  metadata.gz: 676bfebf96efab215d3744dc341ffdd6026df836b9797a4cf5a1d26acd264f2ad55718b99a27e57366b900bf721e8a195e4455d97f5884f94058cd1f5e3e65bc
+  data.tar.gz: af6d6ba478071e3c4ad5ffaf009e581bb42f160af73f8c8646a1f24e3ae97bbb661e00a12006fe1d305bab24046ff04b41bb5ce49596dd412829a1575b6acd4a

data/bin/bakery

@@ -112,7 +112,7 @@ module Bake
     p = File.dirname(bp.proj)
     pRel = File.rel_from_to_project(Dir.pwd, p, false)
     pRel = "." if pRel.empty?
-    cmd = (["-m", pRel, "-b", bp.conf] + bp.args.split + passedParams)
+    cmd = (["-m", pRel, "-b", bp.conf] + bp.args.split + passedParams + bp.args_end.split)
     cmdWithNum = "bakery #{currentRun} of #{maxRuns}: bake " + cmd.join(" ")
     puts "\n#{$stars}"
     Bake.formatter.printInfo(cmdWithNum)

data/lib/bake/config/loader.rb

@@ -143,6 +143,9 @@ module Bake
                 if !configHash.has_key?(name)
                   return adaptHash[name].any?{|ah| ah.match("")}
                 end
+                if name == "toolchain" && configHash[name] == [""]
+                  Bake.formatter.printWarning("Trying to adapt '#{config.name}' with 'toolchain == #{c.parent.toolchain}', but toolchain is not defined yet", c)
+                end
                 adaptHash[name].any? { |ah| configHash[name].any?{|ch| ah.match(ch)}}
               }
   

data/lib/bakery/buildPattern.rb

@@ -1,11 +1,12 @@
 module Bake
 
   class BuildPattern
-    attr_reader :proj, :conf, :args, :coll_p
-    def initialize(proj, conf, args, coll_p)
+    attr_reader :proj, :conf, :args, :args_end, :coll_p
+    def initialize(proj, conf, args, args_end, coll_p)
       @proj = proj
       @conf = conf
       @args = args
+      @args_end = args_end
       @coll_p = coll_p
     end
     def getId

data/lib/bakery/model/metamodel.rb

@@ -20,6 +20,7 @@ module Bake
       has_attr 'name', String, :defaultValueLiteral => ""
       has_attr 'config', String, :defaultValueLiteral => ""
       has_attr 'args', String, :defaultValueLiteral => ""
+      has_attr 'args_end', String, :defaultValueLiteral => ""
     end
     class Exclude < ModelElement
       has_attr 'name', String, :defaultValueLiteral => ""

data/lib/bakery/toBake.rb

@@ -38,7 +38,7 @@ module Bake
           Bake.formatter.printWarning("pattern does not match any project: #{p.name}", p)
         end
         projs.each do |f|
-          toBuildPattern << BuildPattern.new(f, "^"+p.config.gsub("*","(\\w*)")+"$", p.args, p)
+          toBuildPattern << BuildPattern.new(f, "^"+p.config.gsub("*","(\\w*)")+"$", p.args, p.args_end, p)
         end
       end
     end
@@ -51,7 +51,7 @@ module Bake
         res = c.gsub(/#.*/,"").match("\\s*(Library|Executable|Custom){1}Config\\s*\"?([\\w:-]*)\"?")
         if res
           if res[2].match(bp.conf) != nil
-            toBuild << BuildPattern.new(bp.proj, res[2], bp.args, nil)
+            toBuild << BuildPattern.new(bp.proj, res[2], bp.args, bp.args_end, nil)
             bp.coll_p.found
           end
         end

data/lib/common/version.rb

@@ -1,7 +1,7 @@
 module Bake
   class Version
     def self.number
-      "2.69.0"
+      "2.70.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.69.0
+  version: 2.70.0
 platform: ruby
 authors:
 - Alexander Schaal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-26 00:00:00.000000000 Z
+date: 2021-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rtext