admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

os/mac/xcode: support Xcode 12.5

Browse Source
This commit is contained in:
Bo Anderson 2021-05-09 17:07:00 +01:00
parent 64b6846d60
commit 55f90f972d
No known key found for this signature in database
GPG Key ID: 3DB94E204E137D65
2 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Library/Homebrew/development_tools.rb
View File

@ -42,7 +42,7 @@ class DevelopmentTools
def clang_version def clang_version
@clang_version ||= if (path = locate("clang")) && @clang_version ||= if (path = locate("clang")) &&
(build_version = `#{path} --version`[/(?:clang|LLVM) version (\d+\.\d)/, 1]) (build_version = `#{path} --version`[/(?:clang|LLVM) version (\d+\.\d(?:\.\d)?)/, 1])
Version.new build_version Version.new build_version
else else
Version::NULL Version::NULL

38
Library/Homebrew/os/mac/xcode.rb
View File

@ -20,7 +20,7 @@ module OS
# This may be a beta version for a beta macOS. # This may be a beta version for a beta macOS.
sig { params(macos: MacOS::Version).returns(String) } sig { params(macos: MacOS::Version).returns(String) }
def latest_version(macos: MacOS.version) def latest_version(macos: MacOS.version)
latest_stable = "12.4" latest_stable = "12.5"
case macos case macos
when "11" then latest_stable when "11" then latest_stable
when "10.15" then "12.4" when "10.15" then "12.4"
@ -201,25 +201,30 @@ module OS
sig { returns(String) } sig { returns(String) }
def detect_version_from_clang_version def detect_version_from_clang_version
return "dunno" if DevelopmentTools.clang_version.null? version = DevelopmentTools.clang_version
return "dunno" if version.null?
# This logic provides a fake Xcode version based on the # This logic provides a fake Xcode version based on the
# installed CLT version. This is useful as they are packaged # installed CLT version. This is useful as they are packaged
# simultaneously so workarounds need to apply to both based on their # simultaneously so workarounds need to apply to both based on their
# comparable version. # comparable version.
case (DevelopmentTools.clang_version.to_f * 10).to_i case version
when 0 then "dunno" when "6.0.0" then "6.2"
when 60 then "6.0" when "6.1.0" then "6.4"
when 61 then "6.1" when "7.0.0" then "7.1"
when 70 then "7.0" when "7.0.2" then "7.2.1"
when 73 then "7.3" when "7.3.0" then "7.3.1"
when 80 then "8.0" when "8.0.0" then "8.2.1"
when 81 then "8.3" when "8.1.0" then "8.3.3"
when 90 then "9.2" when "9.0.0" then "9.2"
when 91 then "9.4" when "9.1.0" then "9.4.1"
when 100 then "10.3" when "10.0.0" then "10.1"
when 110 then "11.5" when "10.0.1" then "10.3"
else "12.0" when "11.0.0" then "11.3.1"
when "11.0.3" then "11.7"
when "12.0.0" then "12.4"
else "12.5"
end end
end end
@ -308,7 +313,8 @@ module OS
sig { returns(String) } sig { returns(String) }
def latest_clang_version def latest_clang_version
case MacOS.version case MacOS.version
when "11", "10.15" then "1200.0.32.29" when "11" then "1205.0.22.9"
when "10.15" then "1200.0.32.29"
when "10.14" then "1100.0.33.17" when "10.14" then "1100.0.33.17"
when "10.13" then "1000.10.44.2" when "10.13" then "1000.10.44.2"
when "10.12" then "900.0.39.2" when "10.12" then "900.0.39.2"