diff options
| author | Yukihiro Matz Matsumoto <[email protected]> | 2013-02-10 01:11:09 +0900 |
|---|---|---|
| committer | Yukihiro Matz Matsumoto <[email protected]> | 2013-02-10 01:11:09 +0900 |
| commit | 06c06d5c36814e8e5321923fa2e0483e6ea9abc5 (patch) | |
| tree | 824fb95520c7fb9b089a90bb7090fa1958961733 /tasks | |
| parent | 84a7c9ed1c7781b53344c14adac722bc27798dcf (diff) | |
| parent | 9a439245dfcbe520a9d2f6b70cb056b9ad351365 (diff) | |
| download | mruby-06c06d5c36814e8e5321923fa2e0483e6ea9abc5.tar.gz mruby-06c06d5c36814e8e5321923fa2e0483e6ea9abc5.zip | |
Merge branch 'master' of github.com:mruby/mruby
Diffstat (limited to 'tasks')
| -rw-r--r-- | tasks/mruby_build_commands.rake | 6 | ||||
| -rw-r--r-- | tasks/mruby_build_gem.rake | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/tasks/mruby_build_commands.rake b/tasks/mruby_build_commands.rake index b3c83277c..884f2027f 100644 --- a/tasks/mruby_build_commands.rake +++ b/tasks/mruby_build_commands.rake @@ -68,7 +68,11 @@ module MRuby def define_rules(build_dir, source_dir='') @out_ext = build.exts.object - generated_file_matcher = Regexp.new("^#{build_dir}/(.*)#{Regexp.escape out_ext}$") + if build_dir.include? "mrbgems/" + generated_file_matcher = Regexp.new("^#{build_dir}/(.*)#{Regexp.escape out_ext}$") + else + generated_file_matcher = Regexp.new("^#{build_dir}/(?!mrbgems/.+/)(.*)#{Regexp.escape out_ext}$") + end source_exts.each do |ext, compile| rule generated_file_matcher => [ proc { |file| diff --git a/tasks/mruby_build_gem.rake b/tasks/mruby_build_gem.rake index 80990773d..69dd4cafc 100644 --- a/tasks/mruby_build_gem.rake +++ b/tasks/mruby_build_gem.rake @@ -5,7 +5,9 @@ module MRuby gemrake = File.join(gemdir, "mrbgem.rake") fail "Can't find #{gemrake}" unless File.exists?(gemrake) + Gem.current = nil load gemrake + return nil unless Gem.current Gem.current.dir = gemdir Gem.current.build = MRuby::Build.current |