Commit 461a03ca authored by Yukihiro "Matz" Matsumoto's avatar Yukihiro "Matz" Matsumoto

Merge pull request #767 from masuidrive/build_error_message

Added "Unknown toolchain/gem" error message
parents b5f8fd34 a9064dce
...@@ -29,10 +29,6 @@ module MRuby ...@@ -29,10 +29,6 @@ module MRuby
conf.instance_eval(&@initializer) conf.instance_eval(&@initializer)
end end
def toolchain(name)
@@toolchains[name.to_s].setup(self)
end
def self.load def self.load
Dir.glob("#{File.dirname(__FILE__)}/toolchains/*.rake").each do |file| Dir.glob("#{File.dirname(__FILE__)}/toolchains/*.rake").each do |file|
Kernel.load file Kernel.load file
...@@ -93,7 +89,9 @@ module MRuby ...@@ -93,7 +89,9 @@ module MRuby
end end
def toolchain(name) 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 end
def build_dir def build_dir
......
...@@ -2,7 +2,11 @@ module MRuby ...@@ -2,7 +2,11 @@ module MRuby
module LoadGems module LoadGems
def gem(gemdir, &block) def gem(gemdir, &block)
gemdir = load_external_gem(gemdir) if gemdir.is_a?(Hash) 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.dir = gemdir
Gem.current.build = MRuby::Build.current Gem.current.build = MRuby::Build.current
Gem.current.build_config_initializer = block Gem.current.build_config_initializer = block
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment