From 029b16ca68b66d8d8386fd01b07df19367b2f278 Mon Sep 17 00:00:00 2001 From: Oleg Korshul Date: Thu, 6 Mar 2025 13:05:25 +0300 Subject: [PATCH 1/5] Fix deploy builder --- scripts/base.py | 13 ++++++++++++- scripts/deploy_builder.py | 3 ++- scripts/deploy_core.py | 2 +- scripts/deploy_desktop.py | 2 +- scripts/deploy_server.py | 2 +- 5 files changed, 17 insertions(+), 5 deletions(-) diff --git a/scripts/base.py b/scripts/base.py index 0d0d1b4..d9ced24 100644 --- a/scripts/base.py +++ b/scripts/base.py @@ -428,6 +428,13 @@ def cmd_in_dir(directory, prog, args=[], is_no_errors=False): os.chdir(cur_dir) return ret +def cmd_in_dir_qemu(platform, directory, prog, args=[], is_no_errors=False): + if (platform == "linux_arm64"): + cmd_in_dir(directory, "qemu-aarch64", ["-L", "/usr/aarch64-linux-gnu", prog] + args, is_no_errors) + if (platform == "linux_arm32"): + cmd_in_dir(directory, "qemu-arm", ["-L", "/usr/arm-linux-gnueabi", prog] + args, is_no_errors) + return ret + def cmd_and_return_cwd(prog, args=[], is_no_errors=False): cur_dir = os.getcwd() ret = cmd(prog, args, is_no_errors) @@ -1831,10 +1838,14 @@ def get_autobuild_version(product, platform="", branch="", build=""): download_addon = download_branch + "/" + download_build + "/" + product + "-" + download_platform + ".7z" return "http://repo-doc-onlyoffice-com.s3.amazonaws.com/archive/" + download_addon -def create_x2t_js_cache(dir, product): +def create_x2t_js_cache(dir, product, platform): if is_file(dir + "/libdoctrenderer.dylib") and (os.path.getsize(dir + "/libdoctrenderer.dylib") < 5*1024*1024): return + if ((platform == "linux_arm64") and not is_os_arm()): + cmd_in_dir_qemu(platform, dir, "./x2t", ["-create-js-snapshots"], True) + return + cmd_in_dir(dir, "./x2t", ["-create-js-snapshots"], True) return diff --git a/scripts/deploy_builder.py b/scripts/deploy_builder.py index c2b020e..d20f903 100644 --- a/scripts/deploy_builder.py +++ b/scripts/deploy_builder.py @@ -125,7 +125,7 @@ def make(): base.mac_correct_rpath_x2t(root_dir) base.mac_correct_rpath_docbuilder(root_dir) - base.create_x2t_js_cache(root_dir, "builder") + base.create_x2t_js_cache(root_dir, "builder", platform) # delete unnecessary builder files def delete_files(files): @@ -138,6 +138,7 @@ def make(): if 0 != platform.find("mac"): delete_files(base.find_files(root_dir, "sdk-all.js")) delete_files(base.find_files(root_dir, "sdk-all-min.js")) + base.delete_dir(root_dir + "/sdkjs/slide/themes") return diff --git a/scripts/deploy_core.py b/scripts/deploy_core.py index cdd87cb..7350694 100644 --- a/scripts/deploy_core.py +++ b/scripts/deploy_core.py @@ -67,7 +67,7 @@ def make(): # js cache base.generate_doctrenderer_config(archive_dir + "/DoctRenderer.config", "./", "builder", "", "./dictionaries") - base.create_x2t_js_cache(archive_dir, "core") + base.create_x2t_js_cache(archive_dir, "core", platform) base.delete_file(archive_dir + "/DoctRenderer.config") # dictionaries diff --git a/scripts/deploy_desktop.py b/scripts/deploy_desktop.py index e42be6e..d97c546 100644 --- a/scripts/deploy_desktop.py +++ b/scripts/deploy_desktop.py @@ -261,7 +261,7 @@ def make(): if isUseJSC: base.delete_file(root_dir + "/converter/icudtl.dat") - base.create_x2t_js_cache(root_dir + "/converter", "desktop") + base.create_x2t_js_cache(root_dir + "/converter", "desktop", platform) if (0 == platform.find("win")): base.delete_file(root_dir + "/cef_sandbox.lib") diff --git a/scripts/deploy_server.py b/scripts/deploy_server.py index 796abb1..3ff8158 100644 --- a/scripts/deploy_server.py +++ b/scripts/deploy_server.py @@ -119,7 +119,7 @@ def make(): + glob.glob(js_dir + "/web-apps/apps/*/mobile/dist/js/*.js.map"): base.delete_file(file) - base.create_x2t_js_cache(converter_dir, "server") + base.create_x2t_js_cache(converter_dir, "server", platform) # add embed worker code base.cmd_in_dir(git_dir + "/sdkjs/common/embed", "python", ["make.py", js_dir + "/web-apps/apps/api/documents/api.js"]) From 6e871166348f478ca4444452dfcf5add054ec62b Mon Sep 17 00:00:00 2001 From: Oleg Korshul Date: Thu, 6 Mar 2025 13:56:55 +0300 Subject: [PATCH 2/5] Fix typo --- scripts/base.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/base.py b/scripts/base.py index d9ced24..9a0f94b 100644 --- a/scripts/base.py +++ b/scripts/base.py @@ -430,10 +430,10 @@ def cmd_in_dir(directory, prog, args=[], is_no_errors=False): def cmd_in_dir_qemu(platform, directory, prog, args=[], is_no_errors=False): if (platform == "linux_arm64"): - cmd_in_dir(directory, "qemu-aarch64", ["-L", "/usr/aarch64-linux-gnu", prog] + args, is_no_errors) + return cmd_in_dir(directory, "qemu-aarch64", ["-L", "/usr/aarch64-linux-gnu", prog] + args, is_no_errors) if (platform == "linux_arm32"): - cmd_in_dir(directory, "qemu-arm", ["-L", "/usr/arm-linux-gnueabi", prog] + args, is_no_errors) - return ret + return cmd_in_dir(directory, "qemu-arm", ["-L", "/usr/arm-linux-gnueabi", prog] + args, is_no_errors) + return 0 def cmd_and_return_cwd(prog, args=[], is_no_errors=False): cur_dir = os.getcwd() From de337559000ab0af26058101cb4f404773d7cc2d Mon Sep 17 00:00:00 2001 From: Oleg Korshul Date: Thu, 6 Mar 2025 15:06:49 +0300 Subject: [PATCH 3/5] Remove unused files --- scripts/deploy_builder.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/deploy_builder.py b/scripts/deploy_builder.py index d20f903..114d63f 100644 --- a/scripts/deploy_builder.py +++ b/scripts/deploy_builder.py @@ -139,6 +139,10 @@ def make(): delete_files(base.find_files(root_dir, "sdk-all.js")) delete_files(base.find_files(root_dir, "sdk-all-min.js")) base.delete_dir(root_dir + "/sdkjs/slide/themes") + base.delete_dir(root_dir + "/sdkjs/cell/css") + base.delete_file(root_dir + "/sdkjs/pdf/src/engine/viewer.js") + base.delete_file(root_dir + "/sdkjs/common/spell/spell/spell.js.mem") + base.delete_dir(root_dir + "/sdkjs/common/Images") return From cf90a5ce213965c992f4beb2c4a2d5667a1fecb8 Mon Sep 17 00:00:00 2001 From: Green Date: Wed, 12 Mar 2025 19:50:03 +0300 Subject: [PATCH 4/5] Added html 3dParty version control --- scripts/core_common/modules/html2.py | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/scripts/core_common/modules/html2.py b/scripts/core_common/modules/html2.py index 2e07111..d5cbc34 100644 --- a/scripts/core_common/modules/html2.py +++ b/scripts/core_common/modules/html2.py @@ -7,7 +7,27 @@ import base import os import subprocess +def clear_module(): + directories = ["gumbo-parser", "katana-parser"] + + for dir in directories: + if base.is_dir(dir): + base.delete_dir_with_access_error(dir) + def make(): + old_cur_dir = os.getcwd() + + print("[fetch]: html") + base_dir = base.get_script_dir() + "/../../core/Common/3dParty/html" + + os.chdir(base_dir) + base.check_module_version("2", clear_module) + os.chdir(old_cur_dir) + base.cmd_in_dir(base_dir, "python", ["fetch.py"]) return + +if __name__ == '__main__': + # manual compile + make() From b8e42184f8853ef134ad4b43a8a2d8456ea94d50 Mon Sep 17 00:00:00 2001 From: Igor Demin Date: Tue, 18 Mar 2025 15:54:05 +0500 Subject: [PATCH 5/5] Up version to 8.3.2 --- version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version b/version index 56b6be4..9246c4f 100644 --- a/version +++ b/version @@ -1 +1 @@ -8.3.1 +8.3.2 \ No newline at end of file