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

Merge pull request #1621 from MikeMcQuaid/xcode-version-cleanup

Browse Source 
xcode: cleanup Xcode::Version usage.
This commit is contained in:
Mike McQuaid 2016-12-05 17:41:09 +00:00 committed by GitHub
commit 29aa1c8c3d
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -67,7 +67,9 @@ module OS
end end
def toolchain_path def toolchain_path
Pathname.new("#{prefix}/Toolchains/XcodeDefault.xctoolchain") if installed? && Version.new(version) >= "4.3" return unless installed?
return if Version.new(version) < "4.3"
Pathname.new("#{prefix}/Toolchains/XcodeDefault.xctoolchain")
end end
# Ask Spotlight where Xcode is. If the user didn't install the # Ask Spotlight where Xcode is. If the user didn't install the
@ -82,7 +84,7 @@ module OS
end end
def update_instructions def update_instructions
if Version.new(MacOS.version) >= "10.9" && !OS::Mac.prerelease? if MacOS.version >= "10.9" && !OS::Mac.prerelease?
<<-EOS.undent <<-EOS.undent
Xcode can be updated from the App Store. Xcode can be updated from the App Store.
EOS EOS
@ -194,7 +196,7 @@ module OS
end end
def update_instructions def update_instructions
if Xcode::Version.new(MacOS.version) >= "10.9" if MacOS.version >= "10.9"
<<-EOS.undent <<-EOS.undent
Update them from Software Update in the App Store. Update them from Software Update in the App Store.
EOS EOS
@ -234,7 +236,7 @@ module OS
end end
def outdated? def outdated?
if Xcode::Version.new(MacOS.version) >= :mavericks.to_s if MacOS.version >= :mavericks
version = Utils.popen_read("#{MAVERICKS_PKG_PATH}/usr/bin/clang --version") version = Utils.popen_read("#{MAVERICKS_PKG_PATH}/usr/bin/clang --version")
else else
version = Utils.popen_read("/usr/bin/clang --version") version = Utils.popen_read("/usr/bin/clang --version")
@ -253,7 +255,9 @@ module OS
def detect_version def detect_version
# CLT isn't a distinct entity pre-4.3, and pkgutil doesn't exist # CLT isn't a distinct entity pre-4.3, and pkgutil doesn't exist
# at all on Tiger, so just count it as installed if Xcode is installed # at all on Tiger, so just count it as installed if Xcode is installed
return MacOS::Xcode.version if MacOS::Xcode.installed? && Xcode::Version.new(MacOS::Xcode.version) < "3.0" if MacOS::Xcode.installed? && Xcode::Version.new(MacOS::Xcode.version) < "3.0"
return MacOS::Xcode.version
end
[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