From 7637592bfd62f0fcbd6897e65abf1bf3fa78488c Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 12 Jan 2009 13:32:24 +0000
Subject: merges r21415 and r21417 from trunk into ruby_1_9_1. * version.h:
 make version string succinct:   "ruby 1.9.1p5000 (2009-01-10 trunk 21414)
 [i686-linux]".

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@21458 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog                     |  5 +++++
 test/ruby/test_rubyoptions.rb |  4 ++--
 version.h                     | 11 ++++++-----
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1b028ee28..a6feaa1f9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Jan 10 20:26:17 2009  Tanaka Akira  <akr@fsij.org>
+
+	* version.h: make version string succinct:
+	  "ruby 1.9.1p5000 (2009-01-10 trunk 21414) [i686-linux]".
+
 Sat Jan 10 19:05:13 2009  Koichi Sasada  <ko1@atdot.net>
 
 	* cont.c (cont_restore_1): should not be inlined.
diff --git a/test/ruby/test_rubyoptions.rb b/test/ruby/test_rubyoptions.rb
index c55c99d0d..a540c70ac 100644
--- a/test/ruby/test_rubyoptions.rb
+++ b/test/ruby/test_rubyoptions.rb
@@ -60,7 +60,7 @@ class TestRubyOptions < Test::Unit::TestCase
 
   def test_verbose
     assert_in_out_err(%w(-vve) + [""]) do |r, e|
-      assert_match(/^ruby #{RUBY_VERSION} .*? \[#{RUBY_PLATFORM}\]$/, r.join)
+      assert_match(/^ruby #{RUBY_VERSION}[p ].*? \[#{RUBY_PLATFORM}\]$/, r.join)
       assert_equal RUBY_DESCRIPTION, r.join.chomp
       assert_equal([], e)
     end
@@ -106,7 +106,7 @@ class TestRubyOptions < Test::Unit::TestCase
 
   def test_version
     assert_in_out_err(%w(--version)) do |r, e|
-      assert_match(/^ruby #{RUBY_VERSION} .*? \[#{RUBY_PLATFORM}\]$/, r.join)
+      assert_match(/^ruby #{RUBY_VERSION}[p ].*? \[#{RUBY_PLATFORM}\]$/, r.join)
       assert_equal RUBY_DESCRIPTION, r.join.chomp
       assert_equal([], e)
     end
diff --git a/version.h b/version.h
index 921d6b5dd..03735aac0 100644
--- a/version.h
+++ b/version.h
@@ -23,14 +23,15 @@ RUBY_EXTERN const char ruby_copyright[];
 #define RUBY_BIRTH_MONTH 2
 #define RUBY_BIRTH_DAY 24
 
+#define RUBY_PATCHLEVEL_STR "p"STRINGIZE(RUBY_PATCHLEVEL)
+
 #ifndef RUBY_REVISION
-#include "revision.h"
+# include "revision.h"
 #endif
-#ifndef RUBY_REVISION
-#define RUBY_REVISION 0
+# ifndef RUBY_REVISION
+# define RUBY_REVISION 0
 #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)
@@ -43,8 +44,8 @@ RUBY_EXTERN const char ruby_copyright[];
 
 # define RUBY_DESCRIPTION	    \
     "ruby "RUBY_VERSION		    \
+    RUBY_PATCHLEVEL_STR             \
     " ("RUBY_RELEASE_DATE	    \
-    RUBY_PATCHLEVEL_STR		    \
     RUBY_REVISION_STR") "	    \
     "["RUBY_PLATFORM"]"
 # define RUBY_COPYRIGHT 	    \
-- 
cgit