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

Merge remote-tracking branch 'upstream/3.4' into merge-3.4

Browse Source
This commit is contained in:
Alexander Alekhin 2020-12-25 16:25:14 +00:00
commit ba3f150b14
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
modules/js/src/make_umd.py
View File

@ -69,13 +69,16 @@
import os, sys, re, json, shutil import os, sys, re, json, shutil
from subprocess import Popen, PIPE, STDOUT from subprocess import Popen, PIPE, STDOUT
PY3 = sys.version_info >= (3, 0)
def make_umd(opencvjs, cvjs): def make_umd(opencvjs, cvjs):
src = open(opencvjs, 'r+b') with open(opencvjs, 'r+b') as src:
dst = open(cvjs, 'w+b') content = src.read()
content = src.read() if PY3: # content is bytes
dst.seek(0) content = content.decode('utf-8')
# inspired by https://github.com/umdjs/umd/blob/95563fd6b46f06bda0af143ff67292e7f6ede6b7/templates/returnExportsGlobal.js with open(cvjs, 'w+b') as dst:
dst.write((""" # inspired by https://github.com/umdjs/umd/blob/95563fd6b46f06bda0af143ff67292e7f6ede6b7/templates/returnExportsGlobal.js
dst.write(("""
(function (root, factory) { (function (root, factory) {
if (typeof define === 'function' && define.amd) { if (typeof define === 'function' && define.amd) {
// AMD. Register as an anonymous module. // AMD. Register as an anonymous module.
@ -103,7 +106,8 @@ def make_umd(opencvjs, cvjs):
Module = {}; Module = {};
return cv(Module); return cv(Module);
})); }));
""" % (content)).lstrip().encode()) """ % (content)).lstrip().encode('utf-8'))
if __name__ == "__main__": if __name__ == "__main__":
if len(sys.argv) > 2: if len(sys.argv) > 2:

4
platforms/js/build_js.py
View File

@ -77,7 +77,9 @@ class Builder:
rm_one(d) rm_one(d)
def get_cmake_cmd(self): def get_cmake_cmd(self):
cmd = ["cmake", cmd = [
"cmake",
"-DPYTHON_DEFAULT_EXECUTABLE=%s" % sys.executable,
"-DENABLE_PIC=FALSE", # To workaround emscripten upstream backend issue https://github.com/emscripten-core/emscripten/issues/8761 "-DENABLE_PIC=FALSE", # To workaround emscripten upstream backend issue https://github.com/emscripten-core/emscripten/issues/8761
"-DCMAKE_BUILD_TYPE=Release", "-DCMAKE_BUILD_TYPE=Release",
"-DCMAKE_TOOLCHAIN_FILE='%s'" % self.get_toolchain_file(), "-DCMAKE_TOOLCHAIN_FILE='%s'" % self.get_toolchain_file(),