From 31bf918ecb3517c02975d81417a7aae72498d7f6 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Mon, 1 Jul 2013 19:01:57 +0100 Subject: [PATCH] CLT is just CLT now; not "for Xcode". References #17383. --- Library/Homebrew/cmd/doctor.rb | 4 ++-- Library/Homebrew/os/mac/xcode.rb | 2 +- Library/Homebrew/requirements.rb | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Library/Homebrew/cmd/doctor.rb b/Library/Homebrew/cmd/doctor.rb index 49c9a158c925..993cb0b05638 100644 --- a/Library/Homebrew/cmd/doctor.rb +++ b/Library/Homebrew/cmd/doctor.rb @@ -226,7 +226,7 @@ def __check_clt_up_to_date You should install the Command Line Tools: http://connect.apple.com EOS 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 EOS end @@ -268,7 +268,7 @@ def check_cc if MacOS::Xcode.version >= "4.3" then <<-EOS.undent Experimental support for using Xcode without the "Command Line Tools". 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 else 'No compiler found in /usr/bin!' diff --git a/Library/Homebrew/os/mac/xcode.rb b/Library/Homebrew/os/mac/xcode.rb index 202567eb4d95..334f08f702a3 100644 --- a/Library/Homebrew/os/mac/xcode.rb +++ b/Library/Homebrew/os/mac/xcode.rb @@ -159,7 +159,7 @@ module MacOS::CLT extend self # 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. # 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? (MacOS.dev_tools_path == Pathname.new("#{MacOS::CLT::STANDALONE_PKG_PATH}/usr/bin") \ and File.directory? "#{MacOS::CLT::STANDALONE_PKG_PATH}/usr/include") or diff --git a/Library/Homebrew/requirements.rb b/Library/Homebrew/requirements.rb index 355fad26dce6..cfec02200aa9 100644 --- a/Library/Homebrew/requirements.rb +++ b/Library/Homebrew/requirements.rb @@ -86,7 +86,7 @@ class CLTDependency < Requirement satisfy(:build_env => false) { MacOS::CLT.installed? } 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, or it can be installed via Xcode's preferences. EOS