1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rbinstall.rb: reuse options hash

Browse Source 
* tool/rbinstall.rb (gem): reuse options hash, which is invariant
  for all gems.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49233 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2015-01-13 08:21:51 +00:00
parent a28e2ac46b
commit 79cd3c3757
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tool/rbinstall.rb
View File

@ -715,8 +715,16 @@ install?(:ext, :comm, :gem) do
gem_dir = Gem.default_dir gem_dir = Gem.default_dir
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
options = {
:install_dir => with_destdir(gem_dir),
:domain => :local,
:ignore_dependencies => true,
:dir_mode => $dir_mode,
:data_mode => $data_mode,
:prog_mode => $prog_mode,
}
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, options)
gemname = Pathname(gem).basename gemname = Pathname(gem).basename
puts "#{" "*30}#{gemname}" puts "#{" "*30}#{gemname}"
end end