naruse	2015-02-25 15:36:54 +0900 (Wed, 25 Feb 2015)

  New Revision: 49741

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

  Log:
    merge revision(s) 49740:
    
    * tool/merger.rb: support 2.1+ versioning scheme.

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/tool/mkconfig.rb
    branches/ruby_2_2/version.h
Index: ruby_2_2/ChangeLog
===================================================================
--- ruby_2_2/ChangeLog	(revision 49740)
+++ ruby_2_2/ChangeLog	(revision 49741)
@@ -1,3 +1,7 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1
+Wed Feb 25 15:36:26 2015  NARUSE, Yui  <naruse@r...>
+
+	* tool/merger.rb: support 2.1+ versioning scheme.
+
 Tue Feb 24 17:41:27 2015  Nobuyoshi Nakada  <nobu@r...>
 
 	* time.c (time_zone_name): should be US-ASCII only if all 7-bits,
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 49740)
+++ ruby_2_2/version.h	(revision 49741)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #define RUBY_VERSION "2.2.0"
-#define RUBY_RELEASE_DATE "2015-02-24"
-#define RUBY_PATCHLEVEL 83
+#define RUBY_RELEASE_DATE "2015-02-25"
+#define RUBY_PATCHLEVEL 84
 
 #define RUBY_RELEASE_YEAR 2015
 #define RUBY_RELEASE_MONTH 2
-#define RUBY_RELEASE_DAY 24
+#define RUBY_RELEASE_DAY 25
 
 #include "ruby/version.h"
 
Index: ruby_2_2/tool/mkconfig.rb
===================================================================
--- ruby_2_2/tool/mkconfig.rb	(revision 49740)
+++ ruby_2_2/tool/mkconfig.rb	(revision 49741)
@@ -29,7 +29,7 @@ print %[ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/tool/mkconfig.rb#L29
 # changes made to this file will be lost the next time ruby is built.
 
 module RbConfig
-  RUBY_VERSION == "#{version}" or
+  RUBY_VERSION.start_with?("#{version}"[/^[0-9]+[.][0-9]+[.]/]) or
     raise "ruby lib version (#{version}) doesn't match executable version (\#{RUBY_VERSION})"
 
 ]

Property changes on: ruby_2_2
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r49740


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