kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* lib/rubygems/platform.rb (Gem::Platform#initialize): Support pattern

Browse source 
like x86_64-netbsd6.99.7.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36579 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2012-07-30 14:04:48 +00:00
parent e62ee61262
commit 0357ac8a38
3 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Mon Jul 30 23:01:47 2012 NARUSE, Yui <naruse@ruby-lang.org>
* lib/rubygems/platform.rb (Gem::Platform#initialize): Support pattern
like x86_64-netbsd6.99.7.
Mon Jul 30 21:00:53 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> Mon Jul 30 21:00:53 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
* variable.c (find_class_path): no retry when preferred is given. * variable.c (find_class_path): no retry when preferred is given.

2
lib/rubygems/platform.rb
View file

@ -81,7 +81,7 @@ class Gem::Platform
os, version = $1, $3 os, version = $1, $3
@cpu = 'x86' if @cpu.nil? and os =~ /32$/ @cpu = 'x86' if @cpu.nil? and os =~ /32$/
[os, version] [os, version]
when /netbsdelf/ then [ 'netbsdelf', nil ] when /(netbsd[a-z]*)(\d+)/ then [ $1, $2 ]
when /openbsd(\d+\.\d+)/ then [ 'openbsd', $1 ] when /openbsd(\d+\.\d+)/ then [ 'openbsd', $1 ]
when /solaris(\d+\.\d+)/ then [ 'solaris', $1 ] when /solaris(\d+\.\d+)/ then [ 'solaris', $1 ]
# test # test

3
test/rubygems/test_gem_platform.rb
View file

@ -67,7 +67,8 @@ class TestGemPlatform < Gem::TestCase
'x86-mswin32' => ['x86', 'mswin32', nil], 'x86-mswin32' => ['x86', 'mswin32', nil],
'x86-mswin32_60' => ['x86', 'mswin32', '60'], 'x86-mswin32_60' => ['x86', 'mswin32', '60'],
'x86-mswin32-60' => ['x86', 'mswin32', '60'], 'x86-mswin32-60' => ['x86', 'mswin32', '60'],
'i386-netbsdelf' => ['x86', 'netbsdelf', nil], 'i386-netbsdelf5.1.' => ['x86', 'netbsdelf', '5'],
'x86_64-netbsd6.99.7' => ['x86_64', 'netbsd', '6'],
'i386-openbsd4.0' => ['x86', 'openbsd', '4.0'], 'i386-openbsd4.0' => ['x86', 'openbsd', '4.0'],
'i386-solaris2.10' => ['x86', 'solaris', '2.10'], 'i386-solaris2.10' => ['x86', 'solaris', '2.10'],
'i386-solaris2.8' => ['x86', 'solaris', '2.8'], 'i386-solaris2.8' => ['x86', 'solaris', '2.8'],