pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-02-10 18:05:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

relocate polyfill and fix sources

Browse Source
This commit is contained in:
Kulikova Svetlana
2021-11-22 12:56:23 +03:00
parent a33de97309
commit d4f7cc6d6f
9 changed files with 48 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Common/3dParty/hunspell/hunspell.json
View File

@ -38,7 +38,11 @@
"name": "h",
"folder": "./hunspell/src/hunspell/",
"files": ["affentry.cxx", "affixmgr.cxx", "csutil.cxx", "hashmgr.cxx", "hunspell.cxx", "hunzip.cxx", "phonet.cxx", "replist.cxx", "suggestmgr.cxx"]
},
{
"name": "s",
"folder": "./wasm/src/",
"files": ["filemgr_wrapper_new.cxx", "base.cpp"]
}
],
"sources": ["./wasm/src/filemgr_wrapper_new.cxx", "./wasm/src/base.cpp"]
]
}

2
Common/3dParty/hunspell/make.py
View File

@ -164,7 +164,7 @@ base.replaceInFile("./spell.js", "function getBinaryPromise(){", "function getBi
spell_js_content = base.readFile("./spell.js")
engine_base_js_content = base.readFile("./wasm/js/spell.js")
engine_base_js_polyfill = base.readFile("./wasm/js/polyfill.js")
engine_base_js_polyfill = base.readFile("./../../js/polyfill.js")
engine_js_content = base.readFile("./../../license/header.license") + "\n" + engine_base_js_polyfill + "\n\n" + engine_base_js_content.replace("//module", spell_js_content)
# write new version

36
Common/js/make.py
View File

@ -43,15 +43,25 @@ def exec_wasm(data, work, compiler_flags, wasm):
libs = ""
for compile_files in data["compile_files_array"]:
base.create_dir("./o/" + compile_files["name"])
temp_arguments = ""
if "include_path" in compile_files and compile_files["include_path"]:
for include in compile_files["include_path"]:
temp_arguments += ("-I" + os.path.normpath(work + include).replace("\\", '/') + " ")
if "define" in compile_files and compile_files["define"]:
for define in compile_files["define"]:
temp_arguments += ("-D" + define + " ")
temp_libs = ""
for item in compile_files["files"]:
file_name = os.path.splitext(os.path.basename(item))[0]
if not base.is_file("./o/" + compile_files["name"] + "/" + file_name + ".o"):
run_file.append(prefix_call + "emcc -o o/" + compile_files["name"] + "/" + file_name + ".o -c " + arguments + os.path.normpath(work + os.path.join(compile_files["folder"], item)).replace("\\", '/'))
run_file.append(prefix_call + "emcc -o o/" + compile_files["name"] + "/" + file_name + ".o -c " + arguments + temp_arguments + os.path.normpath(work + os.path.join(compile_files["folder"], item)).replace("\\", '/'))
temp_libs += ("o/" + compile_files["name"] + "/" + file_name + ".o ")
if len(compile_files["files"]) > 10:
if not base.is_file("./o/" + compile_files["name"] + "/" + compile_files["name"] + ".o"):
run_file.append(prefix_call + "emcc -o o/" + compile_files["name"] + "/" + compile_files["name"] + ".o -r " + arguments + temp_libs)
run_file.append(prefix_call + "emcc -o o/" + compile_files["name"] + "/" + compile_files["name"] + ".o -r " + arguments + temp_arguments + temp_libs)
libs += ("o/" + compile_files["name"] + "/" + compile_files["name"] + ".o ")
else:
libs += temp_libs
@ -62,24 +72,26 @@ def exec_wasm(data, work, compiler_flags, wasm):
arguments = arguments[:-1]
arguments += "]\" "
for item in data["sources"]:
arguments += (os.path.normpath(work + item).replace("\\", '/') + " ")
if "sources" in data and data["sources"]:
for item in data["sources"]:
arguments += (os.path.normpath(work + item).replace("\\", '/') + " ")
run_file.append(prefix_call + "emcc -o " + data["name"] + ".js " + arguments + libs)
print("run " + data["name"])
base.print_info("run " + ("wasm " if wasm else "asm ") + data["name"])
base.run_as_bat(run_file)
# finalize
print("finalize " + data["name"])
base.print_info("end " + ("wasm " if wasm else "asm ") + data["name"])
module_js_content = base.readFile("./" + data["name"] + ".js")
engine_base_js_content = base.readFile(work + data["base_js_content"])
string_utf8_content = base.readFile("./string_utf8.js")
desktop_fetch_content = base.readFile("./desktop_fetch.js")
polyfill_js_content = base.readFile("./../3dParty/hunspell/wasm/js/polyfill.js")
polyfill_js_content = base.readFile("./polyfill.js")
engine_js_content = engine_base_js_content.replace("//module", module_js_content)
engine_js_content = engine_js_content.replace("//string_utf8", string_utf8_content)
engine_js_content = engine_js_content.replace("//desktop_fetch", desktop_fetch_content)
engine_js_content = engine_js_content.replace("//polyfill", polyfill_js_content)
if not wasm:
engine_js_content = engine_js_content.replace("//polyfill", polyfill_js_content)
# write new version
base.writeFile(work + data["res_folder"] + "/" + data["name"] + ("" if wasm else "_ie") + ".js", engine_js_content)
@ -94,14 +106,14 @@ def exec_wasm(data, work, compiler_flags, wasm):
argv = sys.argv
argv.pop(0)
for param in argv:
print(param)
base.print_info(param)
if not base.is_file(param):
continue
work_dir = os.path.dirname(param) + "/"
json_data = json.loads(base.readFile(param))
if json_data["run_before"]:
print("before")
base.print_info("before")
if base.is_file(work_dir + json_data["run_before"]):
base.cmd_in_dir(work_dir, "python", [json_data["run_before"]])
else:
@ -115,19 +127,17 @@ for param in argv:
# wasm or asm
if json_data["wasm"]:
print("wasm " + json_data["name"])
flags = json_data["compiler_flags"].copy()
flags.append("-s WASM=1")
exec_wasm(json_data, work_dir, flags, True)
if json_data["asm"]:
print("asm " + json_data["name"])
flags = json_data["compiler_flags"].copy()
flags.append("-s WASM=0")
exec_wasm(json_data, work_dir, flags, False)
base.delete_dir("./o")
if json_data["run_after"]:
print("after")
base.print_info("after")
if base.is_file(work_dir + json_data["run_after"]):
base.cmd_in_dir(work_dir, "python", [json_data["run_after"]])
else:

0
Common/3dParty/hunspell/wasm/js/polyfill.js → Common/js/polyfill.js
View File

7
DesktopEditor/graphics/pro/js/drawingfile.json
View File

@ -97,8 +97,8 @@
},
{
"name": "lib",
"folder": "./",
"files": ["wasm/src/lib/wasm_jmp.cpp"]
"folder": "./wasm/src/",
"files": ["lib/wasm_jmp.cpp", "drawingfile.cpp", "metafile.cpp"]
},
{
"name": "f",
@ -175,6 +175,5 @@
"folder": "../../../../UnicodeConverter/",
"files": ["UnicodeConverter.cpp"]
}
],
"sources": ["wasm/src/drawingfile.cpp", "wasm/src/metafile.cpp"]
]
}

