yugui	2009-01-12 22:32:24 +0900 (Mon, 12 Jan 2009)

  New Revision: 21458

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=21458

  Log:
    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]".

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/test/ruby/test_rubyoptions.rb
    branches/ruby_1_9_1/version.h

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 21457)
+++ ruby_1_9_1/ChangeLog	(revision 21458)
@@ -1,3 +1,8 @@
+Sat Jan 10 20:26:17 2009  Tanaka Akira  <akr@f...>
+
+	* 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@a...>
 
 	* cont.c (cont_restore_1): should not be inlined.
Index: ruby_1_9_1/version.h
===================================================================
--- ruby_1_9_1/version.h	(revision 21457)
+++ ruby_1_9_1/version.h	(revision 21458)
@@ -23,14 +23,15 @@
 #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 @@
 
 # define RUBY_DESCRIPTION	    \
     "ruby "RUBY_VERSION		    \
+    RUBY_PATCHLEVEL_STR             \
     " ("RUBY_RELEASE_DATE	    \
-    RUBY_PATCHLEVEL_STR		    \
     RUBY_REVISION_STR") "	    \
     "["RUBY_PLATFORM"]"
 # define RUBY_COPYRIGHT 	    \
Index: ruby_1_9_1/test/ruby/test_rubyoptions.rb
===================================================================
--- ruby_1_9_1/test/ruby/test_rubyoptions.rb	(revision 21457)
+++ ruby_1_9_1/test/ruby/test_rubyoptions.rb	(revision 21458)
@@ -60,7 +60,7 @@
 
   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 @@
 
   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

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