summaryrefslogtreecommitdiffhomepage
path: root/tasks/mruby_build_commands.rake
diff options
context:
space:
mode:
authorYukihiro "Matz" Matsumoto <[email protected]>2013-01-23 05:20:43 -0800
committerYukihiro "Matz" Matsumoto <[email protected]>2013-01-23 05:20:43 -0800
commit538bbfc15f75b9fbde553d2466d4e39c50e5785a (patch)
tree2f9596d1f9d5088a654ded7085d7ecaada6ea004 /tasks/mruby_build_commands.rake
parentf6195693b6e7be4acad6a2f36eb91775d76a0dbb (diff)
parent7f095534fdaad8dc6f378c1ea6c513c08a42ec01 (diff)
downloadmruby-538bbfc15f75b9fbde553d2466d4e39c50e5785a.tar.gz
mruby-538bbfc15f75b9fbde553d2466d4e39c50e5785a.zip
Merge pull request #773 from thecodeshop/ppp
Refine pretty printing
Diffstat (limited to 'tasks/mruby_build_commands.rake')
-rw-r--r--tasks/mruby_build_commands.rake14
1 files changed, 7 insertions, 7 deletions
diff --git a/tasks/mruby_build_commands.rake b/tasks/mruby_build_commands.rake
index 8ffafe9b0..533f0fe62 100644
--- a/tasks/mruby_build_commands.rake
+++ b/tasks/mruby_build_commands.rake
@@ -58,7 +58,7 @@ module MRuby
include_path_flags = [include_paths, _include_paths, File.dirname(infile)].flatten.map do |f|
option_include_path % filename(f)
end
- _pp "CC #{filename(infile)} > #{filename(outfile)}"
+ _pp "CC", "#{filename(infile)}", "#{filename(outfile)}"
_run compile_options, { :flags => (flags + define_flags + include_path_flags + _flags).join(' '),
:infile => filename(infile), :outfile => filename(outfile) }
end
@@ -131,7 +131,7 @@ module MRuby
FileUtils.mkdir_p File.dirname(outfile)
library_flags = [libraries, _libraries].flatten.reverse.map{ |d| option_library % d }
library_path_flags = [library_paths, _library_paths].flatten.map{ |f| option_library_path % filename(f) }
- _pp "LD #{filename(outfile)}"
+ _pp "LD", "#{filename(outfile)}"
_run link_options, { :flags => (flags + library_path_flags + _flags).join(' '),
:outfile => filename(outfile) , :objs => filename(objfiles).join(' '),
:libs => library_flags.join(' ') }
@@ -149,7 +149,7 @@ module MRuby
def run(outfile, objfiles)
FileUtils.mkdir_p File.dirname(outfile)
- _pp "AR #{filename(outfile)}"
+ _pp "AR", "#{filename(outfile)}"
_run archive_options, { :outfile => filename(outfile), :objs => filename(objfiles).join(' ') }
end
end
@@ -165,7 +165,7 @@ module MRuby
def run(outfile, infile)
FileUtils.mkdir_p File.dirname(outfile)
- _pp "YACC #{filename(infile)} > #{filename(outfile)}"
+ _pp "YACC", "#{filename(infile)}", "#{filename(outfile)}"
_run compile_options, { :outfile => filename(outfile) , :infile => filename(infile) }
end
end
@@ -181,7 +181,7 @@ module MRuby
def run(outfile, infile)
FileUtils.mkdir_p File.dirname(outfile)
- _pp "GPERF #{filename(infile)} > #{filename(outfile)}"
+ _pp "GPERF", "#{filename(infile)}", "#{filename(outfile)}"
_run compile_options, { :outfile => filename(outfile) , :infile => filename(infile) }
end
end
@@ -198,7 +198,7 @@ module MRuby
end
def run_clone(dir, url, _flags = [])
- _pp "GIT #{url} > #{filename(dir)}"
+ _pp "GIT", "#{url}", "#{filename(dir)}"
_run clone_options, { :flags => [flags, _flags].flatten.join(' '), :url => url, :dir => filename(dir) }
end
end
@@ -214,7 +214,7 @@ module MRuby
@command ||= @build.mrbcfile
IO.popen("#{filename @command} #{@compile_options % {:funcname => funcname}}", 'r+') do |io|
[infiles].flatten.each do |f|
- _pp " MRBC #{f}"
+ _pp "MRBC", "#{f}", nil, :indent => 2
io.write IO.read(f)
end
io.close_write