From 0096f749327fd989d1c97250b949fe2a7e0eeee7 Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 25 Dec 2008 09:52:16 +0000
Subject: merges r20920, r20936, r20939 and r20966 from trunk into ruby_1_9_1.
 * common.mk (revision.h): uses tool/file2lastrev.rb to support   git-svn.

* version.h: changed version string as
  `ruby 1.9.1 (2008-12-22 patchlevel-5000 trunk 20912)
  [i386-darwin9.6.0]'.

* tool/file2lastrev.rb: wrapper script that abstracts subversion
  and git-svn.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@21005 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 version.h | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

(limited to 'version.h')

diff --git a/version.h b/version.h
index c1f44c81d..ce60ce151 100644
--- a/version.h
+++ b/version.h
@@ -30,19 +30,15 @@ RUBY_EXTERN const char ruby_copyright[];
 #define RUBY_REVISION 0
 #endif
 
-#if RUBY_PATCHLEVEL
-#define RUBY_PATCHLEVEL_STR " patchlevel "STRINGIZE(RUBY_PATCHLEVEL)
-#else
-#define RUBY_PATCHLEVEL_STR ""
-#endif
+#define RUBY_PATCHLEVEL_STR " patchlevel-"STRINGIZE(RUBY_PATCHLEVEL)
 #if RUBY_REVISION
-#ifdef RUBY_BRANCH_NAME
-#define RUBY_REVISION_STR " "RUBY_BRANCH_NAME" "STRINGIZE(RUBY_REVISION)
-#else
-#define RUBY_REVISION_STR " revision "STRINGIZE(RUBY_REVISION)
-#endif
+# ifdef RUBY_BRANCH_NAME
+#  define RUBY_REVISION_STR " "RUBY_BRANCH_NAME" "STRINGIZE(RUBY_REVISION)
+# else
+#  define RUBY_REVISION_STR " revision "STRINGIZE(RUBY_REVISION)
+# endif
 #else
-#define RUBY_REVISION_STR ""
+# define RUBY_REVISION_STR ""
 #endif
 
 # define RUBY_DESCRIPTION	    \
-- 
cgit