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

nurse · nurse · commit 7d248667462c · 2015-02-25T06:35:47.000Z
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49740 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Feb 25 15:27:16 2015  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* tool/merger.rb: support 2.1+ versioning scheme.
+
 Tue Feb 25 08:49:12 2015  Kazuki Tanaka  <gogotanaka@ruby-lang.org>
 
 	* lib/cmath.rb (log): raise ArgumentError when more than 2 arguments
diff --git a/tool/mkconfig.rb b/tool/mkconfig.rb
@@ -29,7 +29,7 @@ def config.write(arg)
 # 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})"
 
 ]

-Original file line number
+Diff line change
@@ @@ -1,3 +1,7 @@ @@
 +Wed Feb 25 15:27:16 2015  NARUSE, Yui  <[email protected]>
++
 +	* tool/merger.rb: support 2.1+ versioning scheme.
++
 Tue Feb 25 08:49:12 2015  Kazuki Tanaka  <[email protected]>
 	* lib/cmath.rb (log): raise ArgumentError when more than 2 arguments
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ def config.write(arg)`
`29`	`29`	`# changes made to this file will be lost the next time ruby is built.`
`30`	`30`
`31`	`31`	`module RbConfig`
`32`		`- RUBY_VERSION == "#{version}" or`
	`32`	`+ RUBY_VERSION.start_with?("#{version}"[/^[0-9]+[.][0-9]+[.]/]) or`
`33`	`33`	`raise "ruby lib version (#{version}) doesn't match executable version (\#{RUBY_VERSION})"`
`34`	`34`
`35`	`35`	`]`