bake-toolkit 2.10.1 → 2.10.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (14) hide show
  1. checksums.yaml +4 -4
  2. data/doc/further/change.html +5 -1
  3. data/doc/index.html +1 -1
  4. data/lib/blocks/block.rb +22 -23
  5. data/lib/blocks/commandLine.rb +1 -0
  6. data/lib/blocks/compile.rb +4 -1
  7. data/lib/blocks/convert.rb +1 -0
  8. data/lib/blocks/docu.rb +2 -0
  9. data/lib/blocks/executable.rb +4 -2
  10. data/lib/blocks/has_execute_command.rb +1 -0
  11. data/lib/blocks/library.rb +3 -3
  12. data/lib/blocks/lint.rb +3 -0
  13. data/lib/common/version.rb +1 -1
  14. metadata +1 -1
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 61010a8e1fff0e852886c300faab8e351e1efb56
4
- data.tar.gz: 193fa36bb7dc2aa38a3af802677078a3d05e713a
3
+ metadata.gz: 5365f13f88505155d688084570e9d67aec07dafc
4
+ data.tar.gz: dca5e6549dc63394b6d334f9e6b9bcb4b0ca514c
5
5
  SHA512:
6
- metadata.gz: 836394ad61b83c3bd06e0deac78336e71acf99c64b8282699a5d9f4c4c4901127872bbd095711e737ff05b5a8d5f8a346e6c789b6065140846666d2ee268d131
7
- data.tar.gz: 399c59c68bb57b1f1b0573f02c7aeabce6fbb61e1133b46df53cb381eabe0d6c8b0a1c980c5e56999312cac07bdc2432942814f77e109e22949ccf532cf72963
6
+ metadata.gz: da6ee5cde9a105e3db93f6c382f095c353fa1af1b3bce008b83a84dcb04c0c08506f8c50d5efbf7bc53bde6f3b4f3ee8e8d0d40b59d1c5418bc40597d17025f8
7
+ data.tar.gz: 4a373da831f7bb5d5f606184f54118e8d8fac7817a1a4f327021e03e9c07625ba4b5c93ea79e4d7acf993ff22c59cd1f17921f0baeba03dbc83e3d3f0954d12f
data/doc/further/change.html CHANGED
@@ -7,12 +7,16 @@
7
7
  <body>
8
8
  <h1>Changelog</h1>
9
9
 
10
+ July 3, 2015 - bake-toolkit 2.10.2<br>
11
+ <ul>
12
+ <li><b>Bugfix: PostSteps were unintentionally executed if a dependent step (e.g. linking) was not executed due to an error in another project (e.g. compiler error)</b>
13
+ </ul>
14
+
10
15
  July 1, 2015 - bake-toolkit 2.10.1<br>
11
16
  <ul>
12
17
  <li><b>Added: Possibility to add descriptions for configs which will be printed when using <i>--show_configs</i></b>
13
18
  <li><b>Bugfix: link_only did not link <i>only</i> if not all sources of the main project were not built before</b>
14
19
  <li><b>Bugfix: Ctrl-C on command line did not work properly under Linux</b>
15
-
16
20
  </ul>
17
21
 
18
22
  July 1, 2015 - Eclipse plugin 1.5.1<br>
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.10.1</td><td align="right">July 1, 2015</td></tr></table>
77
+ <table width="100%" border="0"><tr><td align="left">Described bake-toolkit version: 2.10.2</td><td align="right">July 3, 2015</td></tr></table>
78
78
 
79
79
  </body>
80
80
 
data/lib/blocks/block.rb CHANGED
@@ -123,10 +123,9 @@ module Bake
123
123
  end
124
124
 
125
125
  def executeStep(step, method)
126
- result = false
126
+ @result = false
127
127
  begin
128
- step.send method
129
- result = true
128
+ @result = step.send(method)
130
129
  rescue Bake::SystemCommandFailed => scf
131
130
  rescue SystemExit => exSys
132
131
  ProcessHelper.killProcess(true)
@@ -141,7 +140,7 @@ module Bake
141
140
  raise AbortException.new
142
141
  end
143
142
 
144
- return result
143
+ return @result
145
144
  end
146
145
 
147
146
  def callDeps(method)
@@ -154,23 +153,23 @@ module Bake
154
153
  end
155
154
 
156
155
  def callSteps(method)
157
- result = true
156
+ @result = true
158
157
  preSteps.each do |step|
