From cc745f2da175d1658aa2923d65a964848e96d001 Mon Sep 17 00:00:00 2001 From: nagachika Date: Sat, 15 Oct 2022 16:34:32 +0900 Subject: merge revision(s) 416cba90c1610f54dafd91234de9ec74d73ae22c: 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(-) --- tool/rbinstall.rb | 5 ++++- version.h | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb index a644beedd4..8534cf75a3 100755 --- a/tool/rbinstall.rb +++ b/tool/rbinstall.rb @@ -1046,7 +1046,10 @@ install?(:ext, :comm, :gem, :'bundled-gems') do 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 diff --git a/version.h b/version.h index 6b4236ac55..98962bbb58 100644 --- a/version.h +++ b/version.h @@ -11,7 +11,7 @@ # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR #define RUBY_VERSION_TEENY 3 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR -#define RUBY_PATCHLEVEL 86 +#define RUBY_PATCHLEVEL 87 #define RUBY_RELEASE_YEAR 2022 #define RUBY_RELEASE_MONTH 10 -- cgit v1.2.3