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

move semantic version comparisons into separate class

Browse Source
This commit is contained in:
Robin Kunde 2016-11-05 23:31:40 -04:00
parent 2c79868229
commit e97ce7e7ae
1 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,15 +27,15 @@ module OS
def prerelease?
# TODO: bump to version >= "8.3" after Xcode 8.2 is stable.
Version.create(version) >= Version.create("8.2")
Version.new(version) >= "8.2"
end
def outdated?
Version.create(version) < Version.create(latest_version)
Version.new(version) < latest_version
end
def without_clt?
installed? && Version.create(version) >= Version.create("4.3") && !MacOS::CLT.installed?
installed? && Version.new(version) >= "4.3" && !MacOS::CLT.installed?
end
# Returns a Pathname object corresponding to Xcode.app's Developer
@ -56,7 +56,7 @@ module OS
end
def toolchain_path
Pathname.new("#{prefix}/Toolchains/XcodeDefault.xctoolchain") if installed? && Version.create(version) >= Version.create("4.3")
Pathname.new("#{prefix}/Toolchains/XcodeDefault.xctoolchain") if installed? && Version.new(version) >= "4.3"
end
# Ask Spotlight where Xcode is. If the user didn't install the
@ -71,7 +71,7 @@ module OS
end
def update_instructions
if Version.create(MacOS.version) >= Version.create("10.9") && !OS::Mac.prerelease?
if Version.new(MacOS.version) >= "10.9" && !OS::Mac.prerelease?
<<-EOS.undent
Xcode can be updated from the App Store.
EOS
@ -145,20 +145,26 @@ module OS
end
def provides_gcc?
installed? && Version.create(version) < Version.create("4.3")
installed? && Version.new(version) < "4.3"
end
def provides_cvs?
installed? && Version.create(version) < Version.create("5.0")
installed? && Version.new(version) < "5.0"
end
def default_prefix?
if Version.create(version) < Version.create("4.3")
if Version.new(version) < "4.3"
prefix.to_s.start_with? "/Developer"
else
prefix.to_s == "/Applications/Xcode.app/Contents/Developer"
end
end
class Version < ::Version
def <=>(other)
super(Version.new(other))
end
end
end
module CLT
@ -177,7 +183,7 @@ module OS
end
def update_instructions
if Version.create(MacOS.version) >= Version.create("10.9")
if Xcode::Version.new(MacOS.version) >= "10.9"
<<-EOS.undent
Update them from Software Update in the App Store.
EOS
@ -206,13 +212,13 @@ module OS
end
def outdated?
if Version.create(MacOS.version) >= Version.create(:mavericks.to_s)
if Xcode::Version.new(MacOS.version) >= :mavericks.to_s
version = Utils.popen_read("#{MAVERICKS_PKG_PATH}/usr/bin/clang --version")
else
version = Utils.popen_read("/usr/bin/clang --version")
end
version = version[/clang-(\d+\.\d+\.\d+(\.\d+)?)/, 1] || "0"
Version.create(version) < Version.create(latest_version)
Xcode::Version.new(version) < latest_version
end
# Version string (a pretty long one) of the CLT package.
@ -225,10 +231,10 @@ module OS
def detect_version
# 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
return MacOS::Xcode.version if MacOS::Xcode.installed? && MacOS::Xcode.version < "3.0"
return MacOS::Xcode.version if MacOS::Xcode.installed? && Xcode::Version.new(MacOS::Xcode.version) < "3.0"
[MAVERICKS_PKG_ID, MAVERICKS_NEW_PKG_ID, STANDALONE_PKG_ID, FROM_XCODE_PKG_ID].find do |id|
if Version.create(MacOS.version) >= Version.create(:mavericks.to_s)
if Xcode::Version.new(MacOS.version) >= :mavericks.to_s
next unless File.exist?("#{MAVERICKS_PKG_PATH}/usr/bin/clang")
end
version = MacOS.pkgutil_info(id)[/version: (.+)$/, 1]