Permalink
Browse files

Merge branch 'master' into iij

  • Loading branch information...
2 parents 31ee88a + d3c7755 commit 2645727267005ea33b228a5dc5d089436522bc9e @tsahara tsahara committed Feb 7, 2013
Showing with 7 additions and 1 deletion.
  1. +5 −1 tasks/mruby_build_commands.rake
  2. +2 −0 tasks/mruby_build_gem.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|
@@ -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

0 comments on commit 2645727

Please sign in to comment.