summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xtool/file2lastrev.rb7
-rw-r--r--version.h5
2 files changed, 5 insertions, 7 deletions
diff --git a/tool/file2lastrev.rb b/tool/file2lastrev.rb
index 090f2e981d..44c4318cd8 100755
--- a/tool/file2lastrev.rb
+++ b/tool/file2lastrev.rb
@@ -75,12 +75,7 @@ vcs = nil
"#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 10ab1f607e..6d41a35a17 100644
--- a/version.h
+++ b/version.h
@@ -52,6 +52,9 @@
# 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 @@
# 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 \