RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

build: use StrictVersion for swift version comparison

This commit is contained in:
Akemi 2018-11-24 12:49:55 +01:00 committed by Jan Ekström
parent de2b1920f3
commit a3e6b81305
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
waftools/checks/custom.py
View File

@ -1,6 +1,7 @@
from waftools import inflector
from waftools.checks.generic import *
from waflib import Utils
from distutils.version import StrictVersion
import os
__all__ = ["check_pthreads", "check_iconv", "check_lua",
@ -114,9 +115,8 @@ def check_cocoa(ctx, dependency_identifier):
def check_swift(ctx, dependency_identifier):
if ctx.env.SWIFT_VERSION:
major = int(ctx.env.SWIFT_VERSION.split('.')[0])
ctx.add_optional_message(dependency_identifier,
'version found: ' + ctx.env.SWIFT_VERSION)
if major >= 3:
'version found: ' + str(ctx.env.SWIFT_VERSION))
if StrictVersion(ctx.env.SWIFT_VERSION) >= StrictVersion("3.0"):
return True
return False

8
waftools/detections/compiler_swift.py
View File

@ -1,5 +1,6 @@
import re
from waflib import Utils
from distutils.version import StrictVersion
def __run(cmd):
try:
@ -15,12 +16,11 @@ def __add_swift_flags(ctx):
"-target", "x86_64-apple-macosx10.10"
]
ver = re.compile("(?i)version\s?([\d.]+)")
ctx.env.SWIFT_VERSION = ver.search(__run([ctx.env.SWIFT, '-version'])).group(1)
major, minor = [int(n) for n in ctx.env.SWIFT_VERSION.split('.')[:2]]
verRe = re.compile("(?i)version\s?([\d.]+)")
ctx.env.SWIFT_VERSION = verRe.search(__run([ctx.env.SWIFT, '-version'])).group(1)
# the -swift-version parameter is only supported on swift 3.1 and newer
if major >= 3 and minor >= 1 or major >= 4:
if StrictVersion(ctx.env.SWIFT_VERSION) >= StrictVersion("3.1"):
ctx.env.SWIFT_FLAGS.extend([ "-swift-version", "3" ])
if ctx.is_debug_build():