summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorDaniel Bovensiepen <[email protected]>2013-01-21 14:13:17 +0800
committerDaniel Bovensiepen <[email protected]>2013-01-21 14:13:17 +0800
commit73eba4d4e86e3bbad0b9c0b24ce88561921470ab (patch)
treee8e048a9da10445f58d0295052715b4684f4bf24
parent46b9118562667d5f1a78452c8c531cf8ed27a664 (diff)
downloadmruby-73eba4d4e86e3bbad0b9c0b24ce88561921470ab.tar.gz
mruby-73eba4d4e86e3bbad0b9c0b24ce88561921470ab.zip
Reduce line length
-rw-r--r--tasks/mrbgem_spec.rake8
-rw-r--r--tasks/mruby_build_commands.rake13
2 files changed, 15 insertions, 6 deletions
diff --git a/tasks/mrbgem_spec.rake b/tasks/mrbgem_spec.rake
index e21e0b670..bf381cf33 100644
--- a/tasks/mrbgem_spec.rake
+++ b/tasks/mrbgem_spec.rake
@@ -46,11 +46,15 @@ module MRuby
end
@rbfiles = Dir.glob("#{dir}/mrblib/*.rb")
- @objs = Dir.glob("#{dir}/src/*.{c,cpp,m,asm,S}").map { |f| objfile(f.relative_path_from(@dir).to_s.pathmap("#{build_dir}/%X")) }
+ @objs = Dir.glob("#{dir}/src/*.{c,cpp,m,asm,S}").map do |f|
+ objfile(f.relative_path_from(@dir).to_s.pathmap("#{build_dir}/%X"))
+ end
@objs << objfile("#{build_dir}/gem_init")
@test_rbfiles = Dir.glob("#{dir}/test/*.rb")
- @test_objs = Dir.glob("#{dir}/test/*.{c,cpp,m,asm,S}").map { |f| objfile(f.relative_path_from(dir).to_s.pathmap("#{build_dir}/%X")) }
+ @test_objs = Dir.glob("#{dir}/test/*.{c,cpp,m,asm,S}").map do |f|
+ objfile(f.relative_path_from(dir).to_s.pathmap("#{build_dir}/%X"))
+ end
@test_preload = 'test/assert.rb'
instance_eval(&@initializer)
diff --git a/tasks/mruby_build_commands.rake b/tasks/mruby_build_commands.rake
index 023b23763..5db86a942 100644
--- a/tasks/mruby_build_commands.rake
+++ b/tasks/mruby_build_commands.rake
@@ -49,8 +49,11 @@ module MRuby
def run(outfile, infile, _defineds=[], _include_paths=[], _flags=[])
FileUtils.mkdir_p File.dirname(outfile)
define_flags = [defines, _defineds].flatten.map{ |d| option_define % d }
- include_path_flags = [include_paths, _include_paths, File.dirname(infile)].flatten.map{ |f| option_include_path % filename(f) }
- _run compile_options, { :flags => (flags + define_flags + include_path_flags + _flags).join(' '), :infile => filename(infile), :outfile => filename(outfile) }
+ include_path_flags = [include_paths, _include_paths, File.dirname(infile)].flatten.map do |f|
+ option_include_path % filename(f)
+ end
+ _run compile_options, { :flags => (flags + define_flags + include_path_flags + _flags).join(' '),
+ :infile => filename(infile), :outfile => filename(outfile) }
end
def define_rules(build_dir, source_dir='')
@@ -112,7 +115,9 @@ 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) }
- _run link_options, { :flags => (flags + library_path_flags + _flags).join(' '), :outfile => filename(outfile) , :objs => filename(objfiles).join(' '), :libs => library_flags.join(' ') }
+ _run link_options, { :flags => (flags + library_path_flags + _flags).join(' '),
+ :outfile => filename(outfile) , :objs => filename(objfiles).join(' '),
+ :libs => library_flags.join(' ') }
end
end
@@ -195,4 +200,4 @@ module MRuby
end
end
end
-end \ No newline at end of file
+end