aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNobuyoshi Nakada <nobu@ruby-lang.org>2023-01-18 23:42:18 +0900
committerNobuyoshi Nakada <nobu@ruby-lang.org>2023-01-18 23:55:25 +0900
commit03f5db01e6be9b522d6fbbfb54f07d168c1a3a34 (patch)
treec86d37fc46771910e59251957caf8f1b4f10ea99
parent8e53f09baaec292e399afba5631a83cefbd63fd8 (diff)
downloadruby-03f5db01e6be9b522d6fbbfb54f07d168c1a3a34.tar.gz
Make installation messages verbose a little [ci skip]
-rwxr-xr-xtool/rbinstall.rb23
1 files changed, 19 insertions, 4 deletions
diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb
index 02ce7faaa7..85d05eff25 100755
--- a/tool/rbinstall.rb
+++ b/tool/rbinstall.rb
@@ -999,6 +999,7 @@ install?(:ext, :comm, :gem, :'bundled-gems') do
end
installed_gems = {}
+ skipped = {}
options = {
:install_dir => install_dir,
:bin_dir => with_destdir(bindir),
@@ -1029,11 +1030,20 @@ install?(:ext, :comm, :gem, :'bundled-gems') do
path = "#{srcdir}/.bundle/specifications/#{gem_name}.gemspec"
unless File.exist?(path)
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
spec = load_gemspec(path, "#{srcdir}/.bundle/gems/#{gem_name}")
- next unless spec.platform == Gem::Platform::RUBY
- next unless spec.full_name == gem_name
+ unless spec.platform == Gem::Platform::RUBY
+ 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}"
package = RbInstall::DirPackage.new spec
ins = RbInstall::UnpackedInstaller.new(package, options)
@@ -1051,7 +1061,11 @@ install?(:ext, :comm, :gem, :'bundled-gems') do
install installed_gems, gem_dir+"/cache"
end
unless gems.empty?
- puts "skipped bundled gems: #{gems.join(' ')}"
+ skipped.default = "not found in bundled_gems"
+ puts "skipped bundled gems:"
+ gems.each do |gem|
+ printf " %-32s%s\n", File.basename(gem), skipped[gem]
+ end
end
end
@@ -1071,6 +1085,7 @@ installs = $install.map do |inst|
end
installs.flatten!
installs -= $exclude.map {|exc| $install_procs[exc]}.flatten
+puts "Installing to #$destdir" unless installs.empty?
installs.each do |block|
dir = Dir.pwd
begin