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

ruby-changes:74184

From: nagachika <ko1@a...>
Date: Fri, 21 Oct 2022 17:18:16 +0900 (JST)
Subject: [ruby-changes:74184] 833076de9b (ruby_3_1): merge revision(s) abfd859b139545110e1fcdd8e99575d5e0bfb4e4:

https://git.ruby-lang.org/ruby.git/commit/?id=833076de9b

From 833076de9bceb34200d1bf21a9f75997fc387b67 Mon Sep 17 00:00:00 2001
From: nagachika <nagachika@r...>
Date: Fri, 21 Oct 2022 16:13:01 +0900
Subject: merge revision(s) abfd859b139545110e1fcdd8e99575d5e0bfb4e4:

	Remove github and git related files from extracted bundled gems

	---
	 common.mk     | 3 ++-
	 defs/gmake.mk | 1 +
	 2 files changed, 3 insertions(+), 1 deletion(-)
---
 common.mk     | 3 ++-
 defs/gmake.mk | 1 +
 version.h     | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/common.mk b/common.mk
index 622dd60bc9..c3a5bfe7ce 100644
--- a/common.mk
+++ b/common.mk
@@ -1368,7 +1368,7 @@ update-gems$(gnumake:yes=-sequential): PHONY https://github.com/ruby/ruby/blob/trunk/common.mk#L1368
 extract-gems$(gnumake:yes=-sequential): PHONY
 	$(ECHO) Extracting bundled gem files...
 	$(Q) $(RUNRUBY) -C "$(srcdir)" \
-	    -Itool -rgem-unpack -answ \
+	    -Itool -rfileutils -rgem-unpack -answ \
 	    -e 'BEGIN {FileUtils.mkdir_p(d = ".bundle/gems")}' \
 	    -e 'gem, ver, _, rev = *$$F' \
 	    -e 'next if !ver or /^#/=~gem' \
@@ -1379,6 +1379,7 @@ extract-gems$(gnumake:yes=-sequential): PHONY https://github.com/ruby/ruby/blob/trunk/common.mk#L1379
 	    -e 'else' \
 	    -e   'Gem.unpack("gems/#{g}.gem", ".bundle")' \
 	    -e 'end' \
+	    -e 'FileUtils.rm_rf("#{d}/#{g}/.github")' \
 	    gems/bundled_gems
 
 update-bundled_gems: PHONY
diff --git a/defs/gmake.mk b/defs/gmake.mk
index 242f902bce..1b395d60be 100644
--- a/defs/gmake.mk
+++ b/defs/gmake.mk
@@ -299,6 +299,7 @@ extract-gems: | $(patsubst %,.bundle/gems/%,$(bundled-gems)) https://github.com/ruby/ruby/blob/trunk/defs/gmake.mk#L299
 	$(Q) $(BASERUBY) -C "$(srcdir)" \
 	    -Itool -rgem-unpack \
 	    -e 'Gem.unpack("gems/$(@F).gem", ".bundle")'
+	$(RMALL) "$(srcdir)/$(@:.gem=)/".git*
 
 $(srcdir)/.bundle/gems:
 	$(MAKEDIRS) $@
diff --git a/version.h b/version.h
index 2f8e036594..2255c186d4 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 149
+#define RUBY_PATCHLEVEL 150
 
 #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/

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