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

Replaced distutils to shutil when copying files in a tree

Browse Source
This commit is contained in:
Andrey Senyaev 2021-12-10 11:46:27 +03:00
parent 9bcb006ec7
commit 4d3cf77ad5
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,7 +9,13 @@ 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
if sys.version_info >= (3, 8): # Python 3.8+
from shutil import copytree
def copy_tree(src, dst):
copytree(src, dst, dirs_exist_ok=True)
else:
from distutils.dir_util import copy_tree
try: try:
from io import StringIO # Python 3 from io import StringIO # Python 3

7
platforms/ios/build_framework.py
View File

@ -34,7 +34,12 @@ 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, codecs, io 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
if sys.version_info >= (3, 8): # Python 3.8+
def copy_tree(src, dst):
shutil.copytree(src, dst, dirs_exist_ok=True)
else:
from distutils.dir_util import copy_tree
sys.path.insert(0, os.path.abspath(os.path.abspath(os.path.dirname(__file__))+'/../apple')) sys.path.insert(0, os.path.abspath(os.path.abspath(os.path.dirname(__file__))+'/../apple'))
from cv_build_utils import execute, print_error, get_xcode_major, get_xcode_setting, get_xcode_version, get_cmake_version from cv_build_utils import execute, print_error, get_xcode_major, get_xcode_setting, get_xcode_version, get_cmake_version