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

CLT: correct header package bundle ID

Browse Source
This commit is contained in:
Misty De Meo 2018-07-06 15:15:23 -07:00
parent 9fff177844
commit de9d462b76
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -196,13 +196,12 @@ module OS
STANDALONE_PKG_ID = "com.apple.pkg.DeveloperToolsCLILeo".freeze STANDALONE_PKG_ID = "com.apple.pkg.DeveloperToolsCLILeo".freeze
FROM_XCODE_PKG_ID = "com.apple.pkg.DeveloperToolsCLI".freeze FROM_XCODE_PKG_ID = "com.apple.pkg.DeveloperToolsCLI".freeze
# EXECUTABLE_PKG_ID now means two things: # The original Mavericks CLT package ID
# 1. The original Mavericks CLT package ID, and
# 2. The additional header package included in Mojave.
EXECUTABLE_PKG_ID = "com.apple.pkg.CLTools_Executables".freeze EXECUTABLE_PKG_ID = "com.apple.pkg.CLTools_Executables".freeze
MAVERICKS_NEW_PKG_ID = "com.apple.pkg.CLTools_Base".freeze # obsolete MAVERICKS_NEW_PKG_ID = "com.apple.pkg.CLTools_Base".freeze # obsolete
PKG_PATH = "/Library/Developer/CommandLineTools".freeze PKG_PATH = "/Library/Developer/CommandLineTools".freeze
HEADER_PKG_PATH = "/Library/Developer/CommandLineTools/Packages/macOS_SDK_headers_for_macOS_:macos_version.pkg".freeze HEADER_PKG_PATH = "/Library/Developer/CommandLineTools/Packages/macOS_SDK_headers_for_macOS_:macos_version.pkg".freeze
HEADER_PKG_ID = "com.apple.pkg.macOS_SDK_headers_for_macOS_10.14".freeze
# Returns true even if outdated tools are installed, e.g. # Returns true even if outdated tools are installed, e.g.
# tools from Xcode 4.x on 10.9 # tools from Xcode 4.x on 10.9
@ -304,7 +303,7 @@ module OS
if !separate_header_package? if !separate_header_package?
version version
else else
@header_version ||= MacOS.pkgutil_info(EXECUTABLE_PKG_ID)[/version: (.+)$/, 1] @header_version ||= MacOS.pkgutil_info(HEADER_PKG_ID)[/version: (.+)$/, 1]
return ::Version::NULL unless @header_version return ::Version::NULL unless @header_version
::Version.new(@header_version) ::Version.new(@header_version)
end end