Chiebot-Mirror
/
opencv
mirror of https://github.com/opencv/opencv.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #20092 from komakai:disable_swift_build

Browse Source 
Fixes for Swift troubles

* Remove NS_SWIFT_NAME override for Point, Rect, and Size due to Darwin namespace conflict

* Fix swift_type overrides in objc generator

* Add backwards compatibility Swift typealiases for Point, Rect, Size

* Add disable-swift build option to iOS/macOS builds

* Add import directive to swift source when building with disable-swift

Co-authored-by: Chris Ballinger <cballinger@rightpoint.com>
pull/20115/head
Giles Payne 4 years ago committed by GitHub
parent 70d1ff7155
commit 6265155ce4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 45 additions and 18 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      modules/core/misc/objc/common/Point2i.h
  2. 1
      modules/core/misc/objc/common/Rect2i.h
  3. 1
      modules/core/misc/objc/common/Size2i.h
  4. 11
      modules/core/misc/objc/common/Typealiases.swift
  5. 18
      modules/core/misc/objc/gen_dict.json
  6. 28
      platforms/ios/build_framework.py
  7. 3
      platforms/osx/build_framework.py

1
modules/core/misc/objc/common/Point2i.h
Unescape View File

@ -21,7 +21,6 @@ NS_ASSUME_NONNULL_BEGIN
/** /**
* Represents a two dimensional point the coordinate values of which are of type `int` * Represents a two dimensional point the coordinate values of which are of type `int`
*/ */
NS_SWIFT_NAME(Point)
CV_EXPORTS @interface Point2i : NSObject CV_EXPORTS @interface Point2i : NSObject
# pragma mark - Properties # pragma mark - Properties

1
modules/core/misc/objc/common/Rect2i.h
Unescape View File

@ -22,7 +22,6 @@ NS_ASSUME_NONNULL_BEGIN
/** /**
* Represents a rectange the coordinate and dimension values of which are of type `int` * Represents a rectange the coordinate and dimension values of which are of type `int`
*/ */
NS_SWIFT_NAME(Rect)
CV_EXPORTS @interface Rect2i : NSObject CV_EXPORTS @interface Rect2i : NSObject
#pragma mark - Properties #pragma mark - Properties

1
modules/core/misc/objc/common/Size2i.h
Unescape View File

@ -21,7 +21,6 @@ NS_ASSUME_NONNULL_BEGIN
/** /**
* Represents the dimensions of a rectangle the values of which are of type `int` * Represents the dimensions of a rectangle the values of which are of type `int`
*/ */
NS_SWIFT_NAME(Size)
CV_EXPORTS @interface Size2i : NSObject CV_EXPORTS @interface Size2i : NSObject
#pragma mark - Properties #pragma mark - Properties

11
modules/core/misc/objc/common/Typealiases.swift
Unescape View File

@ -0,0 +1,11 @@
//
// Typealiases.swift
//
// Created by Chris Ballinger on 2020/11/18.
//
import Foundation
public typealias Rect = Rect2i
public typealias Point = Point2i
public typealias Size = Size2i

18
modules/core/misc/objc/gen_dict.json
Unescape View File

