ruby-changes:74026
From: nagachika <ko1@a...>
Date: Sun, 16 Oct 2022 18:40:51 +0900 (JST)
Subject: [ruby-changes:74026] e3abdccca0 (ruby_3_1): merge revision(s) db3d111c1d1e90b400f1e737ded6a4e4bdf2cec8:
https://git.ruby-lang.org/ruby.git/commit/?id=e3abdccca0 From e3abdccca020496b047769e506db8da7342ea15f Mon Sep 17 00:00:00 2001 From: nagachika <nagachika@r...> Date: Sun, 16 Oct 2022 16:29:02 +0900 Subject: merge revision(s) db3d111c1d1e90b400f1e737ded6a4e4bdf2cec8: Bundled gems are expanded under `.bundle/gems` now --- ext/extmk.rb | 13 +++++++------ template/exts.mk.tmpl | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) --- ext/extmk.rb | 13 +++++++------ template/exts.mk.tmpl | 2 +- version.h | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/ext/extmk.rb b/ext/extmk.rb index 4d0c415d1b..1ba0db8285 100755 --- a/ext/extmk.rb +++ b/ext/extmk.rb @@ -146,7 +146,7 @@ def extmake(target, basedir = 'ext', maybestatic = true) https://github.com/ruby/ruby/blob/trunk/ext/extmk.rb#L146 top_srcdir = $top_srcdir topdir = $topdir hdrdir = $hdrdir - prefix = "../" * (target.count("/")+1) + prefix = "../" * (basedir.count("/")+target.count("/")+1) $top_srcdir = relative_from(top_srcdir, prefix) $hdrdir = relative_from(hdrdir, prefix) $topdir = prefix + $topdir @@ -463,10 +463,11 @@ for dir in ["ext", File::join($top_srcdir, "ext")] https://github.com/ruby/ruby/blob/trunk/ext/extmk.rb#L463 end unless $extstatic @gemname = nil -if ARGV[0] - ext_prefix, exts = ARGV.shift.split('/', 2) +if exts = ARGV.shift + ext_prefix = exts[%r[\A(?>\.bundle/)?[^/]+(?:/(?=(.+)?)|\z)]] + exts = $1 $extension = [exts] if exts - if ext_prefix == 'gems' + if ext_prefix.start_with?('.') @gemname = exts elsif exts $static_ext.delete_if {|t, *| !File.fnmatch(t, exts)} @@ -518,7 +519,7 @@ cond = proc {|ext, *| https://github.com/ruby/ruby/blob/trunk/ext/extmk.rb#L519 exts.delete_if {|d| File.fnmatch?("-*", d)} end end -ext_prefix = File.basename(ext_prefix) +ext_prefix = ext_prefix[$top_srcdir.size+1..-2] extend Module.new { def timestamp_file(name, target_prefix = nil) @@ -667,7 +668,7 @@ rubies = [] https://github.com/ruby/ruby/blob/trunk/ext/extmk.rb#L668 end } -Dir.chdir ".." +Dir.chdir dir unless $destdir.to_s.empty? $mflags.defined?("DESTDIR") or $mflags << "DESTDIR=#{$destdir}" end diff --git a/template/exts.mk.tmpl b/template/exts.mk.tmpl index 924abeb2fb..909689514a 100644 --- a/template/exts.mk.tmpl +++ b/template/exts.mk.tmpl @@ -25,7 +25,7 @@ macros["old_extensions"] = [] https://github.com/ruby/ruby/blob/trunk/template/exts.mk.tmpl#L25 contpat = /(?>(?>[^\\\n]|\\.)*\\\n)*(?>[^\\\n]|\\.)*/ Dir.glob("{ext,.bundle/gems}/*/exts.mk") do |e| - gem = /\Agems(?=\/)/ =~ e + gem = e.start_with?(".bundle/gems/") s = File.read(e) s.scan(/^(extensions|SUBMAKEOPTS|EXT[A-Z]+|MFLAGS|NOTE_[A-Z]+)[ \t]*=[ \t]*(#{contpat})$/o) do |n, v| v.gsub!(/\\\n[ \t]*/, ' ') diff --git a/version.h b/version.h index 6d9b066faa..706630919c 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 90 +#define RUBY_PATCHLEVEL 91 #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/