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

xcode: general cleanup.

Browse Source
This commit is contained in:
Mike McQuaid 2017-01-09 21:30:20 +00:00
parent 4a39070c26
commit 2c6915a48f
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,8 +3,8 @@ module OS
module Xcode module Xcode
module_function module_function
V4_BUNDLE_ID = "com.apple.dt.Xcode".freeze BUNDLE_ID = "com.apple.dt.Xcode".freeze
V3_BUNDLE_ID = "com.apple.Xcode".freeze OLD_BUNDLE_ID = "com.apple.Xcode".freeze
def latest_version def latest_version
case MacOS.version case MacOS.version
@ -51,9 +51,9 @@ module OS
begin begin
dir = MacOS.active_developer_dir dir = MacOS.active_developer_dir
if dir.empty? || dir == CLT::MAVERICKS_PKG_PATH || !File.directory?(dir) if dir.empty? || dir == CLT::PKG_PATH || !File.directory?(dir)
path = bundle_path path = bundle_path
path.join("Contents", "Developer") if path path/"Contents/Developer" if path
else else
# Use cleanpath to avoid pathological trailing slash # Use cleanpath to avoid pathological trailing slash
Pathname.new(dir).cleanpath Pathname.new(dir).cleanpath
@ -182,7 +182,7 @@ module OS
FROM_XCODE_PKG_ID = "com.apple.pkg.DeveloperToolsCLI".freeze FROM_XCODE_PKG_ID = "com.apple.pkg.DeveloperToolsCLI".freeze
MAVERICKS_PKG_ID = "com.apple.pkg.CLTools_Executables".freeze MAVERICKS_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
MAVERICKS_PKG_PATH = "/Library/Developer/CommandLineTools".freeze PKG_PATH = "/Library/Developer/CommandLineTools".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
@ -237,7 +237,7 @@ module OS
return false if MacOS.version < :lion return false if MacOS.version < :lion
if MacOS.version >= :mavericks if MacOS.version >= :mavericks
version = Utils.popen_read("#{MAVERICKS_PKG_PATH}/usr/bin/clang --version") version = Utils.popen_read("#{PKG_PATH}/usr/bin/clang --version")
else else
version = Utils.popen_read("/usr/bin/clang --version") version = Utils.popen_read("/usr/bin/clang --version")
end end
@ -261,7 +261,7 @@ module OS
[MAVERICKS_PKG_ID, MAVERICKS_NEW_PKG_ID, STANDALONE_PKG_ID, FROM_XCODE_PKG_ID].find do |id| [MAVERICKS_PKG_ID, MAVERICKS_NEW_PKG_ID, STANDALONE_PKG_ID, FROM_XCODE_PKG_ID].find do |id|
if MacOS.version >= :mavericks if MacOS.version >= :mavericks
next unless File.exist?("#{MAVERICKS_PKG_PATH}/usr/bin/clang") next unless File.exist?("#{PKG_PATH}/usr/bin/clang")
end end
version = MacOS.pkgutil_info(id)[/version: (.+)$/, 1] version = MacOS.pkgutil_info(id)[/version: (.+)$/, 1]
return version if version return version if version