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

CLT is just CLT now; not "for Xcode".

Browse Source 
References Homebrew/homebrew#17383.
This commit is contained in:
Mike McQuaid 2013-07-01 19:01:57 +01:00
parent be9f2d7dea
commit 621c44dbd2
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Library/Homebrew/cmd/doctor.rb
View File

@ -226,7 +226,7 @@ def __check_clt_up_to_date
You should install the Command Line Tools: http://connect.apple.com You should install the Command Line Tools: http://connect.apple.com
EOS EOS
elsif MacOS::CLT.outdated? then <<-EOS.undent elsif MacOS::CLT.outdated? then <<-EOS.undent
A newer Command Line Tools for Xcode release is available A newer Command Line Tools release is available
You should install the latest version from: http://connect.apple.com You should install the latest version from: http://connect.apple.com
EOS EOS
end end
@ -268,7 +268,7 @@ def check_cc
if MacOS::Xcode.version >= "4.3" then <<-EOS.undent if MacOS::Xcode.version >= "4.3" then <<-EOS.undent
Experimental support for using Xcode without the "Command Line Tools". Experimental support for using Xcode without the "Command Line Tools".
You have only installed Xcode. If stuff is not building, try installing the You have only installed Xcode. If stuff is not building, try installing the
"Command Line Tools for Xcode" package provided by Apple. "Command Line Tools" package provided by Apple.
EOS EOS
else else
'No compiler found in /usr/bin!' 'No compiler found in /usr/bin!'

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

@ -159,7 +159,7 @@ module MacOS::CLT extend self
# This is true if the standard UNIX tools are present in the expected location. For # This is true if the standard UNIX tools are present in the expected location. For
# Mavericks and above this is /Library/Developer/CommandLineTools otherwise it is /usr. # Mavericks and above this is /Library/Developer/CommandLineTools otherwise it is /usr.
# For Xcode < 4.3, this is the standard location. Otherwise, it means that the user has # For Xcode < 4.3, this is the standard location. Otherwise, it means that the user has
# installed the "Command Line Tools for Xcode" package. # installed the "Command Line Tools" package.
def installed? def installed?
(MacOS.dev_tools_path == Pathname.new("#{MacOS::CLT::STANDALONE_PKG_PATH}/usr/bin") \ (MacOS.dev_tools_path == Pathname.new("#{MacOS::CLT::STANDALONE_PKG_PATH}/usr/bin") \
and File.directory? "#{MacOS::CLT::STANDALONE_PKG_PATH}/usr/include") or and File.directory? "#{MacOS::CLT::STANDALONE_PKG_PATH}/usr/include") or

2
Library/Homebrew/requirements.rb
View File

@ -86,7 +86,7 @@ class CLTDependency < Requirement
satisfy(:build_env => false) { MacOS::CLT.installed? } satisfy(:build_env => false) { MacOS::CLT.installed? }
def message; <<-EOS.undent def message; <<-EOS.undent
The Command Line Tools for Xcode are required to compile this software. The Command Line Tools are required to compile this software.
The standalone package can be obtained from http://connect.apple.com, The standalone package can be obtained from http://connect.apple.com,
or it can be installed via Xcode's preferences. or it can be installed via Xcode's preferences.
EOS EOS