[前][次][番号順一覧][スレッド一覧]

ruby-changes:72542

From: Nobuyoshi <ko1@a...>
Date: Thu, 14 Jul 2022 09:00:31 +0900 (JST)
Subject: [ruby-changes:72542] 416cba90c1 (master): Try to install also gemspec files under gem directories

https://git.ruby-lang.org/ruby.git/commit/?id=416cba90c1

From 416cba90c1610f54dafd91234de9ec74d73ae22c Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@r...>
Date: Wed, 13 Jul 2022 22:17:18 +0900
Subject: Try to install also gemspec files under gem directories

Gemspec files having extension libraries are placed under each gem
directories now.
---
 tool/rbinstall.rb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb
index cbefb0ebbc..ab3193f9e0 100755
--- a/tool/rbinstall.rb
+++ b/tool/rbinstall.rb
@@ -1051,7 +1051,10 @@ install?(:ext, :comm, :gem, :'bundled-gems') do https://github.com/ruby/ruby/blob/trunk/tool/rbinstall.rb#L1051
     next unless /^(\S+)\s+(\S+).*/ =~ name
     gem_name = "#$1-#$2"
     path = "#{srcdir}/.bundle/specifications/#{gem_name}.gemspec"
-    next unless File.exist?(path)
+    unless File.exist?(path)
+      path = "#{srcdir}/.bundle/gems/#{gem_name}/#{gem_name}.gemspec"
+      next unless File.exist?(path)
+    end
     spec = load_gemspec(path, "#{srcdir}/.bundle/gems/#{gem_name}")
     next unless spec.platform == Gem::Platform::RUBY
     next unless spec.full_name == gem_name
-- 
cgit v1.2.1


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]