third_party/opencv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #18771 from chrisballinger:xcode-12-fixes

Browse Source 
Xcode 12 and Python 2/3 fixes

* Fix compilation issues using Xcode 12 on macOS Catalina

* Fix macOS scripts to work on Python 2 or 3

* Fix additional issues with Python 3

* Fix additional Python 2/3 issue

* Fix another Python 2/3 issue

* Remove dependency on builtins module
This commit is contained in:
Chris Ballinger 2020-11-13 07:30:53 -08:00 committed by GitHub
parent 41e906d1a4
commit 4d00ed8df7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 42 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
modules/objc/generator/gen_objc.py
View File

@ -1,23 +1,20 @@
#!/usr/bin/env python #!/usr/bin/env python
from __future__ import print_function, unicode_literals
import sys, re, os.path, errno, fnmatch import sys, re, os.path, errno, fnmatch
import json import json
import logging import logging
import codecs import codecs
import io
from shutil import copyfile from shutil import copyfile
from pprint import pformat from pprint import pformat
from string import Template from string import Template
from distutils.dir_util import copy_tree from distutils.dir_util import copy_tree
if sys.version_info[0] >= 3: try:
from io import StringIO from io import StringIO # Python 3
else: except:
import io from io import BytesIO as StringIO
class StringIO(io.StringIO):
def write(self, s):
if isinstance(s, str):
s = unicode(s) # noqa: F821
return super(StringIO, self).write(s)
SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__)) SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@ -267,15 +264,15 @@ class ClassInfo(GeneralInfo):
return Template("CLASS $namespace::$classpath.$name : $base").substitute(**self.__dict__) return Template("CLASS $namespace::$classpath.$name : $base").substitute(**self.__dict__)
def getImports(self, module): def getImports(self, module):
return ["#import \"%s.h\"" % c for c in sorted(filter(lambda m: m != self.name, map(lambda m: type_dict[m]["import_module"] if m in type_dict and "import_module" in type_dict[m] else m, self.imports)))] return ["#import \"%s.h\"" % c for c in sorted([m for m in [type_dict[m]["import_module"] if m in type_dict and "import_module" in type_dict[m] else m for m in self.imports] if m != self.name])]
def isEnum(self, c): def isEnum(self, c):
return c in type_dict and type_dict[c].get("is_enum", False) return c in type_dict and type_dict[c].get("is_enum", False)
def getForwardDeclarations(self, module): def getForwardDeclarations(self, module):
enum_decl = filter(lambda x:self.isEnum(x) and type_dict[x]["import_module"] != module, self.imports) enum_decl = [x for x in self.imports if self.isEnum(x) and type_dict[x]["import_module"] != module]
enum_imports = list(set(map(lambda m: type_dict[m]["import_module"], enum_decl))) enum_imports = list(set([type_dict[m]["import_module"] for m in enum_decl]))
class_decl = filter(lambda x: not self.isEnum(x), self.imports) class_decl = [x for x in self.imports if not self.isEnum(x)]
return ["#import \"%s.h\"" % c for c in enum_imports] + [""] + ["@class %s;" % c for c in sorted(class_decl)] return ["#import \"%s.h\"" % c for c in enum_imports] + [""] + ["@class %s;" % c for c in sorted(class_decl)]
def addImports(self, ctype, is_out_type): def addImports(self, ctype, is_out_type):
@ -350,7 +347,7 @@ class ClassInfo(GeneralInfo):
module = M, module = M,
additionalImports = self.additionalImports.getvalue(), additionalImports = self.additionalImports.getvalue(),
importBaseClass = '#import "' + self.base + '.h"' if not self.is_base_class else "", importBaseClass = '#import "' + self.base + '.h"' if not self.is_base_class else "",
forwardDeclarations = "\n".join(filter(None, self.getForwardDeclarations(objcM))), forwardDeclarations = "\n".join([_f for _f in self.getForwardDeclarations(objcM) if _f]),
enumDeclarations = self.enum_declarations.getvalue(), enumDeclarations = self.enum_declarations.getvalue(),
nativePointerHandling = Template( nativePointerHandling = Template(
""" """
@ -656,7 +653,7 @@ def build_swift_logues(args):
def add_method_to_dict(class_name, fi): def add_method_to_dict(class_name, fi):
static = fi.static if fi.classname else True static = fi.static if fi.classname else True
if not method_dict.has_key((class_name, fi.objc_name)): if (class_name, fi.objc_name) not in method_dict:
objc_method_name = ("+" if static else "-") + fi.objc_name + ":" + build_objc_method_name(fi.args) objc_method_name = ("+" if static else "-") + fi.objc_name + ":" + build_objc_method_name(fi.args)
method_dict[(class_name, fi.objc_name)] = objc_method_name method_dict[(class_name, fi.objc_name)] = objc_method_name
@ -664,7 +661,7 @@ def see_lookup(objc_class, see):
semi_colon = see.find("::") semi_colon = see.find("::")
see_class = see[:semi_colon] if semi_colon > 0 else objc_class see_class = see[:semi_colon] if semi_colon > 0 else objc_class
see_method = see[(semi_colon + 2):] if semi_colon != -1 else see see_method = see[(semi_colon + 2):] if semi_colon != -1 else see
if method_dict.has_key((see_class, see_method)): if (see_class, see_method) in method_dict:
method = method_dict[(see_class, see_method)] method = method_dict[(see_class, see_method)]
if see_class == objc_class: if see_class == objc_class:
return method return method
@ -741,7 +738,7 @@ class ObjectiveCWrapperGenerator(object):
logging.info('ignored: %s', constinfo) logging.info('ignored: %s', constinfo)
else: else:
objc_type = enumType.rsplit(".", 1)[-1] if enumType else "" objc_type = enumType.rsplit(".", 1)[-1] if enumType else ""
if const_fix.has_key(constinfo.classname) and const_fix[constinfo.classname].has_key(objc_type) and const_fix[constinfo.classname][objc_type].has_key(constinfo.name): if constinfo.classname in const_fix and objc_type in const_fix[constinfo.classname] and constinfo.name in const_fix[constinfo.classname][objc_type]:
fixed_const = const_fix[constinfo.classname][objc_type][constinfo.name] fixed_const = const_fix[constinfo.classname][objc_type][constinfo.name]
constinfo.name = fixed_const constinfo.name = fixed_const
constinfo.cname = fixed_const constinfo.cname = fixed_const
@ -772,7 +769,7 @@ class ObjectiveCWrapperGenerator(object):
objc_type = enumType.rsplit(".", 1)[-1] objc_type = enumType.rsplit(".", 1)[-1]
if objc_type in enum_ignore_list: if objc_type in enum_ignore_list:
return return
if enum_fix.has_key(constinfo.classname): if constinfo.classname in enum_fix:
objc_type = enum_fix[constinfo.classname].get(objc_type, objc_type) objc_type = enum_fix[constinfo.classname].get(objc_type, objc_type)
import_module = constinfo.classname if constinfo.classname and constinfo.classname != objc_type else self.Module import_module = constinfo.classname if constinfo.classname and constinfo.classname != objc_type else self.Module
type_dict[ctype] = { "cast_from" : "int", type_dict[ctype] = { "cast_from" : "int",
@ -800,7 +797,7 @@ class ObjectiveCWrapperGenerator(object):
logging.info('ignored: %s', fi) logging.info('ignored: %s', fi)
elif classname in ManualFuncs and fi.objc_name in ManualFuncs[classname]: elif classname in ManualFuncs and fi.objc_name in ManualFuncs[classname]:
logging.info('manual: %s', fi) logging.info('manual: %s', fi)
if ManualFuncs[classname][fi.objc_name].has_key("objc_method_name"): if "objc_method_name" in ManualFuncs[classname][fi.objc_name]:
method_dict[(classname, fi.objc_name)] = ManualFuncs[classname][fi.objc_name]["objc_method_name"] method_dict[(classname, fi.objc_name)] = ManualFuncs[classname][fi.objc_name]["objc_method_name"]
elif not self.isWrapped(classname): elif not self.isWrapped(classname):
logging.warning('not found: %s', fi) logging.warning('not found: %s', fi)
@ -827,7 +824,7 @@ class ObjectiveCWrapperGenerator(object):
updated_files += 1 updated_files += 1
def get_namespace_prefix(self, cname): def get_namespace_prefix(self, cname):
namespace = self.classes[cname].namespace if self.classes.has_key(cname) else "cv" namespace = self.classes[cname].namespace if cname in self.classes else "cv"
return namespace.replace(".", "::") + "::" return namespace.replace(".", "::") + "::"
def gen(self, srcfiles, module, output_path, output_objc_path, common_headers, manual_classes): def gen(self, srcfiles, module, output_path, output_objc_path, common_headers, manual_classes):
@ -875,7 +872,7 @@ class ObjectiveCWrapperGenerator(object):
mkdir_p(package_path) mkdir_p(package_path)
extension_file = "%s/%s/%sExt.swift" % (output_objc_path, module, self.Module) extension_file = "%s/%s/%sExt.swift" % (output_objc_path, module, self.Module)
for ci in self.classes.values(): for ci in list(self.classes.values()):
if ci.name == "Mat": if ci.name == "Mat":
continue continue
ci.initCodeStreams(self.Module) ci.initCodeStreams(self.Module)
@ -901,13 +898,13 @@ class ObjectiveCWrapperGenerator(object):
report.write("\n".join(self.ported_func_list)) report.write("\n".join(self.ported_func_list))
report.write("\n\nSKIPPED FUNCs LIST (%i of %i):\n\n" % (len(self.skipped_func_list), total_count)) report.write("\n\nSKIPPED FUNCs LIST (%i of %i):\n\n" % (len(self.skipped_func_list), total_count))
report.write("".join(self.skipped_func_list)) report.write("".join(self.skipped_func_list))
for i in self.def_args_hist.keys(): for i in list(self.def_args_hist.keys()):
report.write("\n%i def args - %i funcs" % (i, self.def_args_hist[i])) report.write("\n%i def args - %i funcs" % (i, self.def_args_hist[i]))
return report.getvalue() return report.getvalue()
def fullTypeName(self, t): def fullTypeName(self, t):
if not type_dict[t].get("is_primitive", False) or type_dict[t].has_key("cast_to"): if not type_dict[t].get("is_primitive", False) or "cast_to" in type_dict[t]:
if type_dict[t].has_key("cast_to"): if "cast_to" in type_dict[t]:
return type_dict[t]["cast_to"] return type_dict[t]["cast_to"]
else: else:
namespace_prefix = self.get_namespace_prefix(t) namespace_prefix = self.get_namespace_prefix(t)
@ -916,7 +913,7 @@ class ObjectiveCWrapperGenerator(object):
return t return t
def build_objc2cv_prologue(self, prologue, vector_type, vector_full_type, objc_type, vector_name, array_name): def build_objc2cv_prologue(self, prologue, vector_type, vector_full_type, objc_type, vector_name, array_name):
if not (type_dict.has_key(vector_type) and type_dict[vector_type].has_key("to_cpp") and type_dict[vector_type]["to_cpp"] != "%(n)s.nativeRef"): if not (vector_type in type_dict and "to_cpp" in type_dict[vector_type] and type_dict[vector_type]["to_cpp"] != "%(n)s.nativeRef"):
prologue.append("OBJC2CV(" + vector_full_type + ", " + objc_type[:-1] + ", " + vector_name + ", " + array_name + ");") prologue.append("OBJC2CV(" + vector_full_type + ", " + objc_type[:-1] + ", " + vector_name + ", " + array_name + ");")
else: else:
conv_macro = "CONV_" + array_name conv_macro = "CONV_" + array_name
@ -925,7 +922,7 @@ class ObjectiveCWrapperGenerator(object):
prologue.append("#undef " + conv_macro) prologue.append("#undef " + conv_macro)
def build_cv2objc_epilogue(self, epilogue, vector_type, vector_full_type, objc_type, vector_name, array_name): def build_cv2objc_epilogue(self, epilogue, vector_type, vector_full_type, objc_type, vector_name, array_name):
if not (type_dict.has_key(vector_type) and type_dict[vector_type].has_key("from_cpp") and type_dict[vector_type]["from_cpp"] != ("[" + objc_type[:-1] + " fromNative:%(n)s]")): if not (vector_type in type_dict and "from_cpp" in type_dict[vector_type] and type_dict[vector_type]["from_cpp"] != ("[" + objc_type[:-1] + " fromNative:%(n)s]")):
epilogue.append("CV2OBJC(" + vector_full_type + ", " + objc_type[:-1] + ", " + vector_name + ", " + array_name + ");") epilogue.append("CV2OBJC(" + vector_full_type + ", " + objc_type[:-1] + ", " + vector_name + ", " + array_name + ");")
else: else:
unconv_macro = "UNCONV_" + array_name unconv_macro = "UNCONV_" + array_name
@ -1106,7 +1103,7 @@ class ObjectiveCWrapperGenerator(object):
ret_val = "cv::Ptr<" + namespace_prefix + ret_type + "> retVal = new " + namespace_prefix + ret_type + "(" ret_val = "cv::Ptr<" + namespace_prefix + ret_type + "> retVal = new " + namespace_prefix + ret_type + "("
tail = ")" tail = ")"
ret_type_dict = type_dict[ret_type] ret_type_dict = type_dict[ret_type]
from_cpp = ret_type_dict["from_cpp_ptr"] if ret_type_dict.has_key("from_cpp_ptr") else ret_type_dict["from_cpp"] from_cpp = ret_type_dict["from_cpp_ptr"] if "from_cpp_ptr" in ret_type_dict else ret_type_dict["from_cpp"]
ret = "return " + (from_cpp % { "n" : "retVal" }) + ";" ret = "return " + (from_cpp % { "n" : "retVal" }) + ";"
elif "from_cpp" in type_dict[ret_type]: elif "from_cpp" in type_dict[ret_type]:
ret = "return " + (type_dict[ret_type]["from_cpp"] % { "n" : "retVal" }) + ";" ret = "return " + (type_dict[ret_type]["from_cpp"] % { "n" : "retVal" }) + ";"
@ -1212,13 +1209,13 @@ $unrefined_call$epilogue$ret
return const_value(target.value) return const_value(target.value)
return v return v
if ci.consts: if ci.consts:
enumTypes = set(map(lambda c: c.enumType, ci.consts)) enumTypes = set([c.enumType for c in ci.consts])
grouped_consts = {enumType: [c for c in ci.consts if c.enumType == enumType] for enumType in enumTypes} grouped_consts = {enumType: [c for c in ci.consts if c.enumType == enumType] for enumType in enumTypes}
for typeName, consts in grouped_consts.items(): for typeName, consts in list(grouped_consts.items()):
logging.info("%s", consts) logging.info("%s", consts)
if typeName: if typeName:
typeName = typeName.rsplit(".", 1)[-1] typeName = typeName.rsplit(".", 1)[-1]
if enum_fix.has_key(ci.cname): if ci.cname in enum_fix:
typeName = enum_fix[ci.cname].get(typeName, typeName) typeName = enum_fix[ci.cname].get(typeName, typeName)
ci.enum_declarations.write(""" ci.enum_declarations.write("""
@ -1257,7 +1254,7 @@ typedef NS_ENUM(int, {2}) {{
ci.addImports(pi.ctype, False) ci.addImports(pi.ctype, False)
ci.method_declarations.write("@property " + ("(readonly) " if not pi.rw else "") + objc_type + " " + pi.name + ";\n") ci.method_declarations.write("@property " + ("(readonly) " if not pi.rw else "") + objc_type + " " + pi.name + ";\n")
ptr_ref = "self." + ci.native_ptr_name + "->" if not ci.is_base_class else "self.nativePtr->" ptr_ref = "self." + ci.native_ptr_name + "->" if not ci.is_base_class else "self.nativePtr->"
if type_data.has_key("v_type"): if "v_type" in type_data:
vector_cpp_type = type_data["v_type"] vector_cpp_type = type_data["v_type"]
has_namespace = vector_cpp_type.find("::") != -1 has_namespace = vector_cpp_type.find("::") != -1
vector_full_cpp_type = self.fullTypeName(vector_cpp_type) if not has_namespace else vector_cpp_type vector_full_cpp_type = self.fullTypeName(vector_cpp_type) if not has_namespace else vector_cpp_type
@ -1269,7 +1266,7 @@ typedef NS_ENUM(int, {2}) {{
self.build_cv2objc_epilogue(epilogue, vector_cpp_type, vector_full_cpp_type, objc_type, "retValVector", "retVal") self.build_cv2objc_epilogue(epilogue, vector_cpp_type, vector_full_cpp_type, objc_type, "retValVector", "retVal")
ci.method_implementations.write("\t" + ("\n\t".join(epilogue)) + "\n") ci.method_implementations.write("\t" + ("\n\t".join(epilogue)) + "\n")
ci.method_implementations.write("\treturn retVal;\n}\n\n") ci.method_implementations.write("\treturn retVal;\n}\n\n")
elif type_data.has_key("v_v_type"): elif "v_v_type" in type_data:
vector_cpp_type = type_data["v_v_type"] vector_cpp_type = type_data["v_v_type"]
has_namespace = vector_cpp_type.find("::") != -1 has_namespace = vector_cpp_type.find("::") != -1
vector_full_cpp_type = self.fullTypeName(vector_cpp_type) if not has_namespace else vector_cpp_type vector_full_cpp_type = self.fullTypeName(vector_cpp_type) if not has_namespace else vector_cpp_type
@ -1283,14 +1280,14 @@ typedef NS_ENUM(int, {2}) {{
namespace_prefix = self.get_namespace_prefix(pi.ctype) namespace_prefix = self.get_namespace_prefix(pi.ctype)
ci.method_implementations.write("-(" + objc_type + ")" + pi.name + " {\n") ci.method_implementations.write("-(" + objc_type + ")" + pi.name + " {\n")
ci.method_implementations.write("\tcv::Ptr<" + namespace_prefix + pi.ctype + "> retVal = new " + namespace_prefix + pi.ctype + "(" + ptr_ref + pi.name + ");\n") ci.method_implementations.write("\tcv::Ptr<" + namespace_prefix + pi.ctype + "> retVal = new " + namespace_prefix + pi.ctype + "(" + ptr_ref + pi.name + ");\n")
from_cpp = type_data["from_cpp_ptr"] if type_data.has_key("from_cpp_ptr") else type_data["from_cpp"] from_cpp = type_data["from_cpp_ptr"] if "from_cpp_ptr" in type_data else type_data["from_cpp"]
ci.method_implementations.write("\treturn " + (from_cpp % {"n": "retVal"}) + ";\n}\n\n") ci.method_implementations.write("\treturn " + (from_cpp % {"n": "retVal"}) + ";\n}\n\n")
else: else:
from_cpp = type_data.get("from_cpp", "%(n)s") from_cpp = type_data.get("from_cpp", "%(n)s")
retVal = from_cpp % {"n": (ptr_ref + pi.name)} retVal = from_cpp % {"n": (ptr_ref + pi.name)}
ci.method_implementations.write("-(" + objc_type + ")" + pi.name + " {\n\treturn " + retVal + ";\n}\n\n") ci.method_implementations.write("-(" + objc_type + ")" + pi.name + " {\n\treturn " + retVal + ";\n}\n\n")
if pi.rw: if pi.rw:
if type_data.has_key("v_type"): if "v_type" in type_data:
vector_cpp_type = type_data["v_type"] vector_cpp_type = type_data["v_type"]
has_namespace = vector_cpp_type.find("::") != -1 has_namespace = vector_cpp_type.find("::") != -1
vector_full_cpp_type = self.fullTypeName(vector_cpp_type) if not has_namespace else vector_cpp_type vector_full_cpp_type = self.fullTypeName(vector_cpp_type) if not has_namespace else vector_cpp_type
@ -1300,13 +1297,13 @@ typedef NS_ENUM(int, {2}) {{
ci.method_implementations.write("\t" + ("\n\t".join(prologue)) + "\n") ci.method_implementations.write("\t" + ("\n\t".join(prologue)) + "\n")
ci.method_implementations.write("\t" + ptr_ref + pi.name + " = valVector;\n}\n\n") ci.method_implementations.write("\t" + ptr_ref + pi.name + " = valVector;\n}\n\n")
else: else:
to_cpp = type_data.get("to_cpp", ("(" + type_data.get("cast_to") + ")%(n)s") if type_data.has_key("cast_to") else "%(n)s") to_cpp = type_data.get("to_cpp", ("(" + type_data.get("cast_to") + ")%(n)s") if "cast_to" in type_data else "%(n)s")
val = to_cpp % {"n": pi.name} val = to_cpp % {"n": pi.name}
ci.method_implementations.write("-(void)set" + pi.name[0].upper() + pi.name[1:] + ":(" + objc_type + ")" + pi.name + " {\n\t" + ptr_ref + pi.name + " = " + val + ";\n}\n\n") ci.method_implementations.write("-(void)set" + pi.name[0].upper() + pi.name[1:] + ":(" + objc_type + ")" + pi.name + " {\n\t" + ptr_ref + pi.name + " = " + val + ";\n}\n\n")
# manual ports # manual ports
if ci.name in ManualFuncs: if ci.name in ManualFuncs:
for func in ManualFuncs[ci.name].keys(): for func in list(ManualFuncs[ci.name].keys()):
ci.method_declarations.write( "\n".join(ManualFuncs[ci.name][func]["declaration"]) ) ci.method_declarations.write( "\n".join(ManualFuncs[ci.name][func]["declaration"]) )
ci.method_implementations.write( "\n".join(ManualFuncs[ci.name][func]["implementation"]) ) ci.method_implementations.write( "\n".join(ManualFuncs[ci.name][func]["implementation"]) )
@ -1373,11 +1370,11 @@ typedef NS_ENUM(int, {2}) {{
for dirname, dirs, files in os.walk(os.path.join(testdir, "test")): for dirname, dirs, files in os.walk(os.path.join(testdir, "test")):
for filename in files: for filename in files:
filepath = os.path.join(dirname, filename) filepath = os.path.join(dirname, filename)
with open(filepath) as file: with io.open(filepath, encoding="utf-8", errors="ignore") as file:
body = file.read() body = file.read()
body = body.replace("import OpenCV", "import " + framework_name) body = body.replace("import OpenCV", "import " + framework_name)
body = body.replace("#import <OpenCV/OpenCV.h>", "#import <" + framework_name + "/" + framework_name + ".h>") body = body.replace("#import <OpenCV/OpenCV.h>", "#import <" + framework_name + "/" + framework_name + ".h>")
with open(filepath, "w") as file: with codecs.open(filepath, "w", "utf-8") as file:
file.write(body) file.write(body)
@ -1477,9 +1474,9 @@ def sanitize_documentation_string(doc, type):
in_code = True in_code = True
lines[i] = line.replace("<code>", "") lines[i] = line.replace("<code>", "")
lines = list(map(lambda x: x[x.find('*'):].strip() if x.lstrip().startswith("*") else x, lines)) lines = list([x[x.find('*'):].strip() if x.lstrip().startswith("*") else x for x in lines])
lines = list(map(lambda x: "* " + x[1:].strip() if x.startswith("*") and x != "*" else x, lines)) lines = list(["* " + x[1:].strip() if x.startswith("*") and x != "*" else x for x in lines])
lines = list(map(lambda x: x if x.startswith("*") else "* " + x if x and x != "*" else "*", lines)) lines = list([x if x.startswith("*") else "* " + x if x and x != "*" else "*" for x in lines])
hasValues = False hasValues = False
for line in lines: for line in lines:
@ -1605,9 +1602,7 @@ if __name__ == "__main__":
if os.path.exists(objc_test_resources_dir): if os.path.exists(objc_test_resources_dir):
copy_tree(objc_test_resources_dir, os.path.join(objc_test_base_path, 'test', 'resources')) copy_tree(objc_test_resources_dir, os.path.join(objc_test_base_path, 'test', 'resources'))
manual_classes = filter(lambda x:type_dict.has_key(x), manual_classes = [x for x in [x[x.rfind('/')+1:-2] for x in [x for x in copied_files if x.endswith('.h')]] if x in type_dict]
map(lambda x: x[x.rfind('/')+1:-2],
filter(lambda x: x.endswith('.h'), copied_files)))
if len(srcfiles) > 0: if len(srcfiles) > 0:
generator.gen(srcfiles, module, dstdir, objc_base_path, common_headers, manual_classes) generator.gen(srcfiles, module, dstdir, objc_base_path, common_headers, manual_classes)

6
platforms/ios/build_framework.py
View File

@ -31,12 +31,12 @@ However, {framework_name}.framework directory is erased and recreated on each ru
Adding --dynamic parameter will build {framework_name}.framework as App Store dynamic framework. Only iOS 8+ versions are supported. Adding --dynamic parameter will build {framework_name}.framework as App Store dynamic framework. Only iOS 8+ versions are supported.
""" """
from __future__ import print_function from __future__ import print_function, unicode_literals
import glob, re, os, os.path, shutil, string, sys, argparse, traceback, multiprocessing import glob, re, os, os.path, shutil, string, sys, argparse, traceback, multiprocessing
from subprocess import check_call, check_output, CalledProcessError from subprocess import check_call, check_output, CalledProcessError
from distutils.dir_util import copy_tree from distutils.dir_util import copy_tree
IPHONEOS_DEPLOYMENT_TARGET='8.0' # default, can be changed via command line options or environment variable IPHONEOS_DEPLOYMENT_TARGET='9.0' # default, can be changed via command line options or environment variable
def execute(cmd, cwd = None): def execute(cmd, cwd = None):
print("Executing: %s in %s" % (cmd, cwd), file=sys.stderr) print("Executing: %s in %s" % (cmd, cwd), file=sys.stderr)
@ -46,7 +46,7 @@ def execute(cmd, cwd = None):
raise Exception("Child returned:", retcode) raise Exception("Child returned:", retcode)
def getXCodeMajor(): def getXCodeMajor():
ret = check_output(["xcodebuild", "-version"]) ret = check_output(["xcodebuild", "-version"]).decode('utf-8')
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))