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

ruby-changes:57365

From: Nobuyoshi <ko1@a...>
Date: Wed, 28 Aug 2019 18:56:54 +0900 (JST)
Subject: [ruby-changes:57365] Nobuyoshi Nakada: c1d0b6adfc (master): Revert "Treat RUBY_REVISION as an integer on old rubies"

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

From c1d0b6adfcbc219db3348b2b2cc4817db21e4b76 Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@r...>
Date: Wed, 28 Aug 2019 16:34:17 +0900
Subject: Revert "Treat RUBY_REVISION as an integer on old rubies"

This reverts commit 6454808c52fff445ff09fefb0fb96988f82aaa3c.

It is no longer needed, as `VCS::SVN#get_revisions` now returns
`Integer` as revision numbers, and `short_revision` should deal
with it.

diff --git a/tool/make-snapshot b/tool/make-snapshot
index d4863bb..9199cc2 100755
--- a/tool/make-snapshot
+++ b/tool/make-snapshot
@@ -293,14 +293,10 @@ def package(vcs, rev, destdir, tmp = nil) https://github.com/ruby/ruby/blob/trunk/tool/make-snapshot#L293
   end
 
   open("#{v}/revision.h", "wb") {|f|
-    if revision.is_a?(Integer)
-      f.puts "#define RUBY_REVISION #{revision}"
-    else
-      short = vcs.short_revision(revision)
-      f.puts "#define RUBY_REVISION #{short.inspect}"
-      unless short == revision
-        f.puts "#define RUBY_FULL_REVISION #{revision.inspect}"
-      end
+    short = vcs.short_revision(revision)
+    f.puts "#define RUBY_REVISION #{short.inspect}"
+    unless short == revision
+      f.puts "#define RUBY_FULL_REVISION #{revision.inspect}"
     end
   }
   version ||= (versionhdr = IO.read("#{v}/version.h"))[RUBY_VERSION_PATTERN, 1]
-- 
cgit v0.10.2


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

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