From a74f92b46be80a754486e696d117903fbb090686 Mon Sep 17 00:00:00 2001 From: Yuichiro MASUI Date: Sun, 3 Feb 2013 05:18:28 +0900 Subject: Generate mrbtest.a file for sparete from driver.o --- test/mrbtest.rake | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) (limited to 'test/mrbtest.rake') diff --git a/test/mrbtest.rake b/test/mrbtest.rake index 4d4a7e57c..707fe8b72 100644 --- a/test/mrbtest.rake +++ b/test/mrbtest.rake @@ -8,20 +8,27 @@ MRuby.each_target do init = "#{dir}/init_mrbtest.c" asslib = "#{dir}/assert.rb" - objs = [objfile("#{build_dir}/#{dir}/driver"), mlib].flatten + mrbtest_lib = libfile("#{build_dir}/#{dir}/mrbtest") + file mrbtest_lib => [mlib, gems.map(&:test_objs), gems.map { |g| g.test_rbireps.ext(exts.object) }].flatten do |t| + archiver.run t.name, t.prerequisites + end - file exec => objs + gems.map(&:testlib).flatten + [libfile("#{build_dir}/lib/libmruby")] do |t| - gem_flags = gems.map { |g| g.linker.flags } - gem_flags_before_libraries = gems.map { |g| g.linker.flags_before_libraries } - gem_flags_after_libraries = gems.map { |g| g.linker.flags_after_libraries } - gem_libraries = gems.map { |g| g.linker.libraries } - gem_library_paths = gems.map { |g| g.linker.library_paths } - linker.run t.name, t.prerequisites, gem_libraries, gem_library_paths, gem_flags, gem_flags_before_libraries + unless build_mrbtest_lib_only? + driver_obj = objfile("#{build_dir}/#{dir}/driver") + file exec => [driver_obj, mrbtest_lib, libfile("#{build_dir}/lib/libmruby")] do |t| + gem_flags = gems.map { |g| g.linker.flags } + gem_flags_before_libraries = gems.map { |g| g.linker.flags_before_libraries } + gem_flags_after_libraries = gems.map { |g| g.linker.flags_after_libraries } + gem_libraries = gems.map { |g| g.linker.libraries } + gem_library_paths = gems.map { |g| g.linker.library_paths } + linker.run t.name, t.prerequisites, gem_libraries, gem_library_paths, gem_flags, gem_flags_before_libraries + end end file mlib => [clib] file clib => [mrbcfile, init, asslib] + mrbs do |t| _pp "GEN", "*.rb", "#{clib}" + FileUtils.mkdir_p File.dirname(__FILE__) open(clib, 'w') do |f| f.puts IO.read(init) mrbc.run f, [asslib] + mrbs, 'mrbtest_irep' -- cgit v1.2.3 From 93c0f3b7d44a8775087dcbf49642ddd6c44c44e6 Mon Sep 17 00:00:00 2001 From: Yuichiro MASUI Date: Sun, 3 Feb 2013 14:29:40 +0900 Subject: Fixed failure --- test/mrbtest.rake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'test/mrbtest.rake') diff --git a/test/mrbtest.rake b/test/mrbtest.rake index 707fe8b72..03e6c7ece 100644 --- a/test/mrbtest.rake +++ b/test/mrbtest.rake @@ -28,7 +28,7 @@ MRuby.each_target do file mlib => [clib] file clib => [mrbcfile, init, asslib] + mrbs do |t| _pp "GEN", "*.rb", "#{clib}" - FileUtils.mkdir_p File.dirname(__FILE__) + FileUtils.mkdir_p File.dirname(clib) open(clib, 'w') do |f| f.puts IO.read(init) mrbc.run f, [asslib] + mrbs, 'mrbtest_irep' -- cgit v1.2.3