1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49740 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2015-02-25 06:35:47 +00:00
parent 7b65fb292a
commit 7d24866746
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -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

2
tool/mkconfig.rb
View File

@ -29,7 +29,7 @@ print %[
# 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})"
]