bake-toolkit 2.69.0 → 2.70.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/bin/bakery +1 -1
- data/lib/bake/config/loader.rb +3 -0
- data/lib/bakery/buildPattern.rb +3 -2
- data/lib/bakery/model/metamodel.rb +1 -0
- data/lib/bakery/toBake.rb +2 -2
- data/lib/common/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 512387067bf3154e79bfe2993a33c20ab4b8527360b89e85105ed74cf9e724df
|
4
|
+
data.tar.gz: 017f9892593659a0c6567b51aec681751528f2b5de47ace6ef37d54944399a2d
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 676bfebf96efab215d3744dc341ffdd6026df836b9797a4cf5a1d26acd264f2ad55718b99a27e57366b900bf721e8a195e4455d97f5884f94058cd1f5e3e65bc
|
7
|
+
data.tar.gz: af6d6ba478071e3c4ad5ffaf009e581bb42f160af73f8c8646a1f24e3ae97bbb661e00a12006fe1d305bab24046ff04b41bb5ce49596dd412829a1575b6acd4a
|
data/bin/bakery
CHANGED
@@ -112,7 +112,7 @@ module Bake
|
|
112
112
|
p = File.dirname(bp.proj)
|
113
113
|
pRel = File.rel_from_to_project(Dir.pwd, p, false)
|
114
114
|
pRel = "." if pRel.empty?
|
115
|
-
cmd = (["-m", pRel, "-b", bp.conf] + bp.args.split + passedParams)
|
115
|
+
cmd = (["-m", pRel, "-b", bp.conf] + bp.args.split + passedParams + bp.args_end.split)
|
116
116
|
cmdWithNum = "bakery #{currentRun} of #{maxRuns}: bake " + cmd.join(" ")
|
117
117
|
puts "\n#{$stars}"
|
118
118
|
Bake.formatter.printInfo(cmdWithNum)
|
data/lib/bake/config/loader.rb
CHANGED
@@ -143,6 +143,9 @@ module Bake
|
|
143
143
|
if !configHash.has_key?(name)
|
144
144
|
return adaptHash[name].any?{|ah| ah.match("")}
|
145
145
|
end
|
146
|
+
if name == "toolchain" && configHash[name] == [""]
|
147
|
+
Bake.formatter.printWarning("Trying to adapt '#{config.name}' with 'toolchain == #{c.parent.toolchain}', but toolchain is not defined yet", c)
|
148
|
+
end
|
146
149
|
adaptHash[name].any? { |ah| configHash[name].any?{|ch| ah.match(ch)}}
|
147
150
|
}
|
148
151
|
|
data/lib/bakery/buildPattern.rb
CHANGED
@@ -1,11 +1,12 @@
|
|
1
1
|
module Bake
|
2
2
|
|
3
3
|
class BuildPattern
|
4
|
-
attr_reader :proj, :conf, :args, :coll_p
|
5
|
-
def initialize(proj, conf, args, coll_p)
|
4
|
+
attr_reader :proj, :conf, :args, :args_end, :coll_p
|
5
|
+
def initialize(proj, conf, args, args_end, coll_p)
|
6
6
|
@proj = proj
|
7
7
|
@conf = conf
|
8
8
|
@args = args
|
9
|
+
@args_end = args_end
|
9
10
|
@coll_p = coll_p
|
10
11
|
end
|
11
12
|
def getId
|
@@ -20,6 +20,7 @@ module Bake
|
|
20
20
|
has_attr 'name', String, :defaultValueLiteral => ""
|
21
21
|
has_attr 'config', String, :defaultValueLiteral => ""
|
22
22
|
has_attr 'args', String, :defaultValueLiteral => ""
|
23
|
+
has_attr 'args_end', String, :defaultValueLiteral => ""
|
23
24
|
end
|
24
25
|
class Exclude < ModelElement
|
25
26
|
has_attr 'name', String, :defaultValueLiteral => ""
|
data/lib/bakery/toBake.rb
CHANGED
@@ -38,7 +38,7 @@ module Bake
|
|
38
38
|
Bake.formatter.printWarning("pattern does not match any project: #{p.name}", p)
|
39
39
|
end
|
40
40
|
projs.each do |f|
|
41
|
-
toBuildPattern << BuildPattern.new(f, "^"+p.config.gsub("*","(\\w*)")+"$", p.args, p)
|
41
|
+
toBuildPattern << BuildPattern.new(f, "^"+p.config.gsub("*","(\\w*)")+"$", p.args, p.args_end, p)
|
42
42
|
end
|
43
43
|
end
|
44
44
|
end
|
@@ -51,7 +51,7 @@ module Bake
|
|
51
51
|
res = c.gsub(/#.*/,"").match("\\s*(Library|Executable|Custom){1}Config\\s*\"?([\\w:-]*)\"?")
|
52
52
|
if res
|
53
53
|
if res[2].match(bp.conf) != nil
|
54
|
-
toBuild << BuildPattern.new(bp.proj, res[2], bp.args, nil)
|
54
|
+
toBuild << BuildPattern.new(bp.proj, res[2], bp.args, bp.args_end, nil)
|
55
55
|
bp.coll_p.found
|
56
56
|
end
|
57
57
|
end
|
data/lib/common/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: bake-toolkit
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 2.
|
4
|
+
version: 2.70.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Alexander Schaal
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2021-
|
11
|
+
date: 2021-04-15 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rtext
|