ruby-changes:74111
From: nagachika <ko1@a...>
Date: Tue, 18 Oct 2022 21:52:08 +0900 (JST)
Subject: [ruby-changes:74111] 5f8c654949 (ruby_3_1): merge revision(s) 76664905a589416739a13241e7b8535d78984723:
https://git.ruby-lang.org/ruby.git/commit/?id=5f8c654949 From 5f8c65494985f1afaf0f8d0e4dbb06acbd87da53 Mon Sep 17 00:00:00 2001 From: nagachika <nagachika@r...> Date: Tue, 18 Oct 2022 21:48:34 +0900 Subject: merge revision(s) 76664905a589416739a13241e7b8535d78984723: Ignore fake.rb for snapshot --- common.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- common.mk | 6 +++--- version.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/common.mk b/common.mk index 42851b1d71..16a388a674 100644 --- a/common.mk +++ b/common.mk @@ -756,10 +756,10 @@ no-fake -fake: PHONY https://github.com/ruby/ruby/blob/trunk/common.mk#L756 $(HAVE_BASERUBY:no=)$(arch)-fake.rb: miniruby$(EXEEXT) # actually depending on other headers more. -$(arch)-fake.rb: $(top_srcdir)/revision.h $(top_srcdir)/version.h $(srcdir)/version.c -$(arch)-fake.rb: {$(VPATH)}id.h {$(VPATH)}vm_opts.h +$(arch:noarch=ignore)-fake.rb: $(top_srcdir)/revision.h $(top_srcdir)/version.h $(srcdir)/version.c +$(arch:noarch=ignore)-fake.rb: {$(VPATH)}id.h {$(VPATH)}vm_opts.h -$(arch)-fake.rb: $(srcdir)/template/fake.rb.in $(tooldir)/generic_erb.rb +$(arch:noarch=ignore)-fake.rb: $(srcdir)/template/fake.rb.in $(tooldir)/generic_erb.rb $(ECHO) generating $@ $(Q) $(CPP) -DRUBY_EXPORT $(INCFLAGS) $(CPPFLAGS) "$(srcdir)/version.c" | \ $(BOOTSTRAPRUBY) "$(tooldir)/generic_erb.rb" -o $@ "$(srcdir)/template/fake.rb.in" \ diff --git a/version.h b/version.h index 7664106e8e..1dde5034df 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 108 +#define RUBY_PATCHLEVEL 109 #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/