ruby-changes:9336
From: yugui <ko1@a...>
Date: Fri, 19 Dec 2008 20:37:14 +0900 (JST)
Subject: [ruby-changes:9336] Ruby:r20875 (ruby_1_9_1): merges r20654 from trunk into ruby_1_9_1.
yugui 2008-12-19 20:37:03 +0900 (Fri, 19 Dec 2008) New Revision: 20875 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=20875 Log: merges r20654 from trunk into ruby_1_9_1. * configure.in (rb_version): greps only the line that defines version. * version.h (RUBY_VERSION_CODE, RUBY_RELEASE_CODE): removed. Modified files: branches/ruby_1_9_1/configure.in branches/ruby_1_9_1/version.h Index: ruby_1_9_1/configure.in =================================================================== --- ruby_1_9_1/configure.in (revision 20874) +++ ruby_1_9_1/configure.in (revision 20875) @@ -64,7 +64,7 @@ AC_SUBST(GNU_LD)]) unset GREP_OPTIONS -rb_version=`grep RUBY_VERSION $srcdir/version.h` +rb_version=`grep '^#define RUBY_VERSION ' $srcdir/version.h` MAJOR=`expr "$rb_version" : '#define RUBY_VERSION "\([0-9][0-9]*\)\.[0-9][0-9]*\.[0-9][0-9]*"'` MINOR=`expr "$rb_version" : '#define RUBY_VERSION "[0-9][0-9]*\.\([0-9][0-9]*\)\.[0-9][0-9]*"'` TEENY=`expr "$rb_version" : '#define RUBY_VERSION "[0-9][0-9]*\.[0-9][0-9]*\.\([0-9][0-9]*\)"'` Index: ruby_1_9_1/version.h =================================================================== --- ruby_1_9_1/version.h (revision 20874) +++ ruby_1_9_1/version.h (revision 20875) @@ -1,7 +1,5 @@ #define RUBY_VERSION "1.9.1" #define RUBY_RELEASE_DATE "2008-12-19" -#define RUBY_VERSION_CODE 191 -#define RUBY_RELEASE_CODE 20081219 #define RUBY_PATCHLEVEL 0 #define RUBY_VERSION_MAJOR 1 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/