ruby-changes:74002
From: nagachika <ko1@a...>
Date: Sat, 15 Oct 2022 17:28:32 +0900 (JST)
Subject: [ruby-changes:74002] 21c876d3ca (ruby_3_1): merge revision(s) b2491783986084770f6f97552f27b868622730cf:
https://git.ruby-lang.org/ruby.git/commit/?id=21c876d3ca From 21c876d3ca0980c23f55bea4e1fd0328de3395ae Mon Sep 17 00:00:00 2001 From: nagachika <nagachika@r...> Date: Sat, 15 Oct 2022 16:27:31 +0900 Subject: merge revision(s) b2491783986084770f6f97552f27b868622730cf: Install gems `lib` directory to build path --- ext/extmk.rb | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) --- ext/extmk.rb | 19 +++++++++++++++++++ version.h | 2 +- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/ext/extmk.rb b/ext/extmk.rb index 868c1a504d..4d0c415d1b 100755 --- a/ext/extmk.rb +++ b/ext/extmk.rb @@ -589,6 +589,25 @@ exts.each do |d| https://github.com/ruby/ruby/blob/trunk/ext/extmk.rb#L589 end end +if @gemname + src_gemlib = File.join($top_srcdir, ext_prefix, @gemname, "lib") + src_gemlib = relative_from(src_gemlib, ([".."]*ext_prefix.count("/")).join("/")) + gemlib = "#{@gemname}/lib" + if File.directory?(src_gemlib) + if File.exist?(gemlib) + puts "using #{gemlib}" + else + begin + File.symlink(relative_from(src_gemlib, ".."), gemlib) + puts "linked #{gemlib}" + rescue NotImplementedError, Errno::EPERM + FileUtils.cp_r(src_gemlib, gemlib) + puts "copied #{gemlib}" + end + end + end +end + $top_srcdir = srcdir $topdir = "." $hdrdir = hdrdir diff --git a/version.h b/version.h index a28e5ffaec..a28f055caa 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 78 +#define RUBY_PATCHLEVEL 79 #define RUBY_RELEASE_YEAR 2022 #define RUBY_RELEASE_MONTH 10 -- cgit v1.2.1 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/