summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-21 22:23:53 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-21 22:23:53 +0000
commitbef75368b1edd24323f8f873ed9c5f3ca9e70ec0 (patch)
treee7344902feb7ef07c6cb612e66ae4be5b748779b
parent6f42fdc564ddfab1598ee382a1bc5a52db582384 (diff)
2008-06-22
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@17531 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--version.h43
1 files changed, 38 insertions, 5 deletions
diff --git a/version.h b/version.h
index 06fc7e8f0e..603909fcd8 100644
--- a/version.h
+++ b/version.h
@@ -1,7 +1,7 @@
#define RUBY_VERSION "1.8.7"
-#define RUBY_RELEASE_DATE "2008-06-20"
+#define RUBY_RELEASE_DATE "2008-06-22"
#define RUBY_VERSION_CODE 187
-#define RUBY_RELEASE_CODE 20080620
+#define RUBY_RELEASE_CODE 20080622
#define RUBY_PATCHLEVEL 5000
#define RUBY_VERSION_MAJOR 1
@@ -9,15 +9,20 @@
#define RUBY_VERSION_TEENY 7
#define RUBY_RELEASE_YEAR 2008
#define RUBY_RELEASE_MONTH 6
-#define RUBY_RELEASE_DAY 20
+#define RUBY_RELEASE_DAY 22
#ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[];
RUBY_EXTERN const char ruby_release_date[];
RUBY_EXTERN const char ruby_platform[];
RUBY_EXTERN const int ruby_patchlevel;
-RUBY_EXTERN const char *ruby_description;
-RUBY_EXTERN const char *ruby_copyright;
+#if !NO_STRING_LITERAL_CONCATENATION
+RUBY_EXTERN const char ruby_description[];
+RUBY_EXTERN const char ruby_copyright[];
+#else
+RUBY_EXTERN char ruby_description[];
+RUBY_EXTERN char ruby_copyright[];
+#endif
#endif
#define RUBY_AUTHOR "Yukihiro Matsumoto"
@@ -25,5 +30,33 @@ RUBY_EXTERN const char *ruby_copyright;
#define RUBY_BIRTH_MONTH 2
#define RUBY_BIRTH_DAY 24
+#ifndef RUBY_REVISION
+#include "revision.h"
+#endif
+#ifndef RUBY_REVISION
+#define RUBY_REVISION 0
+#endif
+
+#if RUBY_VERSION_TEENY > 0 && RUBY_PATCHLEVEL < 5000
#define RUBY_RELEASE_STR "patchlevel"
#define RUBY_RELEASE_NUM RUBY_PATCHLEVEL
+#else
+#ifdef RUBY_BRANCH_NAME
+#define RUBY_RELEASE_STR RUBY_BRANCH_NAME
+#else
+#define RUBY_RELEASE_STR "revision"
+#endif
+#define RUBY_RELEASE_NUM RUBY_REVISION
+#endif
+
+# define RUBY_DESCRIPTION \
+ "ruby "RUBY_VERSION \
+ " ("RUBY_RELEASE_DATE" " \
+ RUBY_RELEASE_STR" " \
+ STRINGIZE(RUBY_RELEASE_NUM)") " \
+ "["RUBY_PLATFORM"]"
+# define RUBY_COPYRIGHT \
+ "ruby - Copyright (C) " \
+ STRINGIZE(RUBY_BIRTH_YEAR)"-" \
+ STRINGIZE(RUBY_RELEASE_YEAR)" " \
+ RUBY_AUTHOR