ruby-changes:74027
From: nagachika <ko1@a...>
Date: Sun, 16 Oct 2022 19:38:53 +0900 (JST)
Subject: [ruby-changes:74027] 174594cf77 (ruby_3_1): merge revision(s) d20886dd225e07fe14347398c2c0913f3e11d22a:
https://git.ruby-lang.org/ruby.git/commit/?id=174594cf77 From 174594cf77bed6c3899af4ef14f6c7d257e6461d Mon Sep 17 00:00:00 2001 From: nagachika <nagachika@r...> Date: Sun, 16 Oct 2022 19:33:02 +0900 Subject: merge revision(s) d20886dd225e07fe14347398c2c0913f3e11d22a: Create build-only gemspec files only if having an extension --- tool/gem-unpack.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- tool/gem-unpack.rb | 4 ++-- version.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tool/gem-unpack.rb b/tool/gem-unpack.rb index 0ba23ef4d3..770ddce618 100644 --- a/tool/gem-unpack.rb +++ b/tool/gem-unpack.rb @@ -18,9 +18,9 @@ def Gem.unpack(file, dir = nil, spec_dir = nil) https://github.com/ruby/ruby/blob/trunk/tool/gem-unpack.rb#L18 end FileUtils.mkdir_p(spec_dir) File.binwrite(File.join(spec_dir, "#{spec.name}-#{spec.version}.gemspec"), spec.to_ruby) - unless spec.extensions.empty? or spec.dependencies.empty? + unless spec.extensions.empty? spec.dependencies.clear + File.binwrite(File.join(spec_dir, ".bundled.#{spec.name}-#{spec.version}.gemspec"), spec.to_ruby) end - File.binwrite(File.join(spec_dir, ".bundled.#{spec.name}-#{spec.version}.gemspec"), spec.to_ruby) puts "Unpacked #{file}" end diff --git a/version.h b/version.h index 66996a6281..68b3a26cfc 100644 --- a/version.h +++ b/version.h @@ -11,7 +11,7 @@ https://github.com/ruby/ruby/blob/trunk/version.h#L11 # 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 96 +#define RUBY_PATCHLEVEL 97 #define RUBY_RELEASE_YEAR 2022 #define RUBY_RELEASE_MONTH 10 -- cgit v1.2.3 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/