archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-21 03:24:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge RubyGems-3.3.19 and Bundler-2.3.19

Browse source
This commit is contained in:
Hiroshi SHIBATA 2022-08-22 11:49:38 +09:00 • committed by nagachika
parent 0918783347
commit 44c926f3a9
362 changed files with 7843 additions and 7605 deletions
Download patch file Download diff file Expand all files Collapse all files

84
lib/rubygems/platform.rb
View file

@ -12,7 +12,7 @@ class Gem::Platform
attr_accessor :cpu, :os, :version
def self.local
arch = RbConfig::CONFIG['arch']
arch = RbConfig::CONFIG["arch"]
arch = "#{arch}_60" if arch =~ /mswin(?:32|64)$/
@local ||= new(arch)
end
@ -56,7 +56,7 @@ class Gem::Platform
case arch
when Gem::Platform::CURRENT then
Gem::Platform.local
when Gem::Platform::RUBY, nil, '' then
when Gem::Platform::RUBY, nil, "" then
Gem::Platform::RUBY
else
super
@ -68,7 +68,7 @@ class Gem::Platform
when Array then
@cpu, @os, @version = arch
when String then
arch = arch.split '-'
arch = arch.split "-"
if arch.length > 2 and arch.last !~ /\d/ # reassemble x86-linux-gnu
extra = arch.pop
@ -78,7 +78,7 @@ class Gem::Platform
cpu = arch.shift
@cpu = case cpu
when /i\d86/ then 'x86'
when /i\d86/ then "x86"
else cpu
end
@ -91,31 +91,31 @@ class Gem::Platform
@cpu, os = nil, cpu if os.nil? # legacy jruby
@os, @version = case os
when /aix(\d+)?/ then [ 'aix', $1 ]
when /cygwin/ then [ 'cygwin', nil ]
when /darwin(\d+)?/ then [ 'darwin', $1 ]
when /^macruby$/ then [ 'macruby', nil ]
when /freebsd(\d+)?/ then [ 'freebsd', $1 ]
when /hpux(\d+)?/ then [ 'hpux', $1 ]
when /^java$/, /^jruby$/ then [ 'java', nil ]
when /^java([\d.]*)/ then [ 'java', $1 ]
when /^dalvik(\d+)?$/ then [ 'dalvik', $1 ]
when /^dotnet$/ then [ 'dotnet', nil ]
when /^dotnet([\d.]*)/ then [ 'dotnet', $1 ]
when /linux-?((?!gnu)\w+)?/ then [ 'linux', $1 ]
when /mingw32/ then [ 'mingw32', nil ]
when /mingw-?(\w+)?/ then [ 'mingw', $1 ]
when /aix(\d+)?/ then [ "aix", $1 ]
when /cygwin/ then [ "cygwin", nil ]
when /darwin(\d+)?/ then [ "darwin", $1 ]
when /^macruby$/ then [ "macruby", nil ]
when /freebsd(\d+)?/ then [ "freebsd", $1 ]
when /hpux(\d+)?/ then [ "hpux", $1 ]
when /^java$/, /^jruby$/ then [ "java", nil ]
when /^java([\d.]*)/ then [ "java", $1 ]
when /^dalvik(\d+)?$/ then [ "dalvik", $1 ]
when /^dotnet$/ then [ "dotnet", nil ]
when /^dotnet([\d.]*)/ then [ "dotnet", $1 ]
when /linux-?((?!gnu)\w+)?/ then [ "linux", $1 ]
when /mingw32/ then [ "mingw32", nil ]
when /mingw-?(\w+)?/ then [ "mingw", $1 ]
when /(mswin\d+)(\_(\d+))?/ then
os, version = $1, $3
@cpu = 'x86' if @cpu.nil? and os =~ /32$/
@cpu = "x86" if @cpu.nil? and os =~ /32$/
[os, version]
when /netbsdelf/ then [ 'netbsdelf', nil ]
when /openbsd(\d+\.\d+)?/ then [ 'openbsd', $1 ]
when /bitrig(\d+\.\d+)?/ then [ 'bitrig', $1 ]
when /solaris(\d+\.\d+)?/ then [ 'solaris', $1 ]
when /netbsdelf/ then [ "netbsdelf", nil ]
when /openbsd(\d+\.\d+)?/ then [ "openbsd", $1 ]
when /bitrig(\d+\.\d+)?/ then [ "bitrig", $1 ]
when /solaris(\d+\.\d+)?/ then [ "solaris", $1 ]
# test
when /^(\w+_platform)(\d+)?/ then [ $1, $2 ]
else [ 'unknown', nil ]
else [ "unknown", nil ]
end
when Gem::Platform then
@cpu = arch.cpu
@ -131,7 +131,7 @@ class Gem::Platform
end
def to_s
to_a.compact.join '-'
to_a.compact.join "-"
end
##
@ -160,12 +160,12 @@ class Gem::Platform
return nil unless Gem::Platform === other
# universal-mingw32 matches x64-mingw-ucrt
return true if (@cpu == 'universal' or other.cpu == 'universal') and
@os.start_with?('mingw') and other.os.start_with?('mingw')
return true if (@cpu == "universal" or other.cpu == "universal") and
@os.start_with?("mingw") and other.os.start_with?("mingw")
# cpu
([nil,'universal'].include?(@cpu) or [nil, 'universal'].include?(other.cpu) or @cpu == other.cpu or
(@cpu == 'arm' and other.cpu.start_with?("arm"))) and
([nil,"universal"].include?(@cpu) or [nil, "universal"].include?(other.cpu) or @cpu == other.cpu or
(@cpu == "arm" and other.cpu.start_with?("arm"))) and
# os
@os == other.os and
@ -184,17 +184,17 @@ class Gem::Platform
when String then
# This data is from http://gems.rubyforge.org/gems/yaml on 19 Aug 2007
other = case other
when /^i686-darwin(\d)/ then ['x86', 'darwin', $1 ]
when /^i\d86-linux/ then ['x86', 'linux', nil ]
when 'java', 'jruby' then [nil, 'java', nil ]
when /^dalvik(\d+)?$/ then [nil, 'dalvik', $1 ]
when /dotnet(\-(\d+\.\d+))?/ then ['universal','dotnet', $2 ]
when /mswin32(\_(\d+))?/ then ['x86', 'mswin32', $2 ]
when /mswin64(\_(\d+))?/ then ['x64', 'mswin64', $2 ]
when 'powerpc-darwin' then ['powerpc', 'darwin', nil ]
when /powerpc-darwin(\d)/ then ['powerpc', 'darwin', $1 ]
when /sparc-solaris2.8/ then ['sparc', 'solaris', '2.8' ]
when /universal-darwin(\d)/ then ['universal', 'darwin', $1 ]
when /^i686-darwin(\d)/ then ["x86", "darwin", $1 ]
when /^i\d86-linux/ then ["x86", "linux", nil ]
when "java", "jruby" then [nil, "java", nil ]
when /^dalvik(\d+)?$/ then [nil, "dalvik", $1 ]
when /dotnet(\-(\d+\.\d+))?/ then ["universal","dotnet", $2 ]
when /mswin32(\_(\d+))?/ then ["x86", "mswin32", $2 ]
when /mswin64(\_(\d+))?/ then ["x64", "mswin64", $2 ]
when "powerpc-darwin" then ["powerpc", "darwin", nil ]
when /powerpc-darwin(\d)/ then ["powerpc", "darwin", $1 ]
when /sparc-solaris2.8/ then ["sparc", "solaris", "2.8" ]
when /universal-darwin(\d)/ then ["universal", "darwin", $1 ]
else other
end
@ -210,11 +210,11 @@ class Gem::Platform
# A pure-Ruby gem that may use Gem::Specification#extensions to build
# binary files.
RUBY = 'ruby'.freeze
RUBY = "ruby".freeze
##
# A platform-specific gem that is built for the packaging Ruby's platform.
# This will be replaced with Gem::Platform::local.
CURRENT = 'current'.freeze
CURRENT = "current".freeze
end