bake-toolkit 2.65.2 → 2.69.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (26) hide show
  1. checksums.yaml +4 -4
  2. data/Rakefile.rb +7 -3
  3. data/bin/bakery +1 -0
  4. data/lib/adapt/config/loader.rb +164 -156
  5. data/lib/bake/cache.rb +2 -1
  6. data/lib/bake/config/loader.rb +72 -60
  7. data/lib/bake/libElement.rb +6 -0
  8. data/lib/bake/mergeConfig.rb +242 -241
  9. data/lib/bake/model/loader.rb +178 -178
  10. data/lib/bake/model/metamodel.rb +18 -18
  11. data/lib/bake/subst.rb +24 -4
  12. data/lib/bake/toolchain/clang.rb +3 -0
  13. data/lib/bake/util.rb +1 -0
  14. data/lib/bakery/model/metamodel.rb +5 -0
  15. data/lib/bakery/toBake.rb +8 -1
  16. data/lib/blocks/block.rb +6 -0
  17. data/lib/blocks/commandLine.rb +44 -44
  18. data/lib/blocks/compile.rb +17 -16
  19. data/lib/blocks/executable.rb +4 -0
  20. data/lib/blocks/fileutil.rb +10 -3
  21. data/lib/blocks/library.rb +4 -0
  22. data/lib/blocks/makefile.rb +4 -2
  23. data/lib/common/root.rb +1 -0
  24. data/lib/common/version.rb +17 -21
  25. data/lib/tocxx.rb +2 -2
  26. metadata +20 -35
data/lib/tocxx.rb CHANGED
@@ -652,8 +652,8 @@ module Bake
652
652
  al = AdaptConfig.new
653
653
  adaptConfigs = al.load()
654
654
 
655
- @loadedConfig = Config.new
656
- @referencedConfigs = @loadedConfig.load(adaptConfigs)
655
+ loadedConfig = Config.new
656
+ @referencedConfigs = loadedConfig.load(adaptConfigs)
657
657
 
658
658
  cache.write_cache(@referencedConfigs, adaptConfigs)
659
659
  end
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.65.2
4
+ version: 2.69.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: 2020-09-18 00:00:00.000000000 Z
11
+ date: 2021-03-26 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rtext
@@ -98,72 +98,58 @@ dependencies:
98
98
  name: e2mmap
99
99
  requirement: !ruby/object:Gem::Requirement
100
100
  requirements:
101
- - - ">="
101
+ - - '='
102
102
  - !ruby/object:Gem::Version
103
- version: '0'
103
+ version: 0.1.0
104
104
  type: :runtime
105
105
  prerelease: false
106
106
  version_requirements: !ruby/object:Gem::Requirement
107
107
  requirements:
108
- - - ">="
109
- - !ruby/object:Gem::Version
110
- version: '0'
111
- - !ruby/object:Gem::Dependency
112
- name: rake
113
- requirement: !ruby/object:Gem::Requirement
114
- requirements:
115
- - - ">="
116
- - !ruby/object:Gem::Version
117
- version: 12.3.3
118
- type: :development
119
- prerelease: false
120
- version_requirements: !ruby/object:Gem::Requirement
121
- requirements:
122
- - - ">="
108
+ - - '='
123
109
  - !ruby/object:Gem::Version
124
- version: 12.3.3
110
+ version: 0.1.0
125
111
  - !ruby/object:Gem::Dependency
126
112
  name: rspec
127
113
  requirement: !ruby/object:Gem::Requirement
128
114
  requirements:
129
- - - ">="
115
+ - - '='
130
116
  - !ruby/object:Gem::Version
131
- version: '0'
117
+ version: 3.10.0
132
118
  type: :development
133
119
  prerelease: false
134
120
  version_requirements: !ruby/object:Gem::Requirement
135
121
  requirements:
136
- - - ">="
122
+ - - '='
137
123
  - !ruby/object:Gem::Version
138
- version: '0'
124
+ version: 3.10.0
139
125
  - !ruby/object:Gem::Dependency
140
126
  name: simplecov
141
127
  requirement: !ruby/object:Gem::Requirement
142
128
  requirements:
143
- - - ">="
129
+ - - '='
144
130
  - !ruby/object:Gem::Version
145
- version: '0'
131
+ version: 0.16.1
146
132
  type: :development
147
133
  prerelease: false
148
134
  version_requirements: !ruby/object:Gem::Requirement
149
135
  requirements:
150
- - - ">="
136
+ - - '='
151
137
  - !ruby/object:Gem::Version
152
- version: '0'
138
+ version: 0.16.1
153
139
  - !ruby/object:Gem::Dependency
154
140
  name: coveralls
155
141
  requirement: !ruby/object:Gem::Requirement
156
142
  requirements:
157
- - - ">="
143
+ - - '='
158
144
  - !ruby/object:Gem::Version
159
- version: '0'
145
+ version: 0.8.23
160
146
  type: :development
161
147
  prerelease: false
162
148
  version_requirements: !ruby/object:Gem::Requirement
163
149
  requirements:
164
- - - ">="
150
+ - - '='
165
151
  - !ruby/object:Gem::Version
166
- version: '0'
152
+ version: 0.8.23
167
153
  description: See documentation for more details
168
154
  email: alexander.schaal@esrlabs.com
169
155
  executables:
@@ -279,7 +265,7 @@ files:
279
265
  - lib/rtext-service/options/options.rb
280
266
  - lib/tocxx.rb
281
267
  - license.txt
282
- homepage:
268
+ homepage: https://github.com/esrlabs/bake
283
269
  licenses:
284
270
  - MIT
285
271
  metadata: {}
@@ -300,8 +286,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
300
286
  - !ruby/object:Gem::Version
301
287
  version: '0'
302
288
  requirements: []
303
- rubyforge_project:
304
- rubygems_version: 2.7.7
289
+ rubygems_version: 3.1.4
305
290
  signing_key:
306
291
  specification_version: 4
307
292
  summary: Build tool to compile C/C++ projects fast and easy.