autobuild 1.7.0.rc1 → 1.7.0.rc2

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.
@@ -326,6 +326,25 @@ module Autobuild
326
326
  end
327
327
  end
328
328
 
329
+ def show_make_messages?
330
+ if !@show_make_messages.nil?
331
+ @show_make_messages
332
+ else CMake.show_make_messages?
333
+ end
334
+ end
335
+
336
+ def show_make_messages=(value)
337
+ @show_make_messages = value
338
+ end
339
+
340
+ def self.show_make_messages?
341
+ @show_make_messages
342
+ end
343
+
344
+ def self.show_make_messages=(value)
345
+ @show_make_messages = value
346
+ end
347
+
329
348
  # Do the build in builddir
330
349
  def build
331
350
  in_dir(builddir) do
@@ -340,21 +359,23 @@ module Autobuild
340
359
  end
341
360
  end
342
361
 
343
- warning = String.new
344
- Autobuild.make_subcommand(self, 'build') do |line|
345
- iswarning = false
346
- if line =~ /\[\s*(\d+)%\]/
347
- progress "building %s (#{Integer($1)}%)"
348
- elsif (line =~
349
- /^(Linking)|^(Scanning)|^(Building)|^(Built)/) == nil
350
- warning += line
351
- iswarning = true
352
- end
353
- if(!iswarning && !warning.empty?)
354
- warning.split("\n").each do |l|
355
- message "%s: #{l}", :magenta
362
+ if show_make_messages?
363
+ warning = String.new
364
+ Autobuild.make_subcommand(self, 'build') do |line|
365
+ iswarning = false
366
+ if line =~ /\[\s*(\d+)%\]/
367
+ progress "building %s (#{Integer($1)}%)"
368
+ elsif (line =~
369
+ /^(Linking)|^(Scanning)|^(Building)|^(Built)/) == nil
370
+ warning += line
371
+ iswarning = true
372
+ end
373
+ if(!iswarning && !warning.empty?)
374
+ warning.split("\n").each do |l|
375
+ message "%s: #{l}", :magenta
376
+ end
377
+ warning = ""
356
378
  end
357
- warning = ""
358
379
  end
359
380
  end
360
381
  end
@@ -1,5 +1,5 @@
1
1
  module Autobuild
2
- VERSION = "1.7.0.rc1" unless defined? Autobuild::VERSION
2
+ VERSION = "1.7.0.rc2" unless defined? Autobuild::VERSION
3
3
  end
4
4
 
5
5
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: autobuild
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.7.0.rc1
4
+ version: 1.7.0.rc2
5
5
  prerelease: 6
6
6
  platform: ruby
7
7
  authors:
@@ -13,7 +13,7 @@ date: 2012-11-26 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rake
16
- requirement: &10716440 !ruby/object:Gem::Requirement
16
+ requirement: &9890940 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: 0.7.0
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *10716440
24
+ version_requirements: *9890940
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: utilrb
27
- requirement: &10716000 !ruby/object:Gem::Requirement
27
+ requirement: &9890480 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: 1.3.3
33
33
  type: :runtime
34
34
  prerelease: false
35
- version_requirements: *10716000
35
+ version_requirements: *9890480
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: highline
38
- requirement: &10715560 !ruby/object:Gem::Requirement
38
+ requirement: &9890020 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: '0'
44
44
  type: :runtime
45
45
  prerelease: false
46
- version_requirements: *10715560
46
+ version_requirements: *9890020
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: rdoc
49
- requirement: &10715120 !ruby/object:Gem::Requirement
49
+ requirement: &9889580 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ~>
@@ -54,10 +54,10 @@ dependencies:
54
54
  version: '3.10'
55
55
  type: :development
56
56
  prerelease: false
57
- version_requirements: *10715120
57
+ version_requirements: *9889580
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: hoe
60
- requirement: &10714680 !ruby/object:Gem::Requirement
60
+ requirement: &9889000 !ruby/object:Gem::Requirement
61
61
  none: false
62
62
  requirements:
63
63
  - - ~>
@@ -65,7 +65,7 @@ dependencies:
65
65
  version: '3.3'
66
66
  type: :development
67
67
  prerelease: false
68
- version_requirements: *10714680
68
+ version_requirements: *9889000
69
69
  description: Collection of classes to handle build systems (CMake, autotools, ...)
70
70
  and import mechanisms (tarballs, CVS, SVN, git, ...). It also offers a Rake integration
71
71
  to import and build such software packages. It is the backbone of the autoproj (http://rock-robotics.org/autoproj)