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

ruby-changes:74022

From: nagachika <ko1@a...>
Date: Sun, 16 Oct 2022 18:40:47 +0900 (JST)
Subject: [ruby-changes:74022] ae6f46db35 (ruby_3_1): merge revision(s) 0c9803b0fdfd17981bd9f59767adab0207c3a74d:

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

From ae6f46db35ed4327370001be267cc1edfb891816 Mon Sep 17 00:00:00 2001
From: nagachika <nagachika@r...>
Date: Sun, 16 Oct 2022 16:46:07 +0900
Subject: merge revision(s) 0c9803b0fdfd17981bd9f59767adab0207c3a74d:

	The "gems" build directory was rename as ".bundle"

	---
	 common.mk            | 12 ++++++------
	 template/Makefile.in | 10 +++++-----
	 2 files changed, 11 insertions(+), 11 deletions(-)
---
 common.mk            | 12 ++++++------
 template/Makefile.in | 10 +++++-----
 version.h            |  2 +-
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/common.mk b/common.mk
index 71771bf16b..39b8b727f5 100644
--- a/common.mk
+++ b/common.mk
@@ -685,18 +685,18 @@ realclean-platform: distclean-platform https://github.com/ruby/ruby/blob/trunk/common.mk#L685
 realclean-spec: distclean-spec
 realclean-rubyspec: realclean-spec
 
-clean-ext:: ext/clean gems/clean timestamp/clean
-distclean-ext:: ext/distclean gems/distclean timestamp/distclean
-realclean-ext:: ext/realclean gems/realclean timestamp/realclean
+clean-ext:: ext/clean .bundle/clean timestamp/clean
+distclean-ext:: ext/distclean .bundle/distclean timestamp/distclean
+realclean-ext:: ext/realclean .bundle/realclean timestamp/realclean
 
 ext/clean.mk ext/distclean.mk ext/realclean.mk::
 ext/clean:: ext/clean.mk
 ext/distclean:: ext/distclean.mk
 ext/realclean:: ext/realclean.mk
 
-timestamp/clean:: ext/clean gems/clean
-timestamp/distclean:: ext/distclean gems/distclean
-timestamp/realclean:: ext/realclean gems/realclean
+timestamp/clean:: ext/clean .bundle/clean
+timestamp/distclean:: ext/distclean .bundle/distclean
+timestamp/realclean:: ext/realclean .bundle/realclean
 
 timestamp/clean timestamp/distclean timestamp/realclean::
 	$(Q)$(RM) $(TIMESTAMPDIR)/.*.time $(TIMESTAMPDIR)/$(arch)/.time
diff --git a/template/Makefile.in b/template/Makefile.in
index 9e6d6fe0e3..7e23b716a1 100644
--- a/template/Makefile.in
+++ b/template/Makefile.in
@@ -508,12 +508,12 @@ ext/clean.mk ext/distclean.mk ext/realclean.mk:: https://github.com/ruby/ruby/blob/trunk/template/Makefile.in#L508
 ext/clean:: ext/clean.sub
 ext/distclean:: ext/distclean.sub
 ext/realclean:: ext/realclean.sub
-gems/clean:: gems/clean.sub
-gems/distclean:: gems/distclean.sub
-gems/realclean:: gems/realclean.sub
+.bundle/clean:: .bundle/clean.sub
+.bundle/distclean:: .bundle/distclean.sub
+.bundle/realclean:: .bundle/realclean.sub
 
 ext/clean.sub ext/distclean.sub ext/realclean.sub \
-gems/clean.sub gems/distclean.sub gems/realclean.sub::
+.bundle/clean.sub .bundle/distclean.sub .bundle/realclean.sub::
 	$(Q) set dummy `echo "${EXTS}" | tr , ' '`; shift; \
 	test "$$#" = 0 && set .; \
 	set dummy `\
@@ -529,7 +529,7 @@ gems/clean.sub gems/distclean.sub gems/realclean.sub:: https://github.com/ruby/ruby/blob/trunk/template/Makefile.in#L529
 	    fi; \
 	done || true
 
-ext/distclean ext/realclean gems/distclean gems/realclean::
+ext/distclean ext/realclean .bundle/distclean .bundle/realclean::
 	$(Q) set dummy `echo "${EXTS}" | tr , ' '`; shift; \
 	test "$$#" = 0 && set .; \
 	cd $(@D) 2>/dev/null && \
diff --git a/version.h b/version.h
index 1d4a6b0b90..6932a6916b 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 94
+#define RUBY_PATCHLEVEL 95
 
 #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/

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