naruse	2015-02-25 15:35:47 +0900 (Wed, 25 Feb 2015)

  New Revision: 49740

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

  Log:
    * tool/merger.rb: support 2.1+ versioning scheme.

  Modified files:
    trunk/ChangeLog
    trunk/tool/mkconfig.rb
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 49739)
+++ ChangeLog	(revision 49740)
@@ -1,3 +1,7 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Wed Feb 25 15:27:16 2015  NARUSE, Yui  <naruse@r...>
+
+	* tool/merger.rb: support 2.1+ versioning scheme.
+
 Tue Feb 25 08:49:12 2015  Kazuki Tanaka  <gogotanaka@r...>
 
 	* lib/cmath.rb (log): raise ArgumentError when more than 2 arguments
Index: tool/mkconfig.rb
===================================================================
--- tool/mkconfig.rb	(revision 49739)
+++ tool/mkconfig.rb	(revision 49740)
@@ -29,7 +29,7 @@ print %[ https://github.com/ruby/ruby/blob/trunk/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})"
 
 ]

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