diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2013-08-05 01:27:21 -0700 |
|---|---|---|
| committer | Yukihiro "Matz" Matsumoto <[email protected]> | 2013-08-05 01:27:21 -0700 |
| commit | ac125ad1a3d75cbf2dfe07cf5a41aa100f8610de (patch) | |
| tree | 015aa38e53fbaab7728bffddbfc6f04fbad7a92f /tasks | |
| parent | e8c3dd26d55822bcc8e526de51074e72bc7e02d2 (diff) | |
| parent | 981b408e01f0ebd1c8fd8960ef93ccbf8171a07f (diff) | |
| download | mruby-ac125ad1a3d75cbf2dfe07cf5a41aa100f8610de.tar.gz mruby-ac125ad1a3d75cbf2dfe07cf5a41aa100f8610de.zip | |
Merge pull request #1432 from Archytaus/gem_clone_dir
Custom build path pulls git gems for every build target
Diffstat (limited to 'tasks')
| -rw-r--r-- | tasks/mruby_build.rake | 7 | ||||
| -rw-r--r-- | tasks/mruby_build_gem.rake | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/tasks/mruby_build.rake b/tasks/mruby_build.rake index ef7f06a81..ff6110884 100644 --- a/tasks/mruby_build.rake +++ b/tasks/mruby_build.rake @@ -43,7 +43,7 @@ module MRuby end include Rake::DSL include LoadGems - attr_accessor :name, :bins, :exts, :file_separator, :build_dir + attr_accessor :name, :bins, :exts, :file_separator, :build_dir, :gem_clone_dir attr_reader :libmruby, :gems COMPILERS = %w(cc cxx objc asm) @@ -64,6 +64,7 @@ module MRuby @file_separator = '/' @build_dir = "#{MRUBY_ROOT}/build/#{@name}" + @gem_clone_dir = "#{MRUBY_ROOT}/build/mrbgems" @cc = Command::Compiler.new(self, %w(.c)) @cxx = Command::Compiler.new(self, %w(.cc .cxx .cpp)) @objc = Command::Compiler.new(self, %w(.m)) @@ -194,8 +195,8 @@ module MRuby attr_block %w(test_runner) def initialize(name, &block) - @test_runner = Command::CrossTestRunner.new(self) - super + @test_runner = Command::CrossTestRunner.new(self) + super end def run_test diff --git a/tasks/mruby_build_gem.rake b/tasks/mruby_build_gem.rake index 24aea71ab..39be984ad 100644 --- a/tasks/mruby_build_gem.rake +++ b/tasks/mruby_build_gem.rake @@ -39,7 +39,7 @@ module MRuby gemdir = "#{root}/mrbgems/#{params[:core]}" elsif params[:git] url = params[:git] - gemdir = "#{build_dir}/mrbgems/#{url.match(/([-\w]+)(\.[-\w]+|)$/).to_a[1]}" + gemdir = "#{gem_clone_dir}/#{url.match(/([-\w]+)(\.[-\w]+|)$/).to_a[1]}" if File.exists?(gemdir) if $pull_gems @@ -50,7 +50,7 @@ module MRuby else options = [params[:options]] || [] options << "--branch \"#{params[:branch]}\"" if params[:branch] - FileUtils.mkdir_p "#{build_dir}/mrbgems" + FileUtils.mkdir_p "#{gem_clone_dir}" git.run_clone gemdir, url, options end else |