From 42b7fe62d8c1e0470431469c9ffcf6cad819a62f Mon Sep 17 00:00:00 2001 From: Carson McDonald Date: Wed, 6 Feb 2013 07:07:13 -0500 Subject: Change task rule based on build_dir so main rules don't clobber gem rules. --- tasks/mruby_build_commands.rake | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'tasks') 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| -- cgit v1.2.3 From c7031d85274a2b7eda524bf43e95610bd8ae1d00 Mon Sep 17 00:00:00 2001 From: mattn Date: Thu, 7 Feb 2013 16:35:26 +0900 Subject: Ignore empty gem --- tasks/mruby_build_gem.rake | 2 ++ 1 file changed, 2 insertions(+) (limited to 'tasks') 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 -- cgit v1.2.3