diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2013-01-21 07:37:50 -0800 |
|---|---|---|
| committer | Yukihiro "Matz" Matsumoto <[email protected]> | 2013-01-21 07:37:50 -0800 |
| commit | 461a03ca06bd82328ffd3b8d98f9c88a028c893e (patch) | |
| tree | 96cab92595c0c510ad45ec3473152c84dac6a166 | |
| parent | b5f8fd34cec52b71d137026a9268c888745aadc0 (diff) | |
| parent | a9064dce15ff6872611457b9c3fdc0104167895b (diff) | |
| download | mruby-461a03ca06bd82328ffd3b8d98f9c88a028c893e.tar.gz mruby-461a03ca06bd82328ffd3b8d98f9c88a028c893e.zip | |
Merge pull request #767 from masuidrive/build_error_message
Added "Unknown toolchain/gem" error message
| -rw-r--r-- | tasks/mruby_build.rake | 8 | ||||
| -rw-r--r-- | tasks/mruby_build_gem.rake | 6 |
2 files changed, 8 insertions, 6 deletions
diff --git a/tasks/mruby_build.rake b/tasks/mruby_build.rake index b9e0d2749..711f7f024 100644 --- a/tasks/mruby_build.rake +++ b/tasks/mruby_build.rake @@ -29,10 +29,6 @@ module MRuby conf.instance_eval(&@initializer) end - def toolchain(name) - @@toolchains[name.to_s].setup(self) - end - def self.load Dir.glob("#{File.dirname(__FILE__)}/toolchains/*.rake").each do |file| Kernel.load file @@ -93,7 +89,9 @@ module MRuby end def toolchain(name) - Toolchain.toolchains[name.to_s].setup(self) + tc = Toolchain.toolchains[name.to_s] + fail "Unknown #{name} toolchain" unless tc + tc.setup(self) end def build_dir diff --git a/tasks/mruby_build_gem.rake b/tasks/mruby_build_gem.rake index ae0a79447..80990773d 100644 --- a/tasks/mruby_build_gem.rake +++ b/tasks/mruby_build_gem.rake @@ -2,7 +2,11 @@ module MRuby module LoadGems def gem(gemdir, &block) gemdir = load_external_gem(gemdir) if gemdir.is_a?(Hash) - load File.join(gemdir, "mrbgem.rake") + gemrake = File.join(gemdir, "mrbgem.rake") + + fail "Can't find #{gemrake}" unless File.exists?(gemrake) + load gemrake + Gem.current.dir = gemdir Gem.current.build = MRuby::Build.current Gem.current.build_config_initializer = block |