summaryrefslogtreecommitdiff
path: root/tool/rbinstall.rb
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-04-05 00:34:27 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-04-05 00:34:27 +0000
commit5180de635a93d079070f1c942522cf2a969ec7f8 (patch)
tree0c02a4801f19ea654568209e177524bf60493b5b /tool/rbinstall.rb
parent09bcf7b51b316562f706493b726c2b54010e0724 (diff)
rbinstall.rb: same options for gems
* tool/rbinstall.rb (gem): share same options between normal installer and unpacked installer. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50168 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'tool/rbinstall.rb')
-rwxr-xr-xtool/rbinstall.rb29
1 files changed, 12 insertions, 17 deletions
diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb
index 50bb643..0ea6e8c 100755
--- a/tool/rbinstall.rb
+++ b/tool/rbinstall.rb
@@ -736,13 +736,19 @@ install?(:ext, :comm, :gem) do
prepare "bundle gems", gem_dir, directories
install_dir = with_destdir(gem_dir)
installed_gems = {}
+ options = {
+ :install_dir => install_dir,
+ :bin_dir => with_destdir(bindir),
+ :domain => :local,
+ :ignore_dependencies => true,
+ :dir_mode => $dir_mode,
+ :data_mode => $data_mode,
+ :prog_mode => $prog_mode,
+ :wrappers => true,
+ :format_executable => true,
+ }
Gem::Specification.each_spec([srcdir+'/gems/*']) do |spec|
- ins = RbInstall::UnpackedInstaller.new(spec,
- :install_dir => install_dir,
- :bin_dir => with_destdir(bindir),
- :wrappers => true,
- :ignore_dependencies => true,
- :format_executable => true)
+ ins = RbInstall::UnpackedInstaller.new(spec, options)
puts "#{" "*30}#{spec.name} #{spec.version}"
ins.install
installed_gems[spec.full_name] = true
@@ -753,17 +759,6 @@ install?(:ext, :comm, :gem) do
end
next if gems.empty?
if defined?(Zlib)
- options = {
- :install_dir => install_dir,
- :bin_dir => with_destdir(bindir),
- :domain => :local,
- :ignore_dependencies => true,
- :dir_mode => $dir_mode,
- :data_mode => $data_mode,
- :prog_mode => $prog_mode,
- :wrappers => true,
- :format_executable => true,
- }
gems.each do |gem|
Gem.install(gem, Gem::Requirement.default, options)
gemname = File.basename(gem)