7 files changed, 37 insertions, 16 deletions
@@ -1214,7 +1214,7 @@ $(BUILTIN_RB_INCS): $(top_srcdir)/tool/mk_builtin_loader.rb
 $(srcdir)/revision.h:
 $(srcdir)/revision.h$(gnumake:yes=-nongnumake):
 $(Q)$(RM) $(@F)
-	$(Q)$(NULLCMD) > $@ || $(NULLCMD) > $(@F)
 revision.tmp::
 $(Q) $(NULLCMD) > $@
@@ -8275,6 +8275,7 @@ load.$(OBJEXT): {$(VPATH)}vm_core.h
 load.$(OBJEXT): {$(VPATH)}vm_opts.h
 loadpath.$(OBJEXT): $(hdrdir)/ruby/ruby.h
 loadpath.$(OBJEXT): $(hdrdir)/ruby/version.h
 loadpath.$(OBJEXT): $(top_srcdir)/version.h
 loadpath.$(OBJEXT): {$(VPATH)}assert.h
 loadpath.$(OBJEXT): {$(VPATH)}backward/2/assume.h
@@ -66,7 +66,13 @@ OptionParser.new {|opts|
 new_vcs["."]
 end
 }
-exit unless vcs
 @output =
 case @output
@@ -76,7 +82,7 @@ exit unless vcs
 }
 when :revision_h
 Proc.new {|last, changed, modified, branch, title|
- vcs.revision_header(last, modified, branch, title, limit: @limit)
 }
 when :doxygen
 Proc.new {|last, changed|
@@ -95,6 +95,15 @@ class VCS
 opts
 end
 attr_reader :srcdir
 def initialize(path)
@@ -204,7 +213,8 @@ class VCS
 revision_handler(rev).short_revision(rev)
 end
- def revision_header(last, modified = nil, branch = nil, title = nil, limit: 20)
 short = short_revision(last)
 if /[^\x00-\x7f]/ =~ title and title.respond_to?(:force_encoding)
 title = title.dup.force_encoding("US-ASCII")
@@ -225,10 +235,11 @@ class VCS
 title = title.dump.sub(/\\#/, '#')
 code << "#define RUBY_LAST_COMMIT_TITLE #{title}"
 end
- if modified
- t = modified.utc
 code << t.strftime('#define RUBY_RELEASE_DATETIME "%FT%TZ"')
 end
 code
 end
@@ -386,7 +397,10 @@ class VCS
 end
 class GIT < self
- register(".git") {|path, dir| File.exist?(File.join(path, dir))}
 COMMAND = ENV["GIT"] || 'git'
 def cmd_args(cmds, srcdir = nil)
@@ -347,7 +347,7 @@ def package(vcs, rev, destdir, tmp = nil)
 end
 File.open("#{v}/revision.h", "wb") {|f|
- f.puts vcs.revision_header(revision)
 }
 version ||= (versionhdr = IO.read("#{v}/version.h"))[RUBY_VERSION_PATTERN, 1]
 version ||=
@@ -13,13 +13,12 @@
 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
 #define RUBY_LEVEL -1
-#define RUBY_RELEASE_YEAR 2022
-#define RUBY_RELEASE_MONTH 9
-#define RUBY_RELEASE_DAY 17
-
 #include "ruby/version.h"
 #include "ruby/internal/abi.h"
 #ifndef TOKEN_PASTE
 #define TOKEN_PASTE(x,y) x##y
 #endif
@@ -38,6 +37,8 @@
 #define RUBY_RELEASE_DAY_STR STRINGIZE(RUBY_RELEASE_DAY)
 #endif
 #ifdef RUBY_ABI_VERSION
 # define RUBY_ABI_VERSION_SUFFIX "+"STRINGIZE(RUBY_ABI_VERSION)
 #else
@@ -61,8 +62,4 @@
 #define RUBY_LEVEL_STR ""
 #endif
-#ifndef RUBY_REVISION
-# include "revision.h"
-#endif
-
 #endif /* RUBY_TOPLEVEL_VERSION_H */
@@ -1244,6 +1244,8 @@ $(RCFILES): $(RBCONFIG) $(srcdir)/revision.h $(srcdir)/win32/resource.rb
 -so_name=$(RUBY_SO_NAME) \
 . $(icondirs) $(win_srcdir)
 update-benchmark-driver:
 $(GIT) clone https://.com/benchmark-driver/benchmark-driver $(srcdir)/benchmark/benchmark-driver || \
 $(GIT) -C $(srcdir)/benchmark/benchmark-driver pull origin master
@@ -89,6 +89,7 @@ if exist %dest% (
 )
 )
 for %%I in (%1) do echo %%~I updated
 copy %src% %dest% > nul
 del %src%