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

CLT: rename Mavericks CLT path constant.

Browse Source
This commit is contained in:
Mike McQuaid 2013-10-22 22:36:41 +01:00
parent 5568f1851d
commit a7c29271b8
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Library/Homebrew/os/mac.rb
View File

@ -51,9 +51,8 @@ module OS
end end
def dev_tools_path def dev_tools_path
@dev_tools_path ||= if tools_in_prefix? CLT::STANDALONE_PKG_PATH @dev_tools_path ||= if tools_in_prefix? CLT::MAVERICKS_PKG_PATH
# In 10.9 the CLT moved from /usr into /Library/Developer/CommandLineTools. Pathname.new "#{CLT::MAVERICKS_PKG_PATH}/usr/bin"
Pathname.new "#{CLT::STANDALONE_PKG_PATH}/usr/bin"
elsif tools_in_prefix? "/" elsif tools_in_prefix? "/"
# probably a safe enough assumption (the unix way) # probably a safe enough assumption (the unix way)
Pathname.new "/usr/bin" Pathname.new "/usr/bin"

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

@ -163,7 +163,7 @@ module OS
STANDALONE_PKG_ID = "com.apple.pkg.DeveloperToolsCLILeo" STANDALONE_PKG_ID = "com.apple.pkg.DeveloperToolsCLILeo"
FROM_XCODE_PKG_ID = "com.apple.pkg.DeveloperToolsCLI" FROM_XCODE_PKG_ID = "com.apple.pkg.DeveloperToolsCLI"
STANDALONE_PKG_PATH = Pathname.new("/Library/Developer/CommandLineTools") MAVERICKS_PKG_PATH = Pathname.new("/Library/Developer/CommandLineTools")
# True if: # True if:
# - Xcode < 4.3 is installed. The tools are found under /usr. # - Xcode < 4.3 is installed. The tools are found under /usr.
@ -175,8 +175,8 @@ module OS
end end
def mavericks_dev_tools? def mavericks_dev_tools?
MacOS.dev_tools_path == Pathname("#{STANDALONE_PKG_PATH}/usr/bin") && MacOS.dev_tools_path == Pathname("#{MAVERICKS_PKG_PATH}/usr/bin") &&
File.directory?("#{STANDALONE_PKG_PATH}/usr/include") File.directory?("#{MAVERICKS_PKG_PATH}/usr/include")
end end
def usr_dev_tools? def usr_dev_tools?