diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2015-09-05 01:06:12 +0900 |
|---|---|---|
| committer | Yukihiro "Matz" Matsumoto <[email protected]> | 2015-09-05 01:06:12 +0900 |
| commit | 2f1a031fcd53b71415ae6d2b26b56c2c3efb8717 (patch) | |
| tree | f9a7175f4e0497922fa290a6b8f70e717faa1587 | |
| parent | 47795d0636e87c11f8ff88f04fe21ec36422ac2e (diff) | |
| parent | c6860bc0c4978d3158a96b32d4fe9965c03424dd (diff) | |
| download | mruby-2f1a031fcd53b71415ae6d2b26b56c2c3efb8717.tar.gz mruby-2f1a031fcd53b71415ae6d2b26b56c2c3efb8717.zip | |
Merge pull request #2943 from zzak/subdirs
Allow rbfiles in mrblib and test to have subdirs
| -rw-r--r-- | tasks/mrbgem_spec.rake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tasks/mrbgem_spec.rake b/tasks/mrbgem_spec.rake index d13e7733f..74aa5b817 100644 --- a/tasks/mrbgem_spec.rake +++ b/tasks/mrbgem_spec.rake @@ -54,7 +54,7 @@ module MRuby end @linker = LinkerConfig.new([], [], [], []) - @rbfiles = Dir.glob("#{dir}/mrblib/*.rb").sort + @rbfiles = Dir.glob("#{dir}/mrblib/**/*.rb").sort @objs = Dir.glob("#{dir}/src/*.{c,cpp,cxx,cc,m,asm,s,S}").map do |f| objfile(f.relative_path_from(@dir).to_s.pathmap("#{build_dir}/%X")) end @@ -62,7 +62,7 @@ module MRuby @generate_functions = !(@rbfiles.empty? && @objs.empty?) @objs << objfile("#{build_dir}/gem_init") if @generate_functions - @test_rbfiles = Dir.glob("#{dir}/test/*.rb") + @test_rbfiles = Dir.glob("#{dir}/test/**/*.rb") @test_objs = Dir.glob("#{dir}/test/*.{c,cpp,cxx,cc,m,asm,s,S}").map do |f| objfile(f.relative_path_from(dir).to_s.pathmap("#{build_dir}/%X")) end |