[前][次][番号順一覧][スレッド一覧]

ruby-changes:34740

From: nobu <ko1@a...>
Date: Tue, 15 Jul 2014 17:24:47 +0900 (JST)
Subject: [ruby-changes:34740] nobu:r46823 (trunk): rbinstall.rb: respect DESTDIR

nobu	2014-07-15 17:24:39 +0900 (Tue, 15 Jul 2014)

  New Revision: 46823

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=46823

  Log:
    rbinstall.rb: respect DESTDIR
    
    * lib/rubygems.rb (Gem.install): pass optinos to
      Gem::DependencyInstaller.
    
    * tool/rbinstall.rb (gem): respect DESTDIR.

  Modified files:
    trunk/lib/rubygems.rb
    trunk/tool/rbinstall.rb
Index: lib/rubygems.rb
===================================================================
--- lib/rubygems.rb	(revision 46822)
+++ lib/rubygems.rb	(revision 46823)
@@ -544,9 +544,9 @@ module Gem https://github.com/ruby/ruby/blob/trunk/lib/rubygems.rb#L544
   #   Fetching: minitest-3.0.1.gem (100%)
   #   => [#<Gem::Specification:0x1013b4528 @name="minitest", ...>]
 
-  def self.install name, version = Gem::Requirement.default
+  def self.install name, version = Gem::Requirement.default, **options
     require "rubygems/dependency_installer"
-    inst = Gem::DependencyInstaller.new
+    inst = Gem::DependencyInstaller.new(**options)
     inst.install name, version
     inst.installed_gems
   end
Index: tool/rbinstall.rb
===================================================================
--- tool/rbinstall.rb	(revision 46822)
+++ tool/rbinstall.rb	(revision 46823)
@@ -721,7 +721,7 @@ install?(:ext, :comm, :gem) do https://github.com/ruby/ruby/blob/trunk/tool/rbinstall.rb#L721
   directories = Gem.ensure_gem_subdirectories(gem_dir, :mode => $dir_mode)
   prepare "bundle gems", gem_dir, directories
   Dir.glob(srcdir+'/gems/*.gem').each do |gem|
-    Gem.install gem
+    Gem.install gem, install_dir: with_destdir(Gem.dir)
     gemname = Pathname(gem).basename
     puts "#{" "*30}#{gemname}"
   end

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]