summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornagachika <nagachika@ruby-lang.org>2022-10-21 16:13:01 +0900
committernagachika <nagachika@ruby-lang.org>2022-10-21 16:17:48 +0900
commit833076de9bceb34200d1bf21a9f75997fc387b67 (patch)
tree0f4b40753767702847aa41869e32284cf8abde2f
parent939f8c0e665f49ce7b438b796a2e4b2785f290d8 (diff)
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(-)
-rw-r--r--common.mk3
-rw-r--r--defs/gmake.mk1
-rw-r--r--version.h2
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
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
-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))
$(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 @@
# 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