bake-toolkit 2.9.1 → 2.9.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (8) hide show
  1. checksums.yaml +4 -4
  2. data/doc/further/change.html +6 -0
  3. data/doc/index.html +1 -1
  4. data/lib/bake/model/language.rb +1 -2
  5. data/lib/bake/model/metamodel.rb +7 -22
  6. data/lib/blocks/compile.rb +2 -2
  7. data/lib/common/version.rb +1 -1
  8. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 52dfb59454168c3e690324cf4424704e1eea8c57
4
- data.tar.gz: c66ff0068c9ca3818435c58ddd77bd8d75305c63
3
+ metadata.gz: 97b444cd8d9be305ef2fe0013f61b7303e6b6a41
4
+ data.tar.gz: bed95118bbf0b3de023d19c9e9f453b7da4328a8
5
5
  SHA512:
6
- metadata.gz: bd642f702dcd697a1238f0a293e9998c396b2a2cbb4bc88786e00f9af97f3ef058fdcfad6568ef0a57a744dbbd8b8d3f01a7630eec38619df8d59d6cc57ea424
7
- data.tar.gz: d5d66254e89803405e484b332604465cc53d69e208daa622331076a7b12cbebae7c34c7e431852dc1aab77992ee4c0a30185f1220d38caddb3aaa943548564c8
6
+ metadata.gz: 28e78dfb98fac95627af3287f2a82642851f1595951194c031aa69a72575bf91b6a7a93637914249e651bfb6a7a9129cc384ad972e4e77b4a536628a02f4f33b
7
+ data.tar.gz: 3575035dc10a3dfc3392c0ff99f5b19317615673a94f1f254919b5eacfad1801203d00dc56fab7d1595e6e1117f5e96146cdd03c0d85a0432bc7de5c7b4bfb5a
data/doc/further/change.html CHANGED
@@ -7,6 +7,12 @@
7
7
  <body>
8
8
  <h1>Changelog</h1>
9
9
 
10
+ June 10, 2015 - bake-toolkit 2.9.2<br>
11
+ <ul>
12
+ <li><b>Cosmetic: Redundant include directories are now removed before calling the compiler</b>
13
+ <li><b>Bugfix: Moving cached meta files was not recognized correctly, wrong path references may have been used</b>
14
+ </ul>
15
+
10
16
  June 8, 2015 - bake-toolkit 2.9.1<br>
11
17
  <ul>
12
18
  <li><b>Changed: "--doc" replaced by "--show_doc" to avoid confusion</b>
data/doc/index.html CHANGED
@@ -74,7 +74,7 @@ bake is used to build software <font color="#009900"><b>fast</b></font> and <fon
74
74
 
75
75
  <p>
76
76
  <hr>
77
- <table width="100%" border="0"><tr><td align="left">Described bake-toolkit version: 2.9.1</td><td align="right">June 8, 2015</td></tr></table>
77
+ <table width="100%" border="0"><tr><td align="left">Described bake-toolkit version: 2.9.2</td><td align="right">June 10, 2015</td></tr></table>
78
78
 
79
79
  </body>
80
80
 
data/lib/bake/model/language.rb CHANGED
@@ -41,8 +41,7 @@ module Bake
41
41
  },
42
42
  :identifier_provider => Idp.new,
43
43
  :line_number_attribute => "line_number",
44
- :file_name_attribute => "file_name",
45
- :fragment_ref_attribute => "fragment_ref"#,
44
+ :fragment_ref_attribute => "fragment_ref"
46
45
  )
47
46
 
48
47
  end
data/lib/bake/model/metamodel.rb CHANGED
@@ -11,17 +11,11 @@ module Bake
11
11
  has_attr 'line_number', Integer do
12
12
  annotation :details => {'internal' => 'true'}
13
13
  end
14
- has_attr 'file_name', String do
15
- annotation :details => {'internal' => 'true'}
16
- end
17
14
  module ClassModule
18
- attr_accessor :fragment_ref
19
-
20
- def id
21
- splitted = file_name.split("/")
22
- splitted[splitted.length-2]
23
- end
24
-
15
+ attr_accessor :fragment_ref
16
+ def file_name
17
+ @fragment_ref.fragment.location
18
+ end
25
19
  end
26
20
  end
27
21
 
@@ -210,27 +204,18 @@ module Bake
210
204
  contains_many 'set', Set, 'parent'
211
205
 
212
206
  module ClassModule
213
- def ident
214
- s = file_name.split("/")
207
+ def ident
208
+ s = file_name.split("/")
215
209
  s[s.length-2] + "/" + name
216
210
  end
217
211
  end
218
-
212
+
219
213
  end
220
214
 
221
215
  class BuildConfig_INTERNAL < BaseConfig_INTERNAL
222
216
  contains_many 'files', Files, 'parent'
223
217
  contains_many 'excludeFiles', ExcludeFiles, 'parent'
224
218
  contains_many 'includeDir', IncludeDir, 'parent'
225
-
226
-
227
- module ClassModule
228
- def ident
229
- s = file_name.split("/")
230
- s[s.length-2] + "/" + name
231
- end
232
- end
233
-
234
219
  end
235
220
 
236
221
  class ExecutableConfig < BuildConfig_INTERNAL
data/lib/blocks/compile.rb CHANGED
@@ -398,9 +398,9 @@ module Bake
398
398
  end
399
399
 
400
400
  def calcIncludes
401
- @include_list = @config.includeDir.map do |dir|
401
+ @include_list = @config.includeDir.uniq.map do |dir|
402
402
  (dir.name == "___ROOTS___") ? (Bake.options.roots.map { |r| File.rel_from_to_project(@projectDir,r,false) }) : @block.convPath(dir)
403
- end.flatten
403
+ end.flatten.uniq
404
404
 
405
405
  @include_array = {}
406
406
  [:CPP, :C, :ASM].each do |type|
data/lib/common/version.rb CHANGED
@@ -1,7 +1,7 @@
1
1
  module Bake
2
2
  class Version
3
3
  def self.number
4
- "2.9.1"
4
+ "2.9.2"
5
5
  end
6
6
  end
7
7
 
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.9.1
4
+ version: 2.9.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Alexander Schaal
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-06-08 00:00:00.000000000 Z
11
+ date: 2015-06-10 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rtext