159
- result = executeStep(step, method) if result
160
- return false if not result and Bake.options.stopOnFirstError
158
+ @result = executeStep(step, method) if @result
159
+ return false if not @result and Bake.options.stopOnFirstError
161
160
  end
162
161
 
163
162
  mainSteps.each do |step|
164
- result = executeStep(step, method) if result
165
- return false if not result and Bake.options.stopOnFirstError
163
+ @result = executeStep(step, method) if @result
164
+ return false if not @result and Bake.options.stopOnFirstError
166
165
  end
167
-
166
+
168
167
  postSteps.each do |step|
169
- result = executeStep(step, method) if result
170
- return false if not result and Bake.options.stopOnFirstError
168
+ @result = executeStep(step, method) if @result
169
+ return false if not @result and Bake.options.stopOnFirstError
171
170
  end
172
171
 
173
- return result
172
+ return @result
174
173
  end
175
174
 
176
175
  def execute
@@ -196,7 +195,7 @@ module Bake
196
195
  end
197
196
 
198
197
  @result = callSteps(:execute)
199
- return (depResult && result)
198
+ return (depResult && @result)
200
199
  end
201
200
 
202
201
  def clean
@@ -221,7 +220,7 @@ module Bake
221
220
  end
222
221
  end
223
222
 
224
- return (depResult && result)
223
+ return (depResult && @result)
225
224
  end
226
225
 
227
226
  def startup
@@ -235,13 +234,13 @@ module Bake
235
234
  Bake.formatter.printAdditionalInfo "**** Starting up #{@projectName} (#{@configName}) ****"
236
235
  end
237
236
 
238
- result = true
237
+ @result = true
239
238
  startupSteps.each do |step|
240
- result = executeStep(step, :startupStep) if result
241
- return false if not result and Bake.options.stopOnFirstError
239
+ @result = executeStep(step, :startupStep) if @result
240
+ return false if not @result and Bake.options.stopOnFirstError
242
241
  end
243
242
 
244
- return (depResult && result)
243
+ return (depResult && @result)
245
244
  end
246
245
 
247
246
  def exits
@@ -255,13 +254,13 @@ module Bake
255
254
  Bake.formatter.printAdditionalInfo "**** Exiting #{@projectName} (#{@configName}) ****"
256
255
  end
257
256
 
258
- result = true
257
+ @result = true
259
258
  exitSteps.each do |step|
260
- result = executeStep(step, :exitStep) if result
261
- return false if not result and Bake.options.stopOnFirstError
259
+ @result = executeStep(step, :exitStep) if @result
260
+ return false if not @result and Bake.options.stopOnFirstError
262
261
  end
263
262
 
264
- return (depResult && result)
263
+ return (depResult && @result)
265
264
  end
266
265
 
267
266
 
data/lib/blocks/commandLine.rb CHANGED
@@ -26,6 +26,7 @@ module Bake
26
26
 
27
27
  def clean
28
28
  # nothing to do here
29
+ return true
29
30
  end
30
31
 
31
32
  end
data/lib/blocks/compile.rb CHANGED
@@ -182,7 +182,7 @@ module Bake
182
182
  Blocks::CC2J << { :directory => @projectDir, :command => cmd, :file => source }
183
183
  end
184
184
 
185
- return if cmdLineCheck and BlockBase.isCmdLineEqual?(cmd, cmdLineFile)
185
+ return true if cmdLineCheck and BlockBase.isCmdLineEqual?(cmd, cmdLineFile)
186
186
 
187
187
  BlockBase.prepareOutput(object)
188
188
  BlockBase.writeCmdLineFile(cmd, cmdLineFile)
@@ -296,7 +296,9 @@ module Bake
296
296
 
297
297
  raise SystemCommandFailed.new if compileJobs.failed
298
298
 
299
+
299
300
  end
301
+ return true
300
302
  end
301
303
 
302
304
  def clean
@@ -327,6 +329,7 @@ module Bake
327
329
  end
328
330
  end
329
331
  end
332
+ return true
330
333
  end
331
334
 
332
335
  def calcObjects
data/lib/blocks/convert.rb CHANGED
@@ -23,6 +23,7 @@ module Bake
23
23
  (@tcs[:COMPILER][:CPP][:DEFINES] + @tcs[:COMPILER][:C][:DEFINES] + @tcs[:COMPILER][:ASM][:DEFINES]).uniq.each { |s| puts " #{s}" }
24
24
  puts "END_INFO"
25
25
  end
26
+ return true
26
27
  end
27
28
 
28
29
  def clean
data/lib/blocks/docu.rb CHANGED
@@ -17,10 +17,12 @@ module Bake
17
17
  else
