mirror of
https://github.com/ruby/ruby.git
synced 2025-09-15 16:44:01 +02:00
Make installation messages verbose a little [ci skip]
This commit is contained in:
parent
5b0616b25b
commit
bc6db54d03
1 changed files with 14 additions and 3 deletions
|
@ -1018,6 +1018,7 @@ install?(:ext, :comm, :gem, :'bundled-gems') do
|
||||||
end
|
end
|
||||||
|
|
||||||
installed_gems = {}
|
installed_gems = {}
|
||||||
|
skipped = {}
|
||||||
options = {
|
options = {
|
||||||
:install_dir => install_dir,
|
:install_dir => install_dir,
|
||||||
:bin_dir => with_destdir(bindir),
|
:bin_dir => with_destdir(bindir),
|
||||||
|
@ -1048,11 +1049,20 @@ install?(:ext, :comm, :gem, :'bundled-gems') do
|
||||||
path = "#{srcdir}/.bundle/specifications/#{gem_name}.gemspec"
|
path = "#{srcdir}/.bundle/specifications/#{gem_name}.gemspec"
|
||||||
unless File.exist?(path)
|
unless File.exist?(path)
|
||||||
path = "#{srcdir}/.bundle/gems/#{gem_name}/#{gem_name}.gemspec"
|
path = "#{srcdir}/.bundle/gems/#{gem_name}/#{gem_name}.gemspec"
|
||||||
next unless File.exist?(path)
|
unless File.exist?(path)
|
||||||
|
skipped[gem_name] = "gemspec not found"
|
||||||
|
next
|
||||||
|
end
|
||||||
end
|
end
|
||||||
spec = load_gemspec(path, "#{srcdir}/.bundle/gems/#{gem_name}")
|
spec = load_gemspec(path, "#{srcdir}/.bundle/gems/#{gem_name}")
|
||||||
next unless spec.platform == Gem::Platform::RUBY
|
unless spec.platform == Gem::Platform::RUBY
|
||||||
next unless spec.full_name == gem_name
|
skipped[gem_name] = "not ruby platform (#{spec.platform})"
|
||||||
|
next
|
||||||
|
end
|
||||||
|
unless spec.full_name == gem_name
|
||||||
|
skipped[gem_name] = "full name unmatch #{spec.full_name}"
|
||||||
|
next
|
||||||
|
end
|
||||||
spec.extension_dir = "#{extensions_dir}/#{spec.full_name}"
|
spec.extension_dir = "#{extensions_dir}/#{spec.full_name}"
|
||||||
package = RbInstall::DirPackage.new spec
|
package = RbInstall::DirPackage.new spec
|
||||||
ins = RbInstall::UnpackedInstaller.new(package, options)
|
ins = RbInstall::UnpackedInstaller.new(package, options)
|
||||||
|
@ -1110,6 +1120,7 @@ installs = $install.map do |inst|
|
||||||
end
|
end
|
||||||
installs.flatten!
|
installs.flatten!
|
||||||
installs -= $exclude.map {|exc| $install_procs[exc]}.flatten
|
installs -= $exclude.map {|exc| $install_procs[exc]}.flatten
|
||||||
|
puts "Installing to #$destdir" unless installs.empty?
|
||||||
installs.each do |block|
|
installs.each do |block|
|
||||||
dir = Dir.pwd
|
dir = Dir.pwd
|
||||||
begin
|
begin
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue