josh/rscons
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add optional options argument to Environment#execute()

Browse Source
This commit is contained in:
Josh Holtrop 2013-07-17 21:22:52 -04:00
parent 136ad0f29a
commit 0c0c8f734f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/rscons/environment.rb
View File

@ -119,7 +119,7 @@ module Rscons
@varset.merge(extra_vars).expand_varref(command_template) @varset.merge(extra_vars).expand_varref(command_template)
end end
def execute(short_desc, command) def execute(short_desc, command, options = {})
print_command = proc do print_command = proc do
puts command.map { |c| c =~ /\s/ ? "'#{c}'" : c }.join(' ') puts command.map { |c| c =~ /\s/ ? "'#{c}'" : c }.join(' ')
end end
@ -128,7 +128,7 @@ module Rscons
elsif @varset[:echo] == :short elsif @varset[:echo] == :short
puts short_desc puts short_desc
end end
system(*command).tap do |result| system(*command, options).tap do |result|
unless result or @varset[:echo] == :command unless result or @varset[:echo] == :command
$stdout.write "Failed command was: " $stdout.write "Failed command was: "
print_command.call print_command.call