bake-toolkit 2.9.2 → 2.10.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.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 97b444cd8d9be305ef2fe0013f61b7303e6b6a41
4
- data.tar.gz: bed95118bbf0b3de023d19c9e9f453b7da4328a8
3
+ metadata.gz: 7bba26c68d0bcaf88b3c88e7c9f225b45f2299f7
4
+ data.tar.gz: e2ee4accf56b90743fc1a11a9c93c77041b03973
5
5
  SHA512:
6
- metadata.gz: 28e78dfb98fac95627af3287f2a82642851f1595951194c031aa69a72575bf91b6a7a93637914249e651bfb6a7a9129cc384ad972e4e77b4a536628a02f4f33b
7
- data.tar.gz: 3575035dc10a3dfc3392c0ff99f5b19317615673a94f1f254919b5eacfad1801203d00dc56fab7d1595e6e1117f5e96146cdd03c0d85a0432bc7de5c7b4bfb5a
6
+ metadata.gz: ac5bc70b2cd476af88d06d4217eb825e39c27bd9523baeab0b4028aa77ddb877e26c1ef32e9bd47457f95784bd34895afed6c3ac1d2968d5830722b6c27a3029
7
+ data.tar.gz: c13e37d892c6e7e6b15d03bce73da8dfee15a338a6a159802ec4bebe5ca971ff4ba9d17d5e9de2942d108d36628b12aff445d4525bf0b2e9062ba28930ed8a3f
@@ -7,6 +7,11 @@
7
7
  <body>
8
8
  <h1>Changelog</h1>
9
9
 
10
+ ..., 2015 - bake-toolkit 2.10.0<br>
11
+ <ul>
12
+ <li><b>Added: Possibility to add descriptions for configs which will be printed when using <i>--show_configs</i></b>
13
+ </ul>
14
+
10
15
  June 10, 2015 - bake-toolkit 2.9.2<br>
11
16
  <ul>
12
17
  <li><b>Cosmetic: Redundant include directories are now removed before calling the compiler</b>
@@ -192,6 +192,7 @@ module Bake
192
192
  class BaseConfig_INTERNAL < ModelElement
193
193
  has_attr 'name', String, :defaultValueLiteral => ""
194
194
  has_attr 'extends', String, :defaultValueLiteral => ""
195
+ contains_one 'description', Description, 'parent'
195
196
  contains_one 'startupSteps', StartupSteps, 'parent'
196
197
  contains_one 'preSteps', PreSteps, 'parent'
197
198
  contains_one 'postSteps', PostSteps, 'parent'
@@ -6,19 +6,16 @@ module Bake
6
6
  class ConfigNames
7
7
 
8
8
  def self.print(configs, default, filename)
9
- validConfigs = []
9
+ foundValidConfig = false
10
10
  configs.each do |c|
11
- validConfigs << c.name unless c.defaultToolchain.nil?
12
- end
13
- if validConfigs.length > 0
14
- validConfigs.each do |v|
15
- d = ""
16
- d = " (default)" if v == default
17
- puts "* " + v + d
18
- end
19
- else
20
- Bake.formatter.printWarning("No configuration with a DefaultToolchain found", filename)
11
+ next if c.defaultToolchain.nil?
12
+ foundValidConfig = true
13
+ Kernel.print "* #{c.name}"
14
+ Kernel.print " (default)" if c.name == default
15
+ Kernel.print ": #{c.description.text}" if c.description
16
+ Kernel.print "\n"
21
17
  end
18
+ Bake.formatter.printWarning("No configuration with a DefaultToolchain found", filename) unless foundValidConfig
22
19
 
23
20
  ExitHelper.exit(0)
24
21
  end
@@ -32,15 +32,15 @@ module Bake
32
32
  File.join([@output_dir, adaptedSource])
33
33
  end
34
34
 
35
- def needed?(source, object, type, dep_filename_conv)
35
+ def maybe_needed?(source, object, type, dep_filename_conv)
36
36
  return false if Bake.options.linkOnly
37
-
37
+ return false if Bake.options.prepro and type == ASM
38
+ return true
39
+ end
40
+
41
+ def needed?(source, object, type, dep_filename_conv)
38
42
  return "because analyzer toolchain is configured" if Bake.options.analyze
39
-
40
- if Bake.options.prepro
41
- return "because prepro was specified and source is no assembler file" if type != :ASM
42
- return false
43
- end
43
+ return "because prepro was specified and source is no assembler file" if Bake.options.prepro
44
44
 
45
45
  return "because object does not exist" if not File.exist?(object)
46
46
  oTime = File.mtime(object)
@@ -114,6 +114,8 @@ module Bake
114
114
 
115
115
  cmdLineCheck = false
116
116
  cmdLineFile = calcCmdlineFile(object)
117
+ return true unless maybe_needed?(source, object, type, dep_filename_conv)
118
+
117
119
  reason = needed?(source, object, type, dep_filename_conv)
118
120
  if not reason
119
121
  cmdLineCheck = true
@@ -1,7 +1,7 @@
1
1
  module Bake
2
2
  class Version
3
3
  def self.number
4
- "2.9.2"
4
+ "2.10.0"
5
5
  end
6
6
  end
7
7
 
data/lib/tocxx.rb CHANGED
@@ -365,3 +365,7 @@ module Bake
365
365
 
366
366
  end
367
367
  end
368
+
369
+ trap("SIGINT") do
370
+ Bake::IDEInterface.instance.set_abort(1)
371
+ 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.9.2
4
+ version: 2.10.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: 2015-06-10 00:00:00.000000000 Z
11
+ date: 2015-07-01 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rtext