move semantic version comparisons into separate class
This commit is contained in:
parent
2c79868229
commit
e97ce7e7ae
@ -27,15 +27,15 @@ module OS
|
|||||||
|
|
||||||
def prerelease?
|
def prerelease?
|
||||||
# TODO: bump to version >= "8.3" after Xcode 8.2 is stable.
|
# 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
|
end
|
||||||
|
|
||||||
def outdated?
|
def outdated?
|
||||||
Version.create(version) < Version.create(latest_version)
|
Version.new(version) < latest_version
|
||||||
end
|
end
|
||||||
|
|
||||||
def without_clt?
|
def without_clt?
|
||||||
installed? && Version.create(version) >= Version.create("4.3") && !MacOS::CLT.installed?
|
installed? && Version.new(version) >= "4.3" && !MacOS::CLT.installed?
|
||||||
end
|
end
|
||||||
|
|
||||||
# Returns a Pathname object corresponding to Xcode.app's Developer
|
# Returns a Pathname object corresponding to Xcode.app's Developer
|
||||||
@ -56,7 +56,7 @@ module OS
|
|||||||
end
|
end
|
||||||
|
|
||||||
def toolchain_path
|
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
|
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
|
||||||
@ -71,7 +71,7 @@ module OS
|
|||||||
end
|
end
|
||||||
|
|
||||||
def update_instructions
|
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
|
<<-EOS.undent
|
||||||
Xcode can be updated from the App Store.
|
Xcode can be updated from the App Store.
|
||||||
EOS
|
EOS
|
||||||
@ -145,20 +145,26 @@ module OS
|
|||||||
end
|
end
|
||||||
|
|
||||||
def provides_gcc?
|
def provides_gcc?
|
||||||
installed? && Version.create(version) < Version.create("4.3")
|
installed? && Version.new(version) < "4.3"
|
||||||
end
|
end
|
||||||
|
|
||||||
def provides_cvs?
|
def provides_cvs?
|
||||||
installed? && Version.create(version) < Version.create("5.0")
|
installed? && Version.new(version) < "5.0"
|
||||||
end
|
end
|
||||||
|
|
||||||
def default_prefix?
|
def default_prefix?
|
||||||
if Version.create(version) < Version.create("4.3")
|
if Version.new(version) < "4.3"
|
||||||
prefix.to_s.start_with? "/Developer"
|
prefix.to_s.start_with? "/Developer"
|
||||||
else
|
else
|
||||||
prefix.to_s == "/Applications/Xcode.app/Contents/Developer"
|
prefix.to_s == "/Applications/Xcode.app/Contents/Developer"
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
class Version < ::Version
|
||||||
|
def <=>(other)
|
||||||
|
super(Version.new(other))
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
module CLT
|
module CLT
|
||||||
@ -177,7 +183,7 @@ module OS
|
|||||||
end
|
end
|
||||||
|
|
||||||
def update_instructions
|
def update_instructions
|
||||||
if Version.create(MacOS.version) >= Version.create("10.9")
|
if Xcode::Version.new(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
|
||||||
@ -206,13 +212,13 @@ module OS
|
|||||||
end
|
end
|
||||||
|
|
||||||
def outdated?
|
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")
|
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")
|
||||||
end
|
end
|
||||||
version = version[/clang-(\d+\.\d+\.\d+(\.\d+)?)/, 1] || "0"
|
version = version[/clang-(\d+\.\d+\.\d+(\.\d+)?)/, 1] || "0"
|
||||||
Version.create(version) < Version.create(latest_version)
|
Xcode::Version.new(version) < latest_version
|
||||||
end
|
end
|
||||||
|
|
||||||
# Version string (a pretty long one) of the CLT package.
|
# Version string (a pretty long one) of the CLT package.
|
||||||
@ -225,10 +231,10 @@ 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? && 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|
|
[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")
|
next unless File.exist?("#{MAVERICKS_PKG_PATH}/usr/bin/clang")
|
||||||
end
|
end
|
||||||
version = MacOS.pkgutil_info(id)[/version: (.+)$/, 1]
|
version = MacOS.pkgutil_info(id)[/version: (.+)$/, 1]
|
||||||
|
Loading…
x
Reference in New Issue
Block a user