@ -113,13 +113,13 @@
"objc_type": "Point2i*", "objc_type": "Point2i*",
"to_cpp": "%(n)s.nativeRef", "to_cpp": "%(n)s.nativeRef",
"from_cpp": "[Point2i fromNative:%(n)s]", "from_cpp": "[Point2i fromNative:%(n)s]",
"swift_type": "Point" "swift_type": "Point2i"
}, },
"Point2i": { "Point2i": {
"objc_type": "Point2i*", "objc_type": "Point2i*",
"to_cpp": "%(n)s.nativeRef", "to_cpp": "%(n)s.nativeRef",
"from_cpp": "[Point2i fromNative:%(n)s]", "from_cpp": "[Point2i fromNative:%(n)s]",
"swift_type": "Point" "swift_type": "Point2i"
}, },
"Point2f": { "Point2f": {
"objc_type": "Point2f*", "objc_type": "Point2f*",
@ -153,13 +153,13 @@
"objc_type": "Rect2i*", "objc_type": "Rect2i*",
"to_cpp": "%(n)s.nativeRef", "to_cpp": "%(n)s.nativeRef",
"from_cpp": "[Rect2i fromNative:%(n)s]", "from_cpp": "[Rect2i fromNative:%(n)s]",
"swift_type": "Rect" "swift_type": "Rect2i"
}, },
"Rect2i": { "Rect2i": {
"objc_type": "Rect2i*", "objc_type": "Rect2i*",
"to_cpp": "%(n)s.nativeRef", "to_cpp": "%(n)s.nativeRef",
"from_cpp": "[Rect2i fromNative:%(n)s]", "from_cpp": "[Rect2i fromNative:%(n)s]",
"swift_type": "Rect" "swift_type": "Rect2i"
}, },
"Rect2f": { "Rect2f": {
"objc_type": "Rect2f*", "objc_type": "Rect2f*",
@ -185,13 +185,13 @@
"objc_type": "Size2i*", "objc_type": "Size2i*",
"to_cpp": "%(n)s.nativeRef", "to_cpp": "%(n)s.nativeRef",
"from_cpp": "[Size2i fromNative:%(n)s]", "from_cpp": "[Size2i fromNative:%(n)s]",
"swift_type": "Size" "swift_type": "Size2i"
}, },
"Size2i": { "Size2i": {
"objc_type": "Size2i*", "objc_type": "Size2i*",
"to_cpp": "%(n)s.nativeRef", "to_cpp": "%(n)s.nativeRef",
"from_cpp": "[Size2i fromNative:%(n)s]", "from_cpp": "[Size2i fromNative:%(n)s]",
"swift_type": "Size" "swift_type": "Size2i"
}, },
"Size2f": { "Size2f": {
"objc_type": "Size2f*", "objc_type": "Size2f*",
@ -273,7 +273,7 @@
"vector_Point": { "vector_Point": {
"objc_type": "Point2i*", "objc_type": "Point2i*",
"v_type": "Point2i", "v_type": "Point2i",
"swift_type": "[Point]" "swift_type": "[Point2i]"
}, },
"vector_Point2f": { "vector_Point2f": {
"objc_type": "Point2f*", "objc_type": "Point2f*",
@ -298,7 +298,7 @@
"vector_Rect": { "vector_Rect": {
"objc_type": "Rect2i*", "objc_type": "Rect2i*",
"v_type": "Rect2i", "v_type": "Rect2i",
"swift_type": "[Rect]" "swift_type": "[Rect2i]"
}, },
"vector_Rect2d": { "vector_Rect2d": {
"objc_type": "Rect2d*", "objc_type": "Rect2d*",
@ -386,7 +386,7 @@
"vector_vector_Point": { "vector_vector_Point": {
"objc_type": "Point2i*", "objc_type": "Point2i*",
"v_v_type": "Point2i", "v_v_type": "Point2i",
"swift_type": "[[Point]]" "swift_type": "[[Point2i]]"
}, },
"vector_vector_Point2f": { "vector_vector_Point2f": {
"objc_type": "Point2f*", "objc_type": "Point2f*",

28
platforms/ios/build_framework.py
Unescape View File

@ -32,7 +32,7 @@ Adding --dynamic parameter will build {framework_name}.framework as App Store dy
""" """
from __future__ import print_function, unicode_literals from __future__ import print_function, unicode_literals
import glob, os, os.path, shutil, string, sys, argparse, traceback, multiprocessing import glob, os, os.path, shutil, string, sys, argparse, traceback, multiprocessing, codecs, io
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
@ -42,7 +42,7 @@ from cv_build_utils import execute, print_error, get_xcode_major, get_xcode_sett
IPHONEOS_DEPLOYMENT_TARGET='9.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
class Builder: class Builder:
def __init__(self, opencv, contrib, dynamic, bitcodedisabled, exclude, disable, enablenonfree, targets, debug, debug_info, framework_name, run_tests, build_docs): def __init__(self, opencv, contrib, dynamic, bitcodedisabled, exclude, disable, enablenonfree, targets, debug, debug_info, framework_name, run_tests, build_docs, swiftdisabled):
self.opencv = os.path.abspath(opencv) self.opencv = os.path.abspath(opencv)
self.contrib = None self.contrib = None
if contrib: if contrib:
@ -63,6 +63,7 @@ class Builder:
self.framework_name = framework_name self.framework_name = framework_name
self.run_tests = run_tests self.run_tests = run_tests
self.build_docs = build_docs self.build_docs = build_docs
self.swiftdisabled = swiftdisabled
def checkCMakeVersion(self): def checkCMakeVersion(self):
if get_xcode_version() >= (12, 2): if get_xcode_version() >= (12, 2):
@ -153,6 +154,22 @@ class Builder:
print("To build docs call:") print("To build docs call:")
print(sys.argv[0].replace("build_framework", "build_docs") + " " + dirs[0] + "/modules/objc/framework_build") print(sys.argv[0].replace("build_framework", "build_docs") + " " + dirs[0] + "/modules/objc/framework_build")
self.copy_samples(outdir) self.copy_samples(outdir)
if self.swiftdisabled:
swift_sources_dir = os.path.join(outdir, "SwiftSources")
if not os.path.exists(swift_sources_dir):
os.makedirs(swift_sources_dir)
for root, dirs, files in os.walk(dirs[0]):
for file in files:
if file.endswith(".swift") and file.find("Test") == -1:
with io.open(os.path.join(root, file), encoding="utf-8", errors="ignore") as file_in:
body = file_in.read()
if body.find("import Foundation") != -1:
insert_pos = body.find("import Foundation") + len("import Foundation") + 1
body = body[:insert_pos] + "import " + self.framework_name + "\n" + body[insert_pos:]
else:
body = "import " + self.framework_name + "\n\n" + body
with codecs.open(os.path.join(swift_sources_dir, file), "w", "utf-8") as file_out:
file_out.write(body)
def build(self, outdir): def build(self, outdir):
try: try:
@ -297,8 +314,8 @@ class Builder:
execute(["cmake", "-DBUILD_TYPE=%s" % self.getConfiguration(), "-P", "cmake_install.cmake"], cwd = builddir) execute(["cmake", "-DBUILD_TYPE=%s" % self.getConfiguration(), "-P", "cmake_install.cmake"], cwd = builddir)
if self.build_objc_wrapper: if self.build_objc_wrapper:
cmakecmd = self.makeCMakeCmd(arch, target, builddir + "/modules/objc_bindings_generator/{}/gen".format(self.getObjcTarget(target)), cmakeargs) cmakecmd = self.makeCMakeCmd(arch, target, builddir + "/modules/objc_bindings_generator/{}/gen".format(self.getObjcTarget(target)), cmakeargs)
# cmakecmd.append("-DCMAKE_Swift_FLAGS=" + "-target x86_64-apple-ios13.0-macabi") if self.swiftdisabled:
# cmakecmd.append("-DCMAKE_EXE_LINKER_FLAGS=" + "-target x86_64-apple-ios13.0-macabi") cmakecmd.append("-DSWIFT_DISABLED=1")
cmakecmd.append("-DBUILD_ROOT=%s" % builddir) cmakecmd.append("-DBUILD_ROOT=%s" % builddir)
cmakecmd.append("-DCMAKE_INSTALL_NAME_TOOL=install_name_tool") cmakecmd.append("-DCMAKE_INSTALL_NAME_TOOL=install_name_tool")
cmakecmd.append("--no-warn-unused-cli") cmakecmd.append("--no-warn-unused-cli")
@ -509,6 +526,7 @@ if __name__ == "__main__":
parser.add_argument('--legacy_build', default=False, dest='legacy_build', action='store_true', help='Build legacy opencv2 framework (default: False, equivalent to "--framework_name=opencv2 --without=objc")') parser.add_argument('--legacy_build', default=False, dest='legacy_build', action='store_true', help='Build legacy opencv2 framework (default: False, equivalent to "--framework_name=opencv2 --without=objc")')
parser.add_argument('--run_tests', default=False, dest='run_tests', action='store_true', help='Run tests') parser.add_argument('--run_tests', default=False, dest='run_tests', action='store_true', help='Run tests')
parser.add_argument('--build_docs', default=False, dest='build_docs', action='store_true', help='Build docs') parser.add_argument('--build_docs', default=False, dest='build_docs', action='store_true', help='Build docs')
parser.add_argument('--disable-swift', default=False, dest='swiftdisabled', action='store_true', help='Disable building of Swift extensions')
args, unknown_args = parser.parse_known_args() args, unknown_args = parser.parse_known_args()
if unknown_args: if unknown_args:
@ -562,6 +580,6 @@ if __name__ == "__main__":
if iphonesimulator_archs: if iphonesimulator_archs:
targets.append((iphonesimulator_archs, "iPhoneSimulator")) targets.append((iphonesimulator_archs, "iPhoneSimulator"))
b = iOSBuilder(args.opencv, args.contrib, args.dynamic, args.bitcodedisabled, args.without, args.disable, args.enablenonfree, targets, args.debug, args.debug_info, args.framework_name, args.run_tests, args.build_docs) b = iOSBuilder(args.opencv, args.contrib, args.dynamic, args.bitcodedisabled, args.without, args.disable, args.enablenonfree, targets, args.debug, args.debug_info, args.framework_name, args.run_tests, args.build_docs, args.swiftdisabled)
b.build(args.out) b.build(args.out)

3
platforms/osx/build_framework.py
Unescape View File

@ -77,6 +77,7 @@ if __name__ == "__main__":
parser.add_argument('--legacy_build', default=False, dest='legacy_build', action='store_true', help='Build legacy framework (default: False, equivalent to "--framework_name=opencv2 --without=objc")') parser.add_argument('--legacy_build', default=False, dest='legacy_build', action='store_true', help='Build legacy framework (default: False, equivalent to "--framework_name=opencv2 --without=objc")')
parser.add_argument('--run_tests', default=False, dest='run_tests', action='store_true', help='Run tests') parser.add_argument('--run_tests', default=False, dest='run_tests', action='store_true', help='Run tests')
parser.add_argument('--build_docs', default=False, dest='build_docs', action='store_true', help='Build docs') parser.add_argument('--build_docs', default=False, dest='build_docs', action='store_true', help='Build docs')
parser.add_argument('--disable-swift', default=False, dest='swiftdisabled', action='store_true', help='Disable building of Swift extensions')
args, unknown_args = parser.parse_known_args() args, unknown_args = parser.parse_known_args()
if unknown_args: if unknown_args:
@ -127,5 +128,5 @@ if __name__ == "__main__":
if catalyst_archs: if catalyst_archs:
targets.append((catalyst_archs, "Catalyst")), targets.append((catalyst_archs, "Catalyst")),
b = OSXBuilder(args.opencv, args.contrib, args.dynamic, True, args.without, args.disable, args.enablenonfree, targets, args.debug, args.debug_info, args.framework_name, args.run_tests, args.build_docs) b = OSXBuilder(args.opencv, args.contrib, args.dynamic, True, args.without, args.disable, args.enablenonfree, targets, args.debug, args.debug_info, args.framework_name, args.run_tests, args.build_docs, args.swiftdisabled)
b.build(args.out) b.build(args.out)

Write Preview
Loading…
Cancel
Save