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

ruby-changes:56186

From: Nobuyoshi <ko1@a...>
Date: Sat, 22 Jun 2019 00:03:25 +0900 (JST)
Subject: [ruby-changes:56186] Nobuyoshi Nakada: 8a1dd9b84b (trunk): Revert RUBY_RELEASE_DATE to date only

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

From 8a1dd9b84b02737cf43e62439730caec678cccf5 Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@r...>
Date: Fri, 21 Jun 2019 23:45:39 +0900
Subject: Revert RUBY_RELEASE_DATE to date only


diff --git a/tool/file2lastrev.rb b/tool/file2lastrev.rb
index 090f2e9..44c4318 100755
--- a/tool/file2lastrev.rb
+++ b/tool/file2lastrev.rb
@@ -75,12 +75,7 @@ vcs = nil https://github.com/ruby/ruby/blob/trunk/tool/file2lastrev.rb#L75
           "#define RUBY_LAST_COMMIT_TITLE #{title.dump}"
         end,
         if modified
-          modified.utc.strftime(<<TIME)
-#if defined(RUBY_PATCHLEVEL) && (RUBY_PATCHLEVEL == -1)
-#undef RUBY_RELEASE_DATE
-#define RUBY_RELEASE_DATE "%FT%TZ"
-#endif
-TIME
+          modified.utc.strftime('#define RUBY_RELEASE_DATETIME "%FT%TZ"')
         end,
       ].compact
     }
diff --git a/version.h b/version.h
index 10ab1f6..6d41a35 100644
--- a/version.h
+++ b/version.h
@@ -52,6 +52,9 @@ https://github.com/ruby/ruby/blob/trunk/version.h#L52
 #   define RUBY_BRANCH_NAME "trunk"
 #  endif
 #  define RUBY_REVISION_STR " "RUBY_BRANCH_NAME" "RUBY_REVISION
+#  ifndef RUBY_RELEASE_DATETIME
+#   define RUBY_RELEASE_DATETIME RUBY_RELEASE_DATE
+#  endif
 # else
 #  define RUBY_REVISION_STR " revision "RUBY_REVISION
 # endif
@@ -63,7 +66,7 @@ https://github.com/ruby/ruby/blob/trunk/version.h#L66
 # define RUBY_DESCRIPTION_WITH(opt) \
     "ruby "RUBY_VERSION		    \
     RUBY_PATCHLEVEL_STR		    \
-    " ("RUBY_RELEASE_DATE	    \
+    " ("RUBY_RELEASE_DATETIME	    \
     RUBY_REVISION_STR")"opt" "	    \
     "["RUBY_PLATFORM"]"
 # define RUBY_COPYRIGHT		    \
-- 
cgit v0.10.2


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

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