From 1931c78762bd436090a6f935ef1a7e573c29e9cf Mon Sep 17 00:00:00 2001 From: nagachika Date: Fri, 21 Oct 2022 18:54:54 +0900 Subject: merge revision(s) 41516b35418d6108c75d9f2190a846ded6a47108: Extract bundled gems by BASERUBY --- common.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- common.mk | 4 ++-- version.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common.mk b/common.mk index 9c693c295b..6ca284157a 100644 --- a/common.mk +++ b/common.mk @@ -1367,7 +1367,7 @@ update-gems$(gnumake:yes=-sequential): PHONY extract-gems$(gnumake:yes=-sequential): PHONY $(ECHO) Extracting bundled gem files... - $(Q) $(RUNRUBY) -C "$(srcdir)" \ + $(Q) $(BASERUBY) -C "$(srcdir)" \ -Itool/lib -rfileutils -rbundled_gem -answ \ -e 'BEGIN {FileUtils.mkdir_p(d = ".bundle/gems")}' \ -e 'gem, ver, _, rev = *$$F' \ @@ -1396,7 +1396,7 @@ yes-test-bundled-gems-precheck: main no-test-bundled-gems-precheck: test-bundled-gems-fetch: yes-test-bundled-gems-fetch -yes-test-bundled-gems-fetch: $(PREP) +yes-test-bundled-gems-fetch: $(ACTIONS_GROUP) $(Q) $(BASERUBY) -C $(srcdir)/gems ../tool/fetch-bundled_gems.rb src bundled_gems $(ACTIONS_ENDGROUP) diff --git a/version.h b/version.h index 151c5ccb9f..e0953339d8 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 152 +#define RUBY_PATCHLEVEL 153 #define RUBY_RELEASE_YEAR 2022 #define RUBY_RELEASE_MONTH 10 -- cgit v1.2.3