Update revision.h in packages using `VCS#revision_header`

2 files changed, 4 insertions, 8 deletions

diff --git a/tool/lib/vcs.rb b/tool/lib/vcs.rb
index 75a5d65f2f..db3a6f436f 100644
--- a/tool/lib/vcs.rb
+++ b/tool/lib/vcs.rb
@@ -204,7 +204,7 @@ class VCS
     revision_handler(rev).short_revision(rev)
   end
 
-  def revision_header(last, changed, modified, branch, title, limit: 20)
+  def revision_header(last, changed, modified, branch, title, limit: 20, time: true)
     short = short_revision(last)
     if /[^\x00-\x7f]/ =~ title and title.respond_to?(:force_encoding)
       title = title.dup.force_encoding("US-ASCII")
@@ -225,7 +225,7 @@ class VCS
       title = title.dump.sub(/\\#/, '#')
       code << "#define RUBY_LAST_COMMIT_TITLE #{title}"
     end
-    if modified
+    if modified and time
       t = modified.utc
       code << t.strftime('#define RUBY_RELEASE_DATETIME "%FT%TZ"')
     end
diff --git a/tool/make-snapshot b/tool/make-snapshot
index 6b02da5139..2c15a52dbb 100755
--- a/tool/make-snapshot
+++ b/tool/make-snapshot
@@ -309,7 +309,7 @@ def package(vcs, rev, destdir, tmp = nil)
       warn "#{$0}: #{rev} not found"
       return
     end
-    revision = vcs.get_revisions(url)[1]
+    revision = (info = vcs.get_revisions(url))[1]
   end
 
   v = "ruby"
@@ -346,11 +346,7 @@ def package(vcs, rev, destdir, tmp = nil)
   end
 
   File.open("#{v}/revision.h", "wb") {|f|
-    short = vcs.short_revision(revision)
-    f.puts "#define RUBY_REVISION #{short.inspect}"
-    unless short == revision
-      f.puts "#define RUBY_FULL_REVISION #{revision.inspect}"
-    end
+    f.puts vcs.revision_header(*info, time: false)
   }
   version ||= (versionhdr = IO.read("#{v}/version.h"))[RUBY_VERSION_PATTERN, 1]
   version ||=