kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

rbinstall.rb: fix bundled gems location

Browse source 
* rbinstall.rb: fix target location for installing bundled gems.
  install to the prepared directory instead of default Gem.dir,
  not to be affected GEM_HOME environment variable.  [Fix GH-798]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49047 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2014-12-28 14:49:39 +00:00
parent 42c2cc7c57
commit 34fbf57aaa
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Sun Dec 28 23:49:37 2014 Michal Papis <mpapis@gmail.com>
* rbinstall.rb: fix target location for installing bundled gems.
install to the prepared directory instead of default Gem.dir,
not to be affected GEM_HOME environment variable. [Fix GH-798]
Sun Dec 28 18:19:28 2014 Eric Wong <e@80x24.org> Sun Dec 28 18:19:28 2014 Eric Wong <e@80x24.org>
* test/-ext-/iseq_load/test_iseq_load.rb * test/-ext-/iseq_load/test_iseq_load.rb

2
tool/rbinstall.rb
View file

@ -719,7 +719,7 @@ install?(:ext, :comm, :gem) do
directories = Gem.ensure_gem_subdirectories(gem_dir, :mode => $dir_mode) directories = Gem.ensure_gem_subdirectories(gem_dir, :mode => $dir_mode)
prepare "bundle gems", gem_dir, directories prepare "bundle gems", gem_dir, directories
Dir.glob(srcdir+'/gems/*.gem').each do |gem| Dir.glob(srcdir+'/gems/*.gem').each do |gem|
Gem.install gem, Gem::Requirement.default, :install_dir => with_destdir(Gem.dir), :domain => :local, :ignore_dependencies => true Gem.install gem, Gem::Requirement.default, :install_dir => with_destdir(gem_dir), :domain => :local, :ignore_dependencies => true
gemname = Pathname(gem).basename gemname = Pathname(gem).basename
puts "#{" "*30}#{gemname}" puts "#{" "*30}#{gemname}"
end end