mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-01-18 06:03:15 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix Xcode version parsing error (affects bitcode generation)

Browse Source 
The regex was only parsing for a single digit in the major version, causing Xcode 10 to be treated as version "1". Other parts of the script only turn on bitcode generation if the Xcode version is > 7.
This commit is contained in:
Andrew Mroczkowski 2018-09-26 17:20:37 -04:00 committed by Alexander Alekhin
parent 4b895a4d1f
commit 3c5a6be835
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
platforms/ios/build_framework.py
View File

@ -39,10 +39,11 @@ def execute(cmd, cwd = None):
def getXCodeMajor(): def getXCodeMajor():
ret = check_output(["xcodebuild", "-version"]) ret = check_output(["xcodebuild", "-version"])
m = re.match(r'XCode\s+(\d)\..*', ret, flags=re.IGNORECASE) m = re.match(r'Xcode\s+(\d+)\..*', ret, flags=re.IGNORECASE)
if m: if m:
return int(m.group(1)) return int(m.group(1))
return 0 else:
raise Exception("Failed to parse Xcode version")
class Builder: class Builder:
def __init__(self, opencv, contrib, dynamic, bitcodedisabled, exclude, targets): def __init__(self, opencv, contrib, dynamic, bitcodedisabled, exclude, targets):