18
18
  executeCommand(@commandLine)
19
19
  end
20
+ return true
20
21
  end
21
22
 
22
23
  def clean
23
24
  # nothing to do here
25
+ return true
24
26
  end
25
27
 
26
28
  end
data/lib/blocks/executable.rb CHANGED
@@ -50,6 +50,7 @@ module Bake
50
50
  return true unless subBlock.result
51
51
  return depHasError(subBlock)
52
52
  end
53
+
53
54
  return false
54
55
  end
55
56
 
@@ -132,7 +133,7 @@ module Bake
132
133
  outPipe = (@mapfile and linker[:MAP_FILE_PIPE]) ? "#{@mapfile}" : nil
133
134
  cmdLinePrint << "> #{outPipe}" if outPipe
134
135
 
135
- return if cmdLineCheck and BlockBase.isCmdLineEqual?(cmd, cmdLineFile)
136
+ return true if cmdLineCheck and BlockBase.isCmdLineEqual?(cmd, cmdLineFile)
136
137
 
137
138
  ToCxx.linkBlock
138
139
 
@@ -144,8 +145,8 @@ module Bake
144
145
  process_result(cmdLinePrint, consoleOutput, linker[:ERROR_PARSER], nil, reason, success)
145
146
 
146
147
  check_config_file()
148
+ return success
147
149
  end
148
-
149
150
  end
150
151
 
151
152
  def clean
@@ -155,6 +156,7 @@ module Bake
155
156
  FileUtils.rm_rf(@output_dir)
156
157
  end
157
158
  end unless Bake.options.filename
159
+ return true
158
160
  end
159
161
 
160
162
  end
data/lib/blocks/has_execute_command.rb CHANGED
@@ -23,6 +23,7 @@ module Bake
23
23
  puts "(executed in '#{@projectDir}')" if Bake.options.verbose >= 3
24
24
  raise SystemCommandFailed.new
25
25
  end
26
+ return cmd_result
26
27
  end
27
28
 
28
29
  end
data/lib/blocks/library.rb CHANGED
@@ -42,7 +42,6 @@ module Bake
42
42
  def execute
43
43
 
44
44
  Dir.chdir(@projectDir) do
45
-
46
45
  cmdLineCheck = false
47
46
  cmdLineFile = calcCmdlineFile()
48
47
  reason = needed?
@@ -51,7 +50,6 @@ module Bake
51
50
  reason = config_changed?(cmdLineFile)
52
51
  end
53
52
  return unless reason
54
-
55
53
  archiver = @tcs[:ARCHIVER]
56
54
 
57
55
  cmd = Utils.flagSplit(archiver[:COMMAND], false) # ar
@@ -66,7 +64,7 @@ module Bake
66
64
 
67
65
  cmd += @compileBlock.objects
68
66
 
69
- return if cmdLineCheck and BlockBase.isCmdLineEqual?(cmd, cmdLineFile)
67
+ return true if cmdLineCheck and BlockBase.isCmdLineEqual?(cmd, cmdLineFile)
70
68
 
71
69
  BlockBase.prepareOutput(archive_name)
72
70
 
@@ -75,6 +73,7 @@ module Bake
75
73
  process_result(cmd, consoleOutput, archiver[:ERROR_PARSER], "Creating #{archive_name}", reason, success)
76
74
 
77
75
  check_config_file()
76
+ return success
78
77
  end
79
78
  end
80
79
 
@@ -85,6 +84,7 @@ module Bake
85
84
  FileUtils.rm_rf(@output_dir)
86
85
  end
87
86
  end unless Bake.options.filename
87
+ return true
88
88
  end
89
89
 
90
90
 
data/lib/blocks/lint.rb CHANGED
@@ -9,6 +9,7 @@ module Bake
9
9
  end
10
10
 
11
11
  def execute
12
+ success = true
12
13
  Dir.chdir(@projectDir) do
13
14
  compiler = @tcs[:COMPILER][:CPP]
14
15
  calcSources
@@ -43,9 +44,11 @@ module Bake
43
44
  process_result(cmd, consoleOutput, compiler[:ERROR_PARSER], "Linting...", nil, success)
44
45
  end
45
46
  end
47
+ return success
46
48
  end
47
49
 
48
50
  def clean
51
+ return true
49
52
  end
50
53
 
51
54
  end
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.10.1"
4
+ "2.10.2"
5
5
  end
6
6
  end
7
7
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: bake-toolkit
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.10.1
4
+ version: 2.10.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Alexander Schaal