2
DesktopEditor/graphics/pro/js/make.py
View File

@ -258,7 +258,7 @@ base.replaceInFile("./drawingfile.js", "\"drawingfile.js.mem\"", "getMemoryPathI
module_js_content = base.readFile("./drawingfile.js")
engine_base_js_content = base.readFile("./wasm/js/drawingfile_base.js")
string_utf8_content = base.readFile("./../../../../Common/js/string_utf8.js")
polyfill_js_content = base.readFile("./../../../../Common/3dParty/hunspell/wasm/js/polyfill.js")
polyfill_js_content = base.readFile("./../../../../Common/js/polyfill.js")
engine_js_content = engine_base_js_content.replace("//module", module_js_content)
engine_js_content = engine_js_content.replace("//string_utf8", string_utf8_content)
engine_js_content = engine_js_content.replace("//polyfill", polyfill_js_content)

4
DesktopEditor/graphics/pro/js/wasm/src/drawingfile.cpp
View File

@ -150,8 +150,8 @@ static DWORD GetLength(BYTE* x)
int main()
{
#define XPS_TEST 0
#define DJVU_TEST 1
#define PDF_TEST 0
#define DJVU_TEST 0
#define PDF_TEST 1
#if PDF_TEST
BYTE* pPdfData = NULL;
DWORD nPdfBytesCount;

7
DesktopEditor/xmlsec/src/wasm/module/xmlsec.json
View File

@ -66,7 +66,12 @@
"name": "s",
"folder": "../../../../xmlsec/src/src/",
"files": ["XmlTransform.cpp", "XmlCertificate.cpp", "OOXMLSigner.cpp", "OOXMLVerifier.cpp", "XmlSigner_openssl.cpp"]
},
{
"name": "a",
"folder": "./",
"files": ["openssl/apps/openssl.c", "../main.cpp"]
}
],
"sources": ["./openssl/libcrypto.a", "./openssl/apps/openssl.c", "../main.cpp"]
"sources": ["./openssl/libcrypto.a"]
}

8
OfficeUtils/js/zlib.json
View File

@ -41,7 +41,11 @@
"name": "z",
"folder": "../src/zlib-1.2.11/",
"files": ["inflate.c", "zutil.c", "adler32.c", "crc32.c", "inftrees.c", "inffast.c", "deflate.c", "trees.c"]
},
{
"name": "s",
"folder": "./",
"files": ["../src/ZipBuffer.cpp", "wasm/src/base.cpp"]
}
],
"sources": ["../src/ZipBuffer.cpp", "wasm/src/base.cpp"]
]
}