From 121001c4f5bed42d5fb56786c5258026a9c325f8 Mon Sep 17 00:00:00 2001 From: skandhas Date: Mon, 21 Jan 2013 14:34:30 +0800 Subject: fix build faild on Cygwin Environment --- tasks/mruby_build.rake | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'tasks/mruby_build.rake') diff --git a/tasks/mruby_build.rake b/tasks/mruby_build.rake index bcae9dfd9..42120b3b4 100644 --- a/tasks/mruby_build.rake +++ b/tasks/mruby_build.rake @@ -63,12 +63,11 @@ module MRuby if ENV['OS'] == 'Windows_NT' @exts = Exts.new('.o', '.exe', '.a') - @file_separator = '\\' else @exts = Exts.new('.o', '', '.a') - @file_separator = '/' end + @file_separator = '/' @cc = Command::Compiler.new(self, %w(.c)) @cxx = Command::Compiler.new(self, %w(.cc .cxx .cpp)) @objc = Command::Compiler.new(self, %w(.m)) -- cgit v1.2.3 From a9064dce15ff6872611457b9c3fdc0104167895b Mon Sep 17 00:00:00 2001 From: Yuichiro MASUI Date: Mon, 21 Jan 2013 23:52:39 +0900 Subject: Added "Unknown toolchain/gem" error message --- tasks/mruby_build.rake | 8 +++----- tasks/mruby_build_gem.rake | 6 +++++- 2 files changed, 8 insertions(+), 6 deletions(-) (limited to 'tasks/mruby_build.rake') 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 -- cgit v1.2.3