diff options
| author | Yukihiro Matz Matsumoto <[email protected]> | 2013-01-21 17:31:12 +0900 |
|---|---|---|
| committer | Yukihiro Matz Matsumoto <[email protected]> | 2013-01-21 17:31:12 +0900 |
| commit | 17fa9927a3dbec1752ff383c39122980a49e66fe (patch) | |
| tree | 5c7caa5334596bfe24ad5a83770b618c717295ee /tasks/mrbgem_spec.rake | |
| parent | 117e2ec06544e02511a2b5d2164edb00908ebab2 (diff) | |
| parent | 04941bc1634335c8f7fca3bafc68ca2c25969faf (diff) | |
| download | mruby-17fa9927a3dbec1752ff383c39122980a49e66fe.tar.gz mruby-17fa9927a3dbec1752ff383c39122980a49e66fe.zip | |
resolve conflicts
Diffstat (limited to 'tasks/mrbgem_spec.rake')
| -rw-r--r-- | tasks/mrbgem_spec.rake | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/tasks/mrbgem_spec.rake b/tasks/mrbgem_spec.rake index 138b3f1f1..906f47ad0 100644 --- a/tasks/mrbgem_spec.rake +++ b/tasks/mrbgem_spec.rake @@ -46,11 +46,15 @@ module MRuby @linker = LinkerConfig.new([], [], []) @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) |