From bd167f6258e4197b428b223130cb3e537d560af0 Mon Sep 17 00:00:00 2001 From: Oleg Korshul Date: Sat, 16 Sep 2023 18:42:06 +0300 Subject: [PATCH] Add dictiories path to doctrenderer.config --- develop/run_build_js.py | 2 +- scripts/base.py | 5 ++++- scripts/deploy_builder.py | 5 ++++- scripts/deploy_desktop.py | 2 +- scripts/deploy_mobile.py | 2 +- scripts/deploy_server.py | 2 +- scripts/develop/config_server.py | 2 +- 7 files changed, 13 insertions(+), 7 deletions(-) diff --git a/develop/run_build_js.py b/develop/run_build_js.py index 1342144..3a18561 100644 --- a/develop/run_build_js.py +++ b/develop/run_build_js.py @@ -30,7 +30,7 @@ else: #Fix theme generation for external sdkjs volume if base.is_exist(git_dir + "/server/FileConverter/bin/DoctRenderer.config"): base.print_info('replace DoctRenderer.config for external sdkjs volume') - base.generate_doctrenderer_config(git_dir + "/server/FileConverter/bin/DoctRenderer.config", "../../../sdkjs/deploy/", "server", "../../../web-apps/vendor/") + base.generate_doctrenderer_config(git_dir + "/server/FileConverter/bin/DoctRenderer.config", "../../../sdkjs/deploy/", "server", "../../../web-apps/vendor/", "../../../dictionaries") base.print_info('replace supervisor cfg to run docservice and converter from pkg') base.replaceInFileRE("/etc/supervisor/conf.d/ds-docservice.conf", "command=node .*", "command=/var/www/onlyoffice/documentserver/server/DocService/docservice") diff --git a/scripts/base.py b/scripts/base.py index 437fa5c..e6a91ab 100644 --- a/scripts/base.py +++ b/scripts/base.py @@ -787,7 +787,7 @@ def app_make(): return "make" # doctrenderer.config -def generate_doctrenderer_config(path, root, product, vendor = ""): +def generate_doctrenderer_config(path, root, product, vendor = "", dictionaries = ""): content = "\n" content += ("" + root + "sdkjs/common/Native/native.js\n") @@ -806,6 +806,9 @@ def generate_doctrenderer_config(path, root, product, vendor = ""): content += ("" + vendor_dir + "xregexp/xregexp-all-min.js\n") content += ("" + root + "sdkjs\n") + if ("" != dictionaries): + content += ("" + dictionaries + "") + if (False): # old html file content += ("" + vendor_dir + "jquery/jquery.min.js\n") if ("desktop" == product): diff --git a/scripts/deploy_builder.py b/scripts/deploy_builder.py index e12c209..2abb227 100644 --- a/scripts/deploy_builder.py +++ b/scripts/deploy_builder.py @@ -79,9 +79,12 @@ def make(): # app base.copy_exe(core_build_dir + "/bin/" + platform_postfix, root_dir, "docbuilder") - base.generate_doctrenderer_config(root_dir + "/DoctRenderer.config", "./", "builder") + base.generate_doctrenderer_config(root_dir + "/DoctRenderer.config", "./", "builder", "", "./dictionaries") base.copy_dir(git_dir + "/document-templates/new/en-US", root_dir + "/empty") + # dictionaries + base.copy_dictionaries(git_dir + "/dictionaries", root_dir + "/dictionaries") + # js base.copy_dir(base_dir + "/js/" + branding + "/builder/sdkjs", root_dir + "/sdkjs") base.create_dir(root_dir + "/sdkjs/vendor") diff --git a/scripts/deploy_desktop.py b/scripts/deploy_desktop.py index aeed08d..e744844 100644 --- a/scripts/deploy_desktop.py +++ b/scripts/deploy_desktop.py @@ -126,7 +126,7 @@ def make(): base.copy_lib(build_libraries_path, root_dir + "/converter", "doctrenderer") base.copy_v8_files(core_dir, root_dir + "/converter", platform, isWindowsXP) - base.generate_doctrenderer_config(root_dir + "/converter/DoctRenderer.config", "../editors/", "desktop") + base.generate_doctrenderer_config(root_dir + "/converter/DoctRenderer.config", "../editors/", "desktop", "", "../dictionaries") base.copy_dir(git_dir + "/document-templates/new", root_dir + "/converter/empty") # dictionaries diff --git a/scripts/deploy_mobile.py b/scripts/deploy_mobile.py index a3b2ed5..c48e85b 100644 --- a/scripts/deploy_mobile.py +++ b/scripts/deploy_mobile.py @@ -113,7 +113,7 @@ def make(): deploy_fonts(git_dir, root_dir, "android") base.copy_dictionaries(git_dir + "/dictionaries", root_dir + "/dictionaries", True, False) # app - base.generate_doctrenderer_config(root_dir + "/DoctRenderer.config", "./", "builder") + base.generate_doctrenderer_config(root_dir + "/DoctRenderer.config", "./", "builder", "", "./dictionaries") libs_dir = root_dir + "/lib" base.create_dir(libs_dir + "/arm64-v8a") base.copy_files(base_dir + "/android_arm64_v8a/" + branding + "/mobile/*.so", libs_dir + "/arm64-v8a") diff --git a/scripts/deploy_server.py b/scripts/deploy_server.py index e34af2b..87510dc 100644 --- a/scripts/deploy_server.py +++ b/scripts/deploy_server.py @@ -89,7 +89,7 @@ def make(): #if (native_platform == "linux_64"): # base.generate_check_linux_system(git_dir + "/build_tools", converter_dir) - base.generate_doctrenderer_config(converter_dir + "/DoctRenderer.config", "../../../", "server") + base.generate_doctrenderer_config(converter_dir + "/DoctRenderer.config", "../../../", "server", "", "../../../dictionaries") # icu if (0 == platform.find("win")): diff --git a/scripts/develop/config_server.py b/scripts/develop/config_server.py index 8b1be27..784b178 100644 --- a/scripts/develop/config_server.py +++ b/scripts/develop/config_server.py @@ -61,7 +61,7 @@ def make(): print("Core is up to date. ---------------------------------------") print("-----------------------------------------------------------") - base.generate_doctrenderer_config("./DoctRenderer.config", "../../../sdkjs/deploy/", "server", "../../../web-apps/vendor/") + base.generate_doctrenderer_config("./DoctRenderer.config", "../../../sdkjs/deploy/", "server", "../../../web-apps/vendor/", "../../../dictionaries") if not base.is_dir(git_dir + "/sdkjs-plugins"): base.create_dir(git_dir + "/sdkjs-plugins")