diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-12 13:32:24 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-12 13:32:24 +0000 |
| commit | 6889d3d361767a244fa1d3b3364274a1bf3965bc (patch) | |
| tree | 602a511f4b30529da385e8ec5cbebe742b252b8d | |
| parent | 81606e329204a382de902cad79e60d922084cb25 (diff) | |
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: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21458 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | test/ruby/test_rubyoptions.rb | 4 | ||||
| -rw-r--r-- | version.h | 11 |
3 files changed, 13 insertions, 7 deletions
@@ -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 c55c99d0d1..a540c70ac9 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 @@ -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 \ |