From f8091afb69830c1d469a1b04bf8a2b8118888db9 Mon Sep 17 00:00:00 2001 From: Roman Demidov Date: Mon, 21 Jun 2021 11:52:41 +0300 Subject: [PATCH] Remove server version of spell checker (#337) * Remove server version of spell checker * Add changes * Add changes --- scripts/build_server.py | 1 - scripts/deploy_server.py | 16 +++++----------- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/scripts/build_server.py b/scripts/build_server.py index b084f8a9..58be7c29 100644 --- a/scripts/build_server.py +++ b/scripts/build_server.py @@ -52,7 +52,6 @@ def make(): base.cmd_in_dir(server_build_dir + "/DocService", "pkg", [".", "-t", pkg_target, "--options", "max_old_space_size=4096", "-o", "docservice"]) base.cmd_in_dir(server_build_dir + "/FileConverter", "pkg", [".", "-t", pkg_target, "-o", "converter"]) base.cmd_in_dir(server_build_dir + "/Metrics", "pkg", [".", "-t", pkg_target, "-o", "metrics"]) - base.cmd_in_dir(server_build_dir + "/SpellChecker", "pkg", [".", "-t", pkg_target, "-o", "spellchecker"]) example_dir = base.get_script_dir() + "/../../document-server-integration/web/documentserver-example/nodejs" base.delete_dir(example_dir + "/node_modules") diff --git a/scripts/deploy_server.py b/scripts/deploy_server.py index 779370f5..6418e1c6 100644 --- a/scripts/deploy_server.py +++ b/scripts/deploy_server.py @@ -32,7 +32,8 @@ def make(): continue root_dir = base_dir + ("/" + native_platform + "/" + branding + "/documentserver") - root_dir_snap = root_dir + '-snap' + root_dir_snap = root_dir + '-snap/var/www/onlyoffice/documentserver' + root_dir_snap_example = root_dir_snap + '-example' if (base.is_dir(root_dir)): base.delete_dir(root_dir) base.create_dir(root_dir) @@ -57,11 +58,6 @@ def make(): base.create_dir(build_server_dir + '/Metrics/node_modules/modern-syslog/build/Release') base.copy_file(bin_server_dir + "/Metrics/node_modules/modern-syslog/build/Release/core.node", build_server_dir + "/Metrics/node_modules/modern-syslog/build/Release/core.node") - base.create_dir(build_server_dir + '/SpellChecker') - base.copy_exe(bin_server_dir + "/SpellChecker", build_server_dir + '/SpellChecker', "spellchecker") - base.create_dir(build_server_dir + '/SpellChecker/node_modules/nodehun/build/Release') - base.copy_file(bin_server_dir + "/SpellChecker/node_modules/nodehun/build/Release/Nodehun.node", build_server_dir + '/SpellChecker/node_modules/nodehun/build/Release/Nodehun.node') - qt_dir = base.qt_setup(native_platform) platform = native_platform @@ -139,7 +135,7 @@ def make(): branding_dir = git_dir + '/' + config.option("branding") + '/server' #dictionaries - spellchecker_dictionaries = build_server_dir + '/SpellChecker/dictionaries' + spellchecker_dictionaries = build_server_dir + '/dictionaries' spellchecker_dictionaries_files = server_dir + '/../dictionaries/*_*' base.create_dir(spellchecker_dictionaries) base.copy_files(spellchecker_dictionaries_files, spellchecker_dictionaries) @@ -200,12 +196,10 @@ def make(): base.copy_dir(bin_server_dir + '/FileConverter/node_modules', root_dir_snap + '/server/FileConverter/node_modules') base.copy_dir(bin_server_dir + '/FileConverter/sources', root_dir_snap + '/server/FileConverter/sources') base.delete_file(root_dir_snap + '/server/FileConverter/converter') - base.copy_dir(bin_server_dir + '/SpellChecker/node_modules', root_dir_snap + '/server/SpellChecker/node_modules') - base.copy_dir(bin_server_dir + '/SpellChecker/sources', root_dir_snap + '/server/SpellChecker/sources') - base.delete_file(root_dir_snap + '/server/SpellChecker/spellchecker') base.copy_dir(bin_server_dir + '/Common/node_modules', root_dir_snap + '/server/Common/node_modules') base.copy_dir(bin_server_dir + '/Common/sources', root_dir_snap + '/server/Common/sources') - base.copy_dir(bin_example_dir + '/..', root_dir_snap + '/example') + base.create_dir(root_dir_snap_example) + base.copy_dir(bin_example_dir + '/..', root_dir_snap_example) base.delete_file(root_dir_snap + '/example/nodejs/example') return