Fix bug with MySQL

Dockerfile

@@ -11,4 +11,5 @@ RUN rm /usr/bin/python && ln -s /usr/bin/python2 /usr/bin/python
 ADD . /build_tools
 WORKDIR /build_tools
 
-CMD ["sh", "-c", "cd tools/linux && python3 ./automate.py"]
+CMD cd tools/linux && \
+    python3 ./automate.py

make.py

@@ -92,8 +92,6 @@ if config.check_option("module", "desktop"):
     config.extend_option("config", "updmodule")
     base.set_env("DESKTOP_URL_UPDATES_MAIN_CHANNEL", "https://download.onlyoffice.com/install/desktop/editors/windows/onlyoffice/appcast.json")
     base.set_env("DESKTOP_URL_UPDATES_DEV_CHANNEL", "https://download.onlyoffice.com/install/desktop/editors/windows/onlyoffice/appcastdev.json")
-    base.set_env("DESKTOP_URL_INSTALL_CHANNEL", "https://download.onlyoffice.com/install/desktop/editors/windows/distrib/onlyoffice/<file>")
-    base.set_env("DESKTOP_URL_INSTALL_DEV_CHANNEL", "https://download.onlyoffice.com/install/desktop/editors/windows/onlyoffice/onlineinstallerdev/<file>")
 
 # build
 build_sln.make()

make_package.py

@@ -45,6 +45,7 @@ common.branding = args.branding
 common.timestamp = utils.get_timestamp()
 common.workspace_dir = utils.get_abspath(utils.get_script_dir(__file__) + "/..")
 common.branding_dir = utils.get_abspath(common.workspace_dir + "/" + args.branding) if args.branding else common.workspace_dir
+common.deploy_data = utils.get_path(common.workspace_dir + "/deploy.txt")
 common.summary = []
 utils.log("os_family:     " + common.os_family)
 utils.log("platform:      " + str(common.platform))
@@ -73,14 +74,15 @@ import package_mobile
 
 # build
 utils.set_cwd(common.workspace_dir, verbose=True)
+utils.delete_file(common.deploy_data)
 if "core" in common.targets:
   package_core.make()
-if "closuremaps_sdkjs_opensource" in common.targets:
+if "closuremaps_opensource" in common.targets:
   package_core.deploy_closuremaps_sdkjs("opensource")
-if "closuremaps_sdkjs_commercial" in common.targets:
-  package_core.deploy_closuremaps_sdkjs("commercial")
-if "closuremaps_webapps" in common.targets:
   package_core.deploy_closuremaps_webapps("opensource")
+if "closuremaps_commercial" in common.targets:
+  package_core.deploy_closuremaps_sdkjs("commercial")
+  package_core.deploy_closuremaps_webapps("commercial")
 if "desktop" in common.targets:
   package_desktop.make()
 if "builder" in common.targets:
@@ -91,8 +93,6 @@ if "server_enterprise" in common.targets:
   package_server.make("enterprise")
 if "server_developer" in common.targets:
   package_server.make("developer")
-if "server_prerequisites" in common.targets:
-  package_server.make("prerequisites")
 if "mobile" in common.targets:
   package_mobile.make()
 

scripts/base.py

@@ -175,13 +175,6 @@ def find_file(path, pattern):
     for filename in fnmatch.filter(filenames, pattern):
       return os.path.join(root, filename)
 
-def find_files(path, pattern):
-  result = []
-  for root, dirnames, filenames in os.walk(path):
-    for filename in fnmatch.filter(filenames, pattern):
-      result.append(os.path.join(root, filename))
-  return result
-
 def create_dir(path):
   path2 = get_path(path)
   if not os.path.exists(path2):
@@ -377,7 +370,7 @@ def cmd(prog, args=[], is_no_errors=False):
   else:
     command = prog
     for arg in args:
-      command += (" \"" + arg.replace('\"', '\\\"') + "\"")
+      command += (" \"" + arg + "\"")
     ret = subprocess.call(command, stderr=subprocess.STDOUT, shell=True)
   if ret != 0 and True != is_no_errors:
     sys.exit("Error (" + prog + "): " + str(ret))
@@ -413,7 +406,7 @@ def cmd_exe(prog, args, is_no_errors=False):
   else:
     command = prog
     for arg in args:
-      command += (" \"" + arg.replace('\"', '\\\"') + "\"")
+      command += (" \"" + arg + "\"")
     process = subprocess.Popen(command, stderr=subprocess.STDOUT, shell=True, env=env_dir)
     ret = process.wait()
   if ret != 0 and True != is_no_errors:
@@ -570,12 +563,10 @@ def get_repositories():
   result.update(get_sdkjs_addons())
   result["onlyoffice.github.io"] = [False, False]
   result["web-apps"] = [False, False]
+  result.update(get_web_apps_addons())
   result["dictionaries"] = [False, False]
   result["core-fonts"] = [False, False]
 
-  if config.check_option("module", "server"):
-    result.update(get_web_apps_addons())
-
   if config.check_option("module", "builder"):
     result["document-templates"] = [False, False]
 
@@ -776,9 +767,8 @@ def qt_config(platform):
   if (-1 != platform.find("xp")):
     config_param += " build_xp"
   if ("ios" == platform):
-    if (config.check_option("bitcode", "yes")):
-      set_env("BITCODE_GENERATION_MODE", "bitcode")
-      set_env("ENABLE_BITCODE", "YES")
+    set_env("BITCODE_GENERATION_MODE", "bitcode")
+    set_env("ENABLE_BITCODE", "YES")
     config_param = config_param.replace("desktop", "")
     config_param += " iphoneos device"
     if (-1 == config_param_lower.find("debug")):
@@ -1226,19 +1216,18 @@ def mac_correct_rpath_x2t(dir):
   mac_correct_rpath_library("kernel", ["UnicodeConverter"])
   mac_correct_rpath_library("kernel_network", ["UnicodeConverter", "kernel"])
   mac_correct_rpath_library("graphics", ["UnicodeConverter", "kernel"])
-  mac_correct_rpath_library("doctrenderer", ["UnicodeConverter", "kernel", "kernel_network", "graphics", "PdfFile", "XpsFile", "DjVuFile", "DocxRenderer"])
+  mac_correct_rpath_library("doctrenderer", ["UnicodeConverter", "kernel", "kernel_network", "graphics"])
   mac_correct_rpath_library("HtmlFile2", ["UnicodeConverter", "kernel", "kernel_network", "graphics"])
   mac_correct_rpath_library("EpubFile", ["UnicodeConverter", "kernel", "HtmlFile2", "graphics"])
   mac_correct_rpath_library("Fb2File", ["UnicodeConverter", "kernel", "graphics"])
+  mac_correct_rpath_library("HtmlRenderer", ["UnicodeConverter", "kernel", "graphics"])
   mac_correct_rpath_library("PdfFile", ["UnicodeConverter", "kernel", "graphics", "kernel_network"])
   mac_correct_rpath_library("DjVuFile", ["UnicodeConverter", "kernel", "graphics", "PdfFile"])
   mac_correct_rpath_library("XpsFile", ["UnicodeConverter", "kernel", "graphics", "PdfFile"])
   mac_correct_rpath_library("DocxRenderer", ["UnicodeConverter", "kernel", "graphics"])
-  mac_correct_rpath_library("IWorkFile", ["UnicodeConverter", "kernel"])
-  mac_correct_rpath_library("HWPFile", ["UnicodeConverter", "kernel", "graphics"])
   cmd("chmod", ["-v", "+x", "./x2t"])
   cmd("install_name_tool", ["-add_rpath", "@executable_path", "./x2t"], True)
-  mac_correct_rpath_binary("./x2t", ["icudata.58", "icuuc.58", "UnicodeConverter", "kernel", "kernel_network", "graphics", "PdfFile", "XpsFile", "DjVuFile", "HtmlFile2", "Fb2File", "EpubFile", "doctrenderer", "DocxRenderer", "IWorkFile", "HWPFile"])
+  mac_correct_rpath_binary("./x2t", ["icudata.58", "icuuc.58", "UnicodeConverter", "kernel", "kernel_network", "graphics", "PdfFile", "HtmlRenderer", "XpsFile", "DjVuFile", "HtmlFile2", "Fb2File", "EpubFile", "doctrenderer", "DocxRenderer"])
   if is_file("./allfontsgen"):
     cmd("chmod", ["-v", "+x", "./allfontsgen"])
     cmd("install_name_tool", ["-add_rpath", "@executable_path", "./allfontsgen"], True)
@@ -1246,7 +1235,7 @@ def mac_correct_rpath_x2t(dir):
   if is_file("./allthemesgen"):
     cmd("chmod", ["-v", "+x", "./allthemesgen"])
     cmd("install_name_tool", ["-add_rpath", "@executable_path", "./allthemesgen"], True)
-    mac_correct_rpath_binary("./allthemesgen", ["icudata.58", "icuuc.58", "UnicodeConverter", "kernel", "graphics", "kernel_network", "doctrenderer", "PdfFile", "XpsFile", "DjVuFile", "DocxRenderer"])
+    mac_correct_rpath_binary("./allthemesgen", ["icudata.58", "icuuc.58", "UnicodeConverter", "kernel", "graphics", "kernel_network", "doctrenderer"])
   if is_file("./pluginsmanager"):
     cmd("chmod", ["-v", "+x", "./pluginsmanager"])
     cmd("install_name_tool", ["-add_rpath", "@executable_path", "./pluginsmanager"], True)
@@ -1263,14 +1252,14 @@ def mac_correct_rpath_docbuilder(dir):
   os.chdir(dir)
   cmd("chmod", ["-v", "+x", "./docbuilder"])
   cmd("install_name_tool", ["-add_rpath", "@executable_path", "./docbuilder"], True)
-  mac_correct_rpath_binary("./docbuilder", ["icudata.58", "icuuc.58", "UnicodeConverter", "kernel", "kernel_network", "graphics", "PdfFile", "XpsFile", "DjVuFile", "HtmlFile2", "Fb2File", "EpubFile", "IWorkFile", "HWPFile", "doctrenderer", "DocxRenderer"])  
-  mac_correct_rpath_library("docbuilder.c", ["icudata.58", "icuuc.58", "UnicodeConverter", "kernel", "kernel_network", "graphics", "doctrenderer", "PdfFile", "XpsFile", "DjVuFile", "DocxRenderer"])
+  mac_correct_rpath_binary("./docbuilder", ["icudata.58", "icuuc.58", "UnicodeConverter", "kernel", "kernel_network", "graphics", "PdfFile", "HtmlRenderer", "XpsFile", "DjVuFile", "HtmlFile2", "Fb2File", "EpubFile", "doctrenderer", "DocxRenderer"])  
+  mac_correct_rpath_library("docbuilder.c", ["icudata.58", "icuuc.58", "UnicodeConverter", "kernel", "kernel_network", "graphics", "doctrenderer"])
 
   def add_loader_path_to_rpath(libs):
     for lib in libs:
       cmd("install_name_tool", ["-add_rpath", "@loader_path", "lib" + lib + ".dylib"], True)
 
-  add_loader_path_to_rpath(["icuuc.58", "UnicodeConverter", "kernel", "kernel_network", "graphics", "doctrenderer", "PdfFile", "XpsFile", "DjVuFile", "DocxRenderer", "docbuilder.c"])
+  add_loader_path_to_rpath(["icuuc.58", "UnicodeConverter", "kernel", "kernel_network", "graphics", "doctrenderer", "docbuilder.c"])
   os.chdir(cur_dir)
   return
 
@@ -1280,9 +1269,9 @@ def mac_correct_rpath_desktop(dir):
   os.chdir(dir)
   mac_correct_rpath_library("hunspell", [])
   mac_correct_rpath_library("ooxmlsignature", ["kernel"])
-  mac_correct_rpath_library("ascdocumentscore", ["UnicodeConverter", "kernel", "graphics", "kernel_network", "PdfFile", "XpsFile", "DjVuFile", "hunspell", "ooxmlsignature"])
+  mac_correct_rpath_library("ascdocumentscore", ["UnicodeConverter", "kernel", "graphics", "kernel_network", "PdfFile", "HtmlRenderer", "XpsFile", "DjVuFile", "hunspell", "ooxmlsignature"])
   cmd("install_name_tool", ["-change", "@executable_path/../Frameworks/Chromium Embedded Framework.framework/Chromium Embedded Framework", "@rpath/Chromium Embedded Framework.framework/Chromium Embedded Framework", "libascdocumentscore.dylib"])
-  mac_correct_rpath_binary("./editors_helper.app/Contents/MacOS/editors_helper", ["ascdocumentscore", "UnicodeConverter", "kernel", "kernel_network", "graphics", "PdfFile", "XpsFile", "DjVuFile", "hunspell", "ooxmlsignature"])
+  mac_correct_rpath_binary("./editors_helper.app/Contents/MacOS/editors_helper", ["ascdocumentscore", "UnicodeConverter", "kernel", "kernel_network", "graphics", "PdfFile", "HtmlRenderer", "XpsFile", "DjVuFile", "hunspell", "ooxmlsignature"])
   cmd("install_name_tool", ["-add_rpath", "@executable_path/../../../../Frameworks", "./editors_helper.app/Contents/MacOS/editors_helper"], True)
   cmd("install_name_tool", ["-add_rpath", "@executable_path/../../../../Resources/converter", "./editors_helper.app/Contents/MacOS/editors_helper"], True)
   cmd("chmod", ["-v", "+x", "./editors_helper.app/Contents/MacOS/editors_helper"])
@@ -1316,7 +1305,7 @@ def linux_set_origin_rpath_libraries(dir, libs):
   return
 
 def linux_correct_rpath_docbuilder(dir):
-  linux_set_origin_rpath_libraries(dir, ["docbuilder.jni.so", "docbuilder.c.so", "icuuc.so.58", "doctrenderer.so", "graphics.so", "kernel.so", "kernel_network.so", "UnicodeConverter.so", "PdfFile.so", "XpsFile.so", "DjVuFile.so", "DocxRenderer.so"])
+  linux_set_origin_rpath_libraries(dir, ["docbuilder.jni.so", "docbuilder.c.so", "icuuc.so.58", "doctrenderer.so", "graphics.so", "kernel.so", "kernel_network.so", "UnicodeConverter.so"])
   return
 
 def common_check_version(name, good_version, clean_func):
@@ -1438,7 +1427,6 @@ def support_old_versions_plugins(out_dir):
 def generate_sdkjs_plugin_list(dst):
   plugins_list = config.option("sdkjs-plugin").rsplit(", ") \
                + config.option("sdkjs-plugin-server").rsplit(", ")
-  plugins_list = list(filter(None, plugins_list))
   with open(get_path(dst), 'w') as file:
     dump = json.dumps(sorted(plugins_list), indent=4)
     file.write(re.sub(r"^(\s{4})", '\t', dump, 0, re.MULTILINE))
@@ -1835,11 +1823,7 @@ def create_x2t_js_cache(dir, product):
   if is_file(dir + "/libdoctrenderer.dylib") and (os.path.getsize(dir + "/libdoctrenderer.dylib") < 5*1024*1024):
     return
 
+  if (product in ["builder", "server"]):
+    cmd_in_dir(dir, "./x2t", ["-create-js-cache"], True)
   cmd_in_dir(dir, "./x2t", ["-create-js-snapshots"], True)
   return
-
-def setup_local_qmake(dir_qmake):
-  dir_base = os.path.dirname(dir_qmake)
-  writeFile(dir_base + "/onlyoffice_qt.conf", "Prefix = " + dir_base)  
-  return
-  

scripts/build_js.py

@@ -41,7 +41,6 @@ def make():
   base.create_dir(out_dir)
 
   # builder
-  base.cmd_in_dir(base_dir + "/../web-apps/translation", "python", ["merge_and_check.py"])
   build_interface(base_dir + "/../web-apps/build")
   build_sdk_builder(base_dir + "/../sdkjs/build")
   base.create_dir(out_dir + "/builder")
@@ -169,7 +168,6 @@ def build_js_develop(root_dir):
   _run_npm(root_dir + external_folder + "/web-apps/build")
   _run_npm_ci(root_dir + external_folder + "/web-apps/build/sprites")
   _run_grunt(root_dir + external_folder + "/web-apps/build/sprites", [])
-  base.cmd_in_dir(root_dir + external_folder + "/web-apps/translation", "python", ["merge_and_check.py"])
 
   old_cur = os.getcwd()
   old_product_version = base.get_env("PRODUCT_VERSION")

scripts/build_sln.py

@@ -36,18 +36,16 @@ def make(solution=""):
 
   if config.check_option("module", "builder") and base.is_windows() and "onlyoffice" == config.branding():
     # check replace
-    directory_builder_branding = os.getcwd() + "/../core/DesktopEditor/doctrenderer"
-    if base.is_dir(directory_builder_branding):
-      new_replace_path = base.correctPathForBuilder(directory_builder_branding + "/docbuilder.com/src/docbuilder.h")
-      if ("2019" == config.option("vs-version")):
-        base.make_sln_project("../core/DesktopEditor/doctrenderer/docbuilder.com/src", "docbuilder.com_2019.sln")
-        if (True):
-          new_path_net = base.correctPathForBuilder(directory_builder_branding + "/docbuilder.net/src/docbuilder.net.cpp")
-          base.make_sln_project("../core/DesktopEditor/doctrenderer/docbuilder.net/src", "docbuilder.net.sln")
-          base.restorePathForBuilder(new_path_net)
-      else:
-        base.make_sln_project("../core/DesktopEditor/doctrenderer/docbuilder.com/src", "docbuilder.com.sln")
-      base.restorePathForBuilder(new_replace_path)
+    new_replace_path = base.correctPathForBuilder(os.getcwd() + "/../core/DesktopEditor/doctrenderer/docbuilder.com/src/docbuilder.h")
+    if ("2019" == config.option("vs-version")):
+      base.make_sln_project("../core/DesktopEditor/doctrenderer/docbuilder.com/src", "docbuilder.com_2019.sln")
+      if (True):
+        new_path_net = base.correctPathForBuilder(os.getcwd() + "/../core/DesktopEditor/doctrenderer/docbuilder.net/src/docbuilder.net.cpp")
+        base.make_sln_project("../core/DesktopEditor/doctrenderer/docbuilder.net/src", "docbuilder.net.sln")
+        base.restorePathForBuilder(new_path_net)
+    else:
+      base.make_sln_project("../core/DesktopEditor/doctrenderer/docbuilder.com/src", "docbuilder.com.sln")
+    base.restorePathForBuilder(new_replace_path)
 
   # build Java docbuilder wrapper
   if config.check_option("module", "builder") and "onlyoffice" == config.branding():

scripts/core_common/make_common.py

@@ -16,7 +16,6 @@ import curl
 import websocket_all
 import v8
 import html2
-import iwork
 import hunspell
 import glew
 import harfbuzz
@@ -43,7 +42,6 @@ def make():
   openssl.make()
   v8.make()
   html2.make()
-  iwork.make(False)
   hunspell.make(False)
   harfbuzz.make()
   glew.make()

scripts/core_common/modules/hunspell.py

@@ -3,11 +3,6 @@ sys.path.append('../../../scripts')
 import base
 import os
 
-def clean():
-  if base.is_dir("hunspell"):
-    base.delete_dir_with_access_error("hunspell")
-  return
-
 def make(build_js = True):
 
   old_cur_dir = os.getcwd()
@@ -16,8 +11,6 @@ def make(build_js = True):
   core_common_dir = base.get_script_dir() + "/../../core/Common"
 
   os.chdir(core_common_dir + "/3dParty/hunspell")
-
-  base.common_check_version("hunspell", "1", clean)
   base.cmd("python", ["./before.py"])
 
   if (build_js):

scripts/core_common/modules/iwork.py

@@ -1,38 +0,0 @@
-#!/usr/bin/env python
-
-import sys
-sys.path.append('../..')
-import config
-import base
-import os
-import subprocess
-
-def clear_module():
-  directories = ["glm", "libetonyek", "libodfgen", "librevenge", "mdds"]
-
-  for dir in directories:
-    if base.is_dir(dir):
-      base.delete_dir_with_access_error(dir)
-
-def make(use_gperf = True):
-  old_cur_dir = os.getcwd()
-
-  print("[fetch & build]: iwork")
-
-  base_dir = base.get_script_dir() + "/../../core/Common/3dParty/apple"
-  
-  os.chdir(base_dir)
-  base.check_module_version("3", clear_module)
-  os.chdir(old_cur_dir)
-
-  cmd_args = ["fetch.py"]
-
-  if use_gperf:
-    cmd_args.append("--gperf")
-
-  base.cmd_in_dir(base_dir, "python", cmd_args)
-  return
-
-if __name__ == '__main__':
-  # manual compile
-  make(False)

scripts/core_common/modules/v8.py

@@ -119,7 +119,7 @@ def make():
     # windows hack (delete later) ----------------------
     if ("windows" == base.host_platform()):
       base.delete_dir_with_access_error("v8/buildtools/win")
-      base.cmd("git", ["config", "--system", "core.longpaths", "true"], True)
+      base.cmd("git", ["config", "--system", "core.longpaths", "true"])
       base.cmd("gclient", ["sync", "--force"], True)
     else:
       base.cmd("gclient", ["sync"], True) 
@@ -246,7 +246,7 @@ def make_xp():
     base.cmd("./depot_tools/fetch", ["v8"], True)
     base.cmd("./depot_tools/gclient", ["sync", "-r", "4.10.253"], True)
     base.delete_dir_with_access_error("v8/buildtools/win")
-    base.cmd("git", ["config", "--system", "core.longpaths", "true"], True)
+    base.cmd("git", ["config", "--system", "core.longpaths", "true"])
     base.cmd("gclient", ["sync", "--force"], True)
 
   # save common py script

scripts/core_common/modules/v8_89.py

@@ -21,9 +21,6 @@ def change_bootstrap():
   content += "@Subdir git\n"
   content += "infra/3pp/tools/git/${platform} version:2@2.41.0.chromium.11\n"
 
-  base.replaceInFile("./depot_tools/bootstrap/bootstrap.py", 
-    "raise subprocess.CalledProcessError(proc.returncode, argv, None)", "return")
-  
   base.writeFile("./depot_tools/bootstrap/manifest.txt", content)
   return
 
@@ -108,9 +105,6 @@ def make():
   if not base.is_dir(base_dir):
     base.create_dir(base_dir)
 
-  if ("mac" == base.host_platform()):
-    base.cmd("git", ["config", "--global", "http.postBuffer", "157286400"], True)
-
   os.chdir(base_dir)
   if not base.is_dir("depot_tools"):
     base.cmd("git", ["clone", "https://chromium.googlesource.com/chromium/tools/depot_tools.git"])
@@ -127,7 +121,7 @@ def make():
     base.copy_dir("./v8/third_party", "./v8/third_party_new")
     if ("windows" == base.host_platform()):
       os.chdir("v8")
-      base.cmd("git", ["config", "--system", "core.longpaths", "true"], True)
+      base.cmd("git", ["config", "--system", "core.longpaths", "true"])
       os.chdir("../")
     v8_branch_version = "remotes/branch-heads/8.9"
     if ("mac" == base.host_platform()):
@@ -143,11 +137,6 @@ def make():
   else:
     base.replaceInFile("depot_tools/gclient_paths.py", "@functools.lru_cache", "")
 
-  if ("mac" == base.host_platform()):
-    if not base.is_file("v8/build/config/compiler/BUILD.gn.bak"):
-      base.copy_file("v8/build/config/compiler/BUILD.gn", "v8/build/config/compiler/BUILD.gn.bak")
-      base.replaceInFile("v8/build/config/compiler/BUILD.gn", "\"-Wloop-analysis\",", "\"-Wloop-analysis\", \"-D_Float16=short\",")
-
   if not base.is_file("v8/third_party/jinja2/tests.py.bak"):
     base.copy_file("v8/third_party/jinja2/tests.py", "v8/third_party/jinja2/tests.py.bak")
     base.replaceInFile("v8/third_party/jinja2/tests.py", "from collections import Mapping", "try:\n    from collections.abc import Mapping\nexcept ImportError:\n    from collections import Mapping")

scripts/deploy_builder.py

@@ -40,10 +40,9 @@ def make():
     base.copy_lib(core_build_dir + "/lib/" + platform_postfix, root_dir, "DjVuFile")
     base.copy_lib(core_build_dir + "/lib/" + platform_postfix, root_dir, "XpsFile")
     base.copy_lib(core_build_dir + "/lib/" + platform_postfix, root_dir, "HtmlFile2")
+    base.copy_lib(core_build_dir + "/lib/" + platform_postfix, root_dir, "HtmlRenderer")
     base.copy_lib(core_build_dir + "/lib/" + platform_postfix, root_dir, "Fb2File")
     base.copy_lib(core_build_dir + "/lib/" + platform_postfix, root_dir, "EpubFile")
-    base.copy_lib(core_build_dir + "/lib/" + platform_postfix, root_dir, "IWorkFile")
-    base.copy_lib(core_build_dir + "/lib/" + platform_postfix, root_dir, "HWPFile")
     base.copy_lib(core_build_dir + "/lib/" + platform_postfix, root_dir, "DocxRenderer")
     base.copy_file(git_dir + "/sdkjs/pdf/src/engine/cmap.bin", root_dir + "/cmap.bin")
 
@@ -127,17 +126,5 @@ def make():
 
     base.create_x2t_js_cache(root_dir, "builder")
   
-    # delete unnecessary builder files
-    def delete_files(files):
-      for file in files:
-        base.delete_file(file)
-    
-    delete_files(base.find_files(root_dir, "*.wasm"))
-    delete_files(base.find_files(root_dir, "*_ie.js"))
-    base.delete_file(root_dir + "/sdkjs/pdf/src/engine/cmap.bin")
-    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"))
-
   return
 

scripts/deploy_core.py

@@ -30,6 +30,7 @@ def make():
     base.copy_lib(core_build_dir + "/lib/" + platform_postfix, archive_dir, "kernel_network")
     base.copy_lib(core_build_dir + "/lib/" + platform_postfix, archive_dir, "graphics")
     base.copy_lib(core_build_dir + "/lib/" + platform_postfix, archive_dir, "doctrenderer")
+    base.copy_lib(core_build_dir + "/lib/" + platform_postfix, archive_dir, "HtmlRenderer")
     base.copy_lib(core_build_dir + "/lib/" + platform_postfix, archive_dir, "DjVuFile")
     base.copy_lib(core_build_dir + "/lib/" + platform_postfix, archive_dir, "XpsFile")
     base.copy_lib(core_build_dir + "/lib/" + platform_postfix, archive_dir, "PdfFile")
@@ -37,8 +38,6 @@ def make():
     base.copy_lib(core_build_dir + "/lib/" + platform_postfix, archive_dir, "UnicodeConverter")
     base.copy_lib(core_build_dir + "/lib/" + platform_postfix, archive_dir, "Fb2File")
     base.copy_lib(core_build_dir + "/lib/" + platform_postfix, archive_dir, "EpubFile")
-    base.copy_lib(core_build_dir + "/lib/" + platform_postfix, archive_dir, "IWorkFile")
-    base.copy_lib(core_build_dir + "/lib/" + platform_postfix, archive_dir, "HWPFile")
     base.copy_lib(core_build_dir + "/lib/" + platform_postfix, archive_dir, "DocxRenderer")
     base.copy_lib(core_build_dir + "/lib/" + platform_postfix, archive_dir, "hunspell")
     base.copy_file(git_dir + "/sdkjs/pdf/src/engine/cmap.bin", archive_dir + "/cmap.bin")

scripts/deploy_desktop.py

@@ -66,10 +66,9 @@ def make():
     base.copy_lib(build_libraries_path, root_dir + "/converter", "DjVuFile")
     base.copy_lib(build_libraries_path, root_dir + "/converter", "XpsFile")
     base.copy_lib(build_libraries_path, root_dir + "/converter", "HtmlFile2")
+    base.copy_lib(build_libraries_path, root_dir + "/converter", "HtmlRenderer")
     base.copy_lib(build_libraries_path, root_dir + "/converter", "Fb2File")
     base.copy_lib(build_libraries_path, root_dir + "/converter", "EpubFile")
-    base.copy_lib(build_libraries_path, root_dir + "/converter", "IWorkFile")
-    base.copy_lib(build_libraries_path, root_dir + "/converter", "HWPFile")
     base.copy_lib(build_libraries_path, root_dir + "/converter", "DocxRenderer")
     
     if ("ios" == platform):
@@ -103,7 +102,6 @@ def make():
 
     base.generate_doctrenderer_config(root_dir + "/converter/DoctRenderer.config", "../editors/", "desktop", "", "../dictionaries")
     base.copy_dir(git_dir + "/document-templates/new", root_dir + "/converter/empty")
-    base.copy_dir(git_dir + "/desktop-apps/common/templates", root_dir + "/converter/templates")
 
     # dictionaries
     base.copy_dictionaries(git_dir + "/dictionaries", root_dir + "/dictionaries")
@@ -184,7 +182,6 @@ def make():
         base.copy_file(git_dir + "/desktop-apps/win-linux/extras/projicons/" + apps_postfix + "/projicons.exe", root_dir + "/DesktopEditors.exe")
         if not isWindowsXP:
           base.copy_file(git_dir + "/desktop-apps/win-linux/extras/update-daemon/" + apps_postfix + "/updatesvc.exe", root_dir + "/updatesvc.exe")
-          base.copy_file(git_dir + "/desktop-apps/win-linux/extras/online-installer/" + apps_postfix + "/online-installer.exe", root_dir + "/online-installer.exe")
         base.copy_file(git_dir + "/desktop-apps/win-linux/" + apps_postfix + "/DesktopEditors.exe", root_dir + "/editors.exe")
         base.copy_file(git_dir + "/desktop-apps/win-linux/res/icons/desktopeditors.ico", root_dir + "/app.ico")
       elif (0 == platform.find("linux")):

scripts/deploy_mobile.py

@@ -58,11 +58,10 @@ def make():
     base.copy_lib(core_build_dir + "/lib/" + platform_postfix, root_dir, "DjVuFile")
     base.copy_lib(core_build_dir + "/lib/" + platform_postfix, root_dir, "XpsFile")
     base.copy_lib(core_build_dir + "/lib/" + platform_postfix, root_dir, "HtmlFile2")
+    base.copy_lib(core_build_dir + "/lib/" + platform_postfix, root_dir, "HtmlRenderer")
     base.copy_lib(core_build_dir + "/lib/" + platform_postfix, root_dir, "doctrenderer")
     base.copy_lib(core_build_dir + "/lib/" + platform_postfix, root_dir, "Fb2File")
     base.copy_lib(core_build_dir + "/lib/" + platform_postfix, root_dir, "EpubFile")
-    base.copy_lib(core_build_dir + "/lib/" + platform_postfix, root_dir, "IWorkFile")
-    base.copy_lib(core_build_dir + "/lib/" + platform_postfix, root_dir, "HWPFile")
     base.copy_lib(core_build_dir + "/lib/" + platform_postfix, root_dir, "DocxRenderer")
     base.copy_file(git_dir + "/sdkjs/pdf/src/engine/cmap.bin", root_dir + "/cmap.bin")
 

scripts/deploy_server.py

@@ -78,11 +78,10 @@ def make():
     base.copy_lib(core_build_dir + "/lib/" + platform_postfix, converter_dir, "DjVuFile")
     base.copy_lib(core_build_dir + "/lib/" + platform_postfix, converter_dir, "XpsFile")
     base.copy_lib(core_build_dir + "/lib/" + platform_postfix, converter_dir, "HtmlFile2")
+    base.copy_lib(core_build_dir + "/lib/" + platform_postfix, converter_dir, "HtmlRenderer")
     base.copy_lib(core_build_dir + "/lib/" + platform_postfix, converter_dir, "doctrenderer")
     base.copy_lib(core_build_dir + "/lib/" + platform_postfix, converter_dir, "Fb2File")
     base.copy_lib(core_build_dir + "/lib/" + platform_postfix, converter_dir, "EpubFile")
-    base.copy_lib(core_build_dir + "/lib/" + platform_postfix, converter_dir, "IWorkFile")
-    base.copy_lib(core_build_dir + "/lib/" + platform_postfix, converter_dir, "HWPFile")
     base.copy_lib(core_build_dir + "/lib/" + platform_postfix, converter_dir, "DocxRenderer")
     base.copy_file(git_dir + "/sdkjs/pdf/src/engine/cmap.bin", converter_dir + "/cmap.bin")
     base.copy_exe(core_build_dir + "/bin/" + platform_postfix, converter_dir, "x2t")
@@ -115,6 +114,7 @@ def make():
     js_dir = root_dir
     base.copy_dir(base_dir + "/js/" + branding + "/builder/sdkjs", js_dir + "/sdkjs")
     base.copy_dir(base_dir + "/js/" + branding + "/builder/web-apps", js_dir + "/web-apps")
+    base.copy_file(js_dir + "/web-apps/apps/api/documents/api.js", js_dir + "/web-apps/apps/api/documents/api.js.tpl")
     for file in glob.glob(js_dir + "/web-apps/apps/*/*/*.js.map") \
               + glob.glob(js_dir + "/web-apps/apps/*/mobile/dist/js/*.js.map"):
       base.delete_file(file)

scripts/develop/dependence.py

@@ -904,7 +904,16 @@ def install_gruntcli():
 
 def install_mysqlserver():
   if (host_platform == 'windows'):
-    return os.system('"' + os.environ['ProgramFiles(x86)'] + '\\MySQL\\MySQL Installer for Windows\\MySQLInstallerConsole" community install server;' + install_params['MySQLServer']['version'] + ';x64:*:type=config;openfirewall=true;generallog=true;binlog=true;serverid=' + config.option("db-port") + 'enable_tcpip=true;port=' + config.option("db-port") + ';rootpasswd=' + config.option("db-pass") + ' -silent')
+    program_files = os.environ["ProgramFiles(x86)"]
+    mysql_installer_path = f"\"{program_files}\MySQL\MySQL Installer for Windows\MySQLInstallerConsole.exe\""
+    mysql_installer_params = " community install server;"
+    mysql_installer_params += "8.0.21" + ";"
+    mysql_installer_params += "x64:*:type=config;openfirewall=true;generallog=true;binlog=true;serverid="
+    mysql_installer_params += "3306" + ';'
+    mysql_installer_params += "enable_tcpip=true;port=" + "3306" + ";"
+    mysql_installer_params += "rootpasswd=" + "onlyoffice"
+    mysql_installer_params += " -silent"
+    base.cmd2(mysql_installer_path, [mysql_installer_params])
   elif (host_platform == 'linux'):
     os.system('sudo kill ' + base.run_command('sudo fuser -vn tcp ' + config.option("db-port"))['stdout'])
     code = os.system('sudo ufw enable && sudo ufw allow 22 && sudo ufw allow 3306')

scripts/license_checker/config.json

@@ -21,15 +21,14 @@
 				"core/DesktopEditor/raster/JBig2",
 				"core/DesktopEditor/raster/Jp2",
 				"core/DesktopEditor/xml/libxml2",
-				"core/DesktopEditor/xmlsec",
+				"core/DesktopEditor/xmlsec",		
 				"core/DjVuFile/libdjvu",
 				"core/DjVuFile/wasm",
 				"core/EpubFile",
 				"core/OOXML/PPTXFormat/Limit/pri",
 				"core/Fb2File",
 				"core/HtmlFile2",
-				"core/Apple",
-				"core/HwpFile",
+				"core/HtmlFile2",
 				"core/OdfFile/Common/utf8cpp",
 				"core/OfficeUtils/js/emsdk",
 				"core/OfficeUtils/src/zlib-1.2.11",

scripts/package_builder.py

@@ -27,6 +27,7 @@ def s3_upload(files, dst):
     key = dst + utils.get_basename(f) if dst.endswith("/") else dst
     upload = utils.s3_upload(f, "s3://" + branding.s3_bucket + "/" + key)
     if upload:
+      utils.add_deploy_data(key)
       utils.log("URL: " + branding.s3_base_url + "/" + key)
     ret &= upload
   return ret
@@ -53,6 +54,7 @@ def make_archive():
   utils.set_summary("builder archive deploy", ret)
   if ret:
     utils.log("URL: " + branding.s3_base_url + "/" + dest_version)
+    utils.add_deploy_data(dest_version)
     utils.s3_copy(
       "s3://" + branding.s3_bucket + "/" + dest_version,
       "s3://" + branding.s3_bucket + "/" + dest_latest)
@@ -62,79 +64,76 @@ def make_archive():
   return
 
 def make_windows():
-  global package_version, arch
+  global inno_file, zip_file, suffix, key_prefix
   utils.set_cwd("document-builder-package")
 
+  prefix = common.platformPrefixes[common.platform]
+  company = branding.company_name
+  product = branding.builder_product_name.replace(" ","")
+  source_dir = "..\\build_tools\\out\\%s\\%s\\%s" % (prefix, company, product)
+  package_name = company + "-" + product
   package_version = common.version + "." + common.build
-  arch = {
+  suffix = {
     "windows_x64": "x64",
     "windows_x86": "x86"
   }[common.platform]
+  zip_file = "%s-%s-%s-%s.zip" % (company, product, package_version, suffix)
+  inno_file = "%s-%s-%s-%s.exe" % (company, product, package_version, suffix)
 
   if common.clean:
     utils.log_h2("builder clean")
     utils.delete_dir("build")
-    utils.delete_files("exe\\*.exe")
-    utils.delete_files("zip\\*.msi")
 
-  if make_prepare():
-    make_zip()
-    make_inno()
-  else:
-    utils.set_summary("builder zip build", False)
-    utils.set_summary("builder inno build", False)
+  utils.log_h2("copy arifacts")
+  utils.create_dir("build\\app")
+  utils.copy_dir_content(source_dir, "build\\app\\")
+
+  make_zip()
+  make_inno()
 
   utils.set_cwd(common.workspace_dir)
   return
 
-def make_prepare():
-  args = [
-    "-Version", package_version,
-    "-Arch", arch
-  ]
-  if common.sign:
-    args += ["-Sign"]
-
-  utils.log_h2("builder prepare")
-  ret = utils.ps1("make.ps1", args, verbose=True)
-  utils.set_summary("builder prepare", ret)
-  return ret
-
 def make_zip():
-  args = [
-    "-Version", package_version,
-    "-Arch", arch
-  ]
-  # if common.sign:
-  #   args += ["-Sign"]
-
   utils.log_h2("builder zip build")
-  ret = utils.ps1("make_zip.ps1", args, verbose=True)
+  utils.log_h3(zip_file)
+
+  ret = utils.cmd("7z", "a", "-y", zip_file, ".\\app\\*",
+      chdir="build", creates="build\\" + zip_file, verbose=True)
   utils.set_summary("builder zip build", ret)
 
   if common.deploy and ret:
     utils.log_h2("builder zip deploy")
-    ret = s3_upload(utils.glob_path("zip/*.zip"), "builder/win/generic/")
+    ret = s3_upload(["build\\" + zip_file], "builder/win/generic/")
     utils.set_summary("builder zip deploy", ret)
   return
 
 def make_inno():
+  utils.log_h2("builder inno build")
+  utils.log_h3(inno_file)
+
   args = [
-    "-Version", package_version,
-    "-Arch", arch
+    "-Arch", suffix,
+    "-Version", common.version,
+    "-Build", common.build
   ]
   if not branding.onlyoffice:
-    args += ["-Branding", common.branding]
+    args += [
+      "-Branding", "%s\\%s\\document-builder-package\\exe" % (common.workspace_dir, common.branding)
+    ]
   if common.sign:
-    args += ["-Sign"]
-
-  utils.log_h2("builder inno build")
-  ret = utils.ps1("make_inno.ps1", args, verbose=True)
+    args += [
+      "-Sign",
+      "-CertName", branding.cert_name
+    ]
+  ret = utils.ps1(
+      "make_inno.ps1", args, creates="build\\" + inno_file, verbose=True
+  )
   utils.set_summary("builder inno build", ret)
 
   if common.deploy and ret:
     utils.log_h2("builder inno deploy")
-    ret = s3_upload(utils.glob_path("exe/*.exe"), "builder/win/inno/")
+    ret = s3_upload(["build\\" + inno_file], "builder/win/inno/")
     utils.set_summary("builder inno deploy", ret)
   return
 

scripts/package_core.py

@@ -35,6 +35,7 @@ def make_archive():
   utils.set_summary("core archive deploy", ret)
   if ret:
     utils.log("URL: " + branding.s3_base_url + "/" + dest_version)
+    utils.add_deploy_data(dest_version)
     utils.s3_copy(
       "s3://" + branding.s3_bucket + "/" + dest_version,
       "s3://" + branding.s3_bucket + "/" + dest_latest)
@@ -64,6 +65,7 @@ def deploy_closuremaps_sdkjs(license):
     ret &= upload
     if upload:
       utils.log("URL: " + branding.s3_base_url + "/" + key)
+      utils.add_deploy_data(key)
   utils.set_summary("sdkjs closure maps %s deploy" % license, ret)
   return
 
@@ -89,5 +91,6 @@ def deploy_closuremaps_webapps(license):
     ret &= upload
     if upload:
       utils.log("URL: " + branding.s3_base_url + "/" + key)
+      utils.add_deploy_data(key)
   utils.set_summary("web-apps closure maps %s deploy" % license, ret)
   return

scripts/package_desktop.py

@@ -26,6 +26,7 @@ def s3_upload(files, dst):
     key = dst + utils.get_basename(f) if dst.endswith("/") else dst
     upload = utils.s3_upload(f, "s3://" + branding.s3_bucket + "/" + key)
     if upload:
+      utils.add_deploy_data(key)
       utils.log("URL: " + branding.s3_base_url + "/" + key)
     ret &= upload
   return ret
@@ -63,7 +64,6 @@ def make_windows():
   make_zip()
   make_inno()
   make_advinst()
-  make_online()
 
   utils.set_cwd(common.workspace_dir)
   return
@@ -154,6 +154,17 @@ def make_inno():
     else:
       ret = False
     utils.set_summary("desktop inno update deploy", ret)
+
+  changes_dir = common.workspace_dir + "\\" \
+    + utils.get_path(branding.desktop_changes_dir) + "\\" + common.version
+  if common.platform == "windows_x64" and \
+     common.deploy and \
+     utils.glob_path(changes_dir + "\\*.html"):
+    utils.log_h2("desktop changelog deploy")
+    ret = s3_upload(
+      utils.glob_path(changes_dir + "\\*.html"),
+      "desktop/win/update/%s/%s/" % (common.version, common.build))
+    utils.set_summary("desktop changelog deploy", ret)
   return
 
 def make_advinst():
@@ -177,19 +188,6 @@ def make_advinst():
     utils.set_summary("desktop advinst deploy", ret)
   return
 
-def make_online():
-  if not common.platform in ["windows_x64", "windows_x86"]:
-    return
-  online_file = "%s-%s-%s.exe" % ("OnlineInstaller", package_version, suffix)
-  ret = utils.is_file(online_file)
-  utils.set_summary("desktop online installer build", ret)
-
-  if common.deploy and ret:
-    utils.log_h2("desktop online installer deploy")
-    ret = s3_upload([online_file], "desktop/win/online/")
-    utils.set_summary("desktop online installer deploy", ret)
-  return
-
 #
 # macOS
 #
@@ -296,17 +294,11 @@ def make_sparkle_updates():
   macos_zip = "build/" + zip_filename + ".zip"
   utils.create_dir(updates_dir)
   utils.copy_file(macos_zip, updates_dir)
-  utils.sh(
-    "ls -1t " + released_updates_dir + "/*.zip" \
-      + " | head -n 3" \
-      + " | while read f; do cp -fv \"$f\" " + updates_dir + "/; done",
-    verbose=True)
+  utils.copy_dir_content(released_updates_dir, updates_dir, ".zip")
 
-  for ext in [".html", ".ru.html"]:
-    changes_src = changes_dir + "/" + common.version + "/changes" + ext
-    changes_dst = updates_dir + "/" + zip_filename + ext
-    if not utils.copy_file(changes_src, changes_dst):
-      utils.write_file(changes_dst, "<!DOCTYPE html>placeholder")
+  for file in utils.glob_path(changes_dir + "/" + common.version + "/*.html"):
+    filename = utils.get_basename(file).replace("changes", zip_filename)
+    utils.copy_file(file, updates_dir + "/" + filename)
 
   sparkle_base_url = "%s/%s/updates/" % (branding.sparkle_base_url, suffix)
   ret = utils.sh(

scripts/package_mobile.py

@@ -31,6 +31,7 @@ def make_mobile():
       key = "mobile/android/" + zip_file
       ret = utils.s3_upload(zip_file, "s3://" + branding.s3_bucket + "/" + key)
       if ret:
+        utils.add_deploy_data(key)
         utils.log("URL: " + branding.s3_base_url + "/" + key)
     utils.set_summary("mobile deploy", ret)
 

scripts/package_server.py

@@ -21,6 +21,7 @@ def s3_upload(files, dst):
     key = dst + utils.get_basename(f) if dst.endswith("/") else dst
     upload = utils.s3_upload(f, "s3://" + branding.s3_bucket + "/" + key)
     if upload:
+      utils.add_deploy_data(key)
       utils.log("URL: " + branding.s3_base_url + "/" + key)
     ret &= upload
   return ret
@@ -36,13 +37,10 @@ def make_windows(edition):
 
   utils.log_h2("server " + edition + " build")
   ret = utils.cmd("make", "clean", verbose=True)
-  if edition == "prerequisites":
-    make_args = ["exe-pr"]
-  else:
-    make_args = ["exe", "-e", "PRODUCT_NAME=" + product_name]
+  args = ["-e", "PRODUCT_NAME=" + product_name]
   if not branding.onlyoffice:
-    make_args += ["-e", "BRANDING_DIR=../" + common.branding + "/document-server-package"]
-  ret &= utils.cmd("make", *make_args, verbose=True)
+    args += ["-e", "BRANDING_DIR=../" + common.branding + "/document-server-package"]
+  ret &= utils.cmd("make", "packages", *args, verbose=True)
   utils.set_summary("server " + edition + " build", ret)
 
   if common.deploy and ret:

scripts/package_utils.py

@@ -266,6 +266,11 @@ def set_summary(target, status):
   common.summary.append({target: status})
   return
 
+def add_deploy_data(key):
+  with open(common.deploy_data, 'a+') as f:
+    f.write(key + "\n")
+  return
+
 def cmd(*args, **kwargs):
   if kwargs.get("verbose"):
     log("- cmd:")

scripts/qmake.py

@@ -93,9 +93,6 @@ def make(platform, project, qmake_config_addon="", is_no_errors=False):
   qmake_app = qt_dir + "/bin/qmake"
   # non windows platform
   if not base.is_windows():
-    if base.is_file(qt_dir + "/onlyoffice_qt.conf"):
-      build_params.append("-qtconf")
-      build_params.append(qt_dir + "/onlyoffice_qt.conf")
     base.cmd(qmake_app, build_params)
     base.correct_makefile_after_qmake(platform, makefile)
     if ("1" == config.option("clean")):

scripts/sdkjs_common/jsdoc/generate_docs_plugins_json.py

@@ -27,36 +27,24 @@ def generate(output_dir, md=False):
         print(f"Generating {editor_name}.json: {command}")
         subprocess.run(command, shell=True)
 
-    common_doclets_file = os.path.join(output_dir, 'common.json')
-    with open(common_doclets_file, 'r', encoding='utf-8') as f:
-        common_doclets_json = json.dumps(json.load(f))
-    os.remove(common_doclets_file)
-    
     # Append examples to JSON documentation
     for config in configs:
-        if (config.find('common') != -1):
-            continue
-        
         editor_name = config.split('/')[-1].replace('.json', '')
-        example_folder_name = editor_name # name of folder with examples
         output_file = os.path.join(output_dir, editor_name + ".json")
         
         # Read the JSON file
         with open(output_file, 'r', encoding='utf-8') as f:
             data = json.load(f)
-            start_common_doclet_idx = len(data)
-            data += json.loads(common_doclets_json)
         
         # Modify JSON data
-        for idx, doclet in enumerate(data):
-            if idx == start_common_doclet_idx:
-                example_folder_name = 'common'
-            elif editor_name == 'forms':
-                example_folder_name = 'word'
-
+        for doclet in data:
             if 'see' in doclet:
                 if doclet['see'] is not None:
-                    doclet['see'][0] = doclet['see'][0].replace('{Editor}', example_folder_name.title())
+                    if editor_name == 'forms':
+                        doclet['see'][0] = doclet['see'][0].replace('{Editor}', 'Word')
+                    else:
+                        doclet['see'][0] = doclet['see'][0].replace('{Editor}', editor_name.title())
+
                     file_path = f'{root}/' + doclet['see'][0]
 
                     if os.path.exists(file_path):

scripts/sdkjs_common/jsdoc/get_latest_branch.py

@@ -1,39 +0,0 @@
-import subprocess
-
-def fetch_branches():
-    #Fetch all branches without tags from the remote.
-    subprocess.run(['git', 'fetch', '--no-tags', 'origin', '+refs/heads/*:refs/remotes/origin/*'], check=True)
-
-def get_branches():
-    #Get list of branches in the repository."""
-    result = subprocess.run(['git', 'branch', '-r'], capture_output=True, text=True)
-    return [line.strip() for line in result.stdout.splitlines()]
-
-def parse_version(version_str):
-    #Parse version string and return a tuple of integers (major, minor, patch).
-    try:
-        return tuple(map(int, version_str.lstrip('v').split('.')))
-    except ValueError:
-        return (0, 0, 0)  # Default for non-parsable versions
-
-def get_max_version_branch(branches):
-    #Find the branch with the highest version.
-    max_branch = None
-    max_version = (0, 0, 0)
-
-    for branch in branches:
-        parts = branch.split('/')
-        if len(parts) >= 2 and (parts[1] == 'hotfix' or parts[1] == 'release'):
-            version = parse_version(parts[2])
-            if version > max_version:
-                max_version = version
-                max_branch = parts
-
-    return max_branch
-
-if __name__ == "__main__":
-    fetch_branches()  # Fetch branches without tags
-    branches = get_branches()
-    max_version_branch = get_max_version_branch(branches)
-    if max_version_branch:
-        print('/'.join(max_version_branch[1:]))  # Print only the branch name without origin

sln.json

@@ -22,10 +22,8 @@
     "core/HtmlFile2/HtmlFile2.pro",
     "core/Fb2File/Fb2File.pro",
     "core/EpubFile/CEpubFile.pro",
-    "core/HwpFile/HWPFile.pro",
-
-    "core/Apple/IWork.pro",
-
+    
+    "core/HtmlRenderer/htmlrenderer.pro",
     "core/DocxRenderer/DocxRenderer.pro",   
 
     "core/DesktopEditor/doctrenderer/doctrenderer.pro",
@@ -92,8 +90,7 @@
     "[win,linux]desktop-apps/win-linux/ASCDocumentEditor.pro",
     
     "[win]desktop-apps/win-linux/extras/projicons/ProjIcons.pro",
-    "[win,!win_xp]desktop-apps/win-linux/extras/update-daemon/UpdateDaemon.pro",
-    "[win,!win_xp]desktop-apps/win-linux/extras/online-installer/OnlineInstaller.pro"
+    "[win,!win_xp]desktop-apps/win-linux/extras/update-daemon/UpdateDaemon.pro"
   ],
 
   "mobile" : [

tests/puppeteer/config_chrome.json

@@ -0,0 +1,4 @@
+{
+  "browser" : "chrome",
+  "browserUrl" : "C:/Program Files/Google/Chrome/Application/chrome.exe"
+}

tests/puppeteer/config_firefox.json

@@ -0,0 +1,4 @@
+{
+  "browser" : "firefox",
+  "browserUrl" : "C:/Program Files/Mozilla Firefox/firefox.exe"
+}

tests/puppeteer/install.py

@@ -0,0 +1,9 @@
+#!/usr/bin/env python
+
+import sys
+sys.path.append('../../scripts')
+import base
+import os
+
+os.environ["PUPPETEER_SKIP_CHROMIUM_DOWNLOAD"] = "true"
+base.cmd("npm", ["i", "puppeteer"])

tests/puppeteer/run.py

@@ -0,0 +1,64 @@
+#!/usr/bin/env python
+
+import sys
+sys.path.append('../../scripts')
+import base
+import os
+import glob
+import json
+
+def get_tests_in_dir(directory):
+  files = []
+  for file in glob.glob(directory + "/*.js"):
+    if base.is_file(file):
+      files.append(file)
+    elif is_dir(file):
+      files += get_tests_in_dir(file)
+  return files
+
+params = sys.argv[1:]
+if (0 == len(params)):
+  print("use: run.py path_to_config [path_to_test]")
+  exit(0)
+
+config_path = params[0]
+test_file = "./tests"
+
+if (1 < len(params)):
+  test_file = params[1]
+
+tests_array = [test_file]
+if base.is_dir(test_file):
+  tests_array = get_tests_in_dir(test_file)
+
+config_content = "{}"
+with open(config_path, "r") as config_path_loader:
+  config_content = config_path_loader.read()
+
+print(config_content)
+
+config = json.loads(config_content)
+os.environ["PUPPETEER_SKIP_CHROMIUM_DOWNLOAD"] = "true"
+if "browser" in config:
+  print("browser: " + config["browser"])
+  os.environ["PUPPETEER_PRODUCT"] = config["browser"]
+
+if "browserUrl" in config:
+  print("browserUrl: " + config["browserUrl"])
+  os.environ["PUPPETEER_EXECUTABLE_PATH"] = config["browserUrl"]
+
+if not base.is_dir("./work_directory"):
+  base.create_dir("./work_directory")
+  base.create_dir("./work_directory/cache")
+  base.create_dir("./work_directory/downloads")
+
+for test in tests_array:
+  print("run test: " + test)
+  run_file = test + ".runned.js"
+  base.copy_file("./tester.js", run_file)
+  test_content = base.readFile(test)
+  test_content = test_content.replace("await Tester.", "Tester.")
+  test_content = test_content.replace("Tester.", "await Tester.")
+  base.replaceInFile(run_file, "\"%%CODE%%\"", test_content)
+  base.cmd("node", [run_file])
+  base.delete_file(run_file)

tests/puppeteer/tester.js

@@ -0,0 +1,171 @@
+const puppeteer = require('puppeteer')
+const pathfs = require('path')
+const fs = require('fs');
+
+function TesterImpl()
+{
+  this.browser = null;
+  this.page = null;
+  this.width = 1500;
+  this.height = 800;
+  this.pixelRatio = 1;
+
+  this.cacheDir = pathfs.resolve("./work_directory/cache");
+  this.downloadsDir = pathfs.resolve("./work_directory/downloads");
+  this.downloadCounter = 0;
+
+  this.load = async function(url)
+  {
+    const head = { x: 100, y: 200 };
+    this.browser = await puppeteer.launch({
+      headless: false,
+      product: process.env["PUPPETEER_PRODUCT"],
+      args: [
+        "--disable-infobars", 
+        `--window-size=${this.width+head.x},${this.height+head.y}`, 
+        "--disk-cache-dir=" + this.cacheDir
+      ],
+      defaultViewport : {width: this.width, height: this.height, deviceScaleFactor : this.pixelRatio }
+    });
+
+    this.page = await this.browser.newPage();
+    await this.page.setViewport({ width: this.width, height: this.height });
+    let waitObject = (process.env["PUPPETEER_PRODUCT"] === "firefox") ? { waitUntil: "networkidle0", timeout: 15000 } : {};
+    await this.page.goto(url + "&autotest=enabled", waitObject);
+    console.log("[tester] pageLoaded");
+    return this.page;
+  };
+
+  this.close = async function(nosleep)
+  {
+    if (true !== nosleep)
+      await this.waitAutosave();
+    await this.browser.close();
+  };
+
+  this.sleep = async function(ms) 
+  {
+    return await new Promise(resolve => setTimeout(resolve, ms));
+  };
+
+  this.waitEditor = async function() 
+  {
+    // TODO: wait first onEndRecalculate
+    await this.sleep(5000);
+    console.log("[tester] editorReady");
+  };
+
+  this.waitAutosave = async function() 
+  {
+    await this.sleep(5000);    
+  };
+
+  this.evaluateInMainFrame = async function(code)
+  {
+    return await this.page.evaluate(code);
+  };
+  this.evaluateInEditorFrame = async function(code)
+  {
+    const frame = await this.page.frames().find(frame => frame.name() === 'frameEditor');
+    if (!frame)
+      return;
+    return await frame.evaluate(code);
+  };
+
+  this.click = async function(id)
+  {
+    let res = await this.evaluateInEditorFrame("document.getElementById(\"" + id + "\").click(); \"[tester] clicked: " + id + "\"");
+    //console.log(res);
+    await this.sleep(200);
+    return res;
+  };
+
+  this.mouseClick = async function(x, y, options)
+  {
+    let res = await this.page.mouse.click(x, y, options);
+    await this.sleep(200);
+    return res;
+  };
+
+  this.eval = async function(code)
+  {
+    let res = await this.evaluateInEditorFrame(code);
+    await this.sleep(200);
+    return res;
+  };
+
+  this.keyDown = async function(key)
+  {
+    // https://pptr.dev/api/puppeteer.keyinput
+    let res = await this.page.keyboard.down(key);
+    await this.sleep(200);
+    return res;
+  };
+
+  this.keyUp = async function(key)
+  {
+    // https://pptr.dev/api/puppeteer.keyinput
+    let res = await this.page.keyboard.up(key);
+    await this.sleep(200);
+    return res;
+  };
+
+  this.keyClick = async function(key)
+  {
+    // https://pptr.dev/api/puppeteer.keyinput
+    let res = await this.page.keyboard.down(key);
+    res = await this.page.keyboard.up(key);
+    await this.sleep(200);
+    return res;
+  };
+
+  this.keyPress = async function(key)
+  {
+    // https://pptr.dev/api/puppeteer.keyinput
+    let res = await this.page.keyboard.press(key);
+    await this.sleep(200);
+    return res;
+  };
+
+  this.input = async function(text)
+  {
+    let res = await this.page.keyboard.type(text);
+    await this.sleep(200);
+    return res;
+  };
+
+  this.downloadFile = async function(format, path)
+  {
+    const tmpDir = pathfs.resolve(this.downloadsDir, "./tmp" + this.downloadCounter++);
+    fs.mkdirSync(tmpDir);
+
+    // emulate download
+    const client = await this.page.target().createCDPSession();
+    await client.send("Page.setDownloadBehavior", {
+      behavior: "allow",
+      downloadPath: tmpDir
+    });
+
+    await this.evaluateInEditorFrame("document.querySelectorAll('[data-layout-name=\"toolbar-file\"]')[0].click();");
+    await this.sleep(200);
+    await this.evaluateInEditorFrame("document.getElementsByClassName(\"svg-format-" + format + "\")[0].click();");
+    await this.sleep(200);
+    await this.evaluateInEditorFrame("document.getElementById(\"fm-btn-return\").click();");
+
+    await this.sleep(2000);
+
+    const files = fs.readdirSync(tmpDir);
+    fs.copyFileSync(pathfs.resolve(tmpDir, "./" + files[0]), pathfs.resolve(path));
+    fs.rmSync(tmpDir, { recursive: true, force: true });
+  };
+}
+
+const Tester = new TesterImpl;
+
+try {
+  (async () => {    
+    "%%CODE%%"
+  })();
+} catch (err) {
+  console.error(err);
+}

tests/puppeteer/tests/bold.js

@@ -0,0 +1,27 @@
+Tester.load("path_to_file");
+Tester.waitEditor();
+
+// down Enter
+Tester.keyClick("Enter");
+
+// type text
+Tester.input("Hello World!");
+
+Tester.keyPress("ArrowLeft");
+Tester.keyDown("Shift");
+for (let i = 0; i < 5; i++)
+  Tester.keyPress("ArrowLeft");
+Tester.keyUp("Shift");
+
+// bold
+Tester.click("id-toolbar-btn-bold");
+// italic
+Tester.mouseClick(115, 105);
+
+// if needed
+Tester.waitAutosave();
+
+Tester.downloadFile("docx", "./work_directory/new.docx")
+Tester.downloadFile("odt", "./work_directory/new.odt")
+
+Tester.close(true);

tools/common/desktop_templates.py

@@ -1,114 +0,0 @@
-#!/usr/bin/env python
-
-import sys
-sys.path.append('../../scripts')
-import base
-import os
-import glob
-import base64
-
-sys.stdin.reconfigure(encoding='utf-8')
-sys.stdout.reconfigure(encoding='utf-8')
-
-base.configure_common_apps()
-
-def change_property(data_src, name, value):
-  data = data_src
-  creator_open = "<dc:" + name + ">"
-  creator_close = "</dc:" + name + ">"
-  open_tag_pos = data.find(creator_open)
-  if open_tag_pos == -1:
-    creator_close_to_find = "<dc:" + name + "/>"
-  else:
-    creator_close_to_find = "</dc:" + name + ">"
-  close_tag_pos = data.find(creator_close_to_find)
-  last_tag_pos = data.find("</cp:coreProperties>")
-
-  if open_tag_pos != -1 and close_tag_pos != - 1:
-    data = data[:open_tag_pos + len(creator_open)] + value + data[close_tag_pos:]
-  elif close_tag_pos != - 1:
-    data = data[:close_tag_pos] + creator_open + value + creator_close + data[close_tag_pos + len(creator_close_to_find):]
-  else:
-    data = data[:last_tag_pos] + creator_open + value + creator_close + data[last_tag_pos:]
-  return data
-
-def change_author_name(file_input):
-  temp_dir = os.getcwd().replace("\\", "/") + "/temp"
-  base.create_dir(temp_dir)
-
-  app = "7za" if ("mac" == base.host_platform()) else "7z"
-  base.cmd_exe(app, ["x", "-y", file_input, "-o" + temp_dir, "docProps/core.xml", "-r"])
-
-  with open(temp_dir + "/docProps/core.xml", 'r', encoding='utf-8') as file:
-    data = file.read()
-
-  data = change_property(data, "creator", "")
-  data = change_property(data, "lastModifiedBy", "")
-
-  with open(temp_dir + "/docProps/core.xml", 'w', encoding='utf-8') as file:
-    file.write(data)
-
-  base.cmd_exe(app, ["a", "-r", file_input, temp_dir + "/docProps"])
-  base.delete_dir(temp_dir)
-
-def get_files(dir):
-  arr_files = []
-  for file in glob.glob(dir + "/*"):
-    if base.is_file(file):
-      arr_files.append(file)      
-    elif base.is_dir(file):
-      arr_files += get_files(file)
-  return arr_files
-
-def get_local_path(base, src_dir):
-  test1 = base.replace("\\", "/")
-  test2 = src_dir.replace("\\", "/")
-  return test2[len(test1)+1:]
-
-params = sys.argv[1:]
-
-if (3 > len(params)):
-  print("use: convert.py path_to_x2t_directory path_to_input_directory path_to_output_directory")
-  exit(0)
-
-base.configure_common_apps()
-
-x2t_directory = params[0]
-src_directory = params[1]
-dst_directory = params[2]
-
-if base.is_dir(dst_directory):
-  base.delete_dir(dst_directory)
-base.create_dir(dst_directory)
-
-src_files = get_files(src_directory)
-
-for file in src_files:
-  directory = os.path.dirname(file)
-  name = os.path.basename(file)
-  directory_out_file = dst_directory + "/" + get_local_path(src_directory, directory)
-  if not base.is_dir(directory_out_file):
-    os.makedirs(directory_out_file, exist_ok=True)
-  name_without_ext = os.path.splitext(name)[0]
-  name_ext = os.path.splitext(name)[1][1:]
-
-  dst_ext = name_ext
-  if ("docx" == name_ext) or ("dotx" == name_ext):
-    dst_ext = "dotx"
-  elif ("pptx" == name_ext) or ("potx" == name_ext):
-    dst_ext = "potx"
-  elif ("xlsx" == name_ext) or ("xltx" == name_ext):
-    dst_ext = "xltx"
-
-  dst_name = name_without_ext
-  if (len(dst_name) < 4) or (dst_name[0:4] != "[32]"):
-    dst_name = "[32]" + base64.b32encode(name_without_ext.encode("utf-8")).decode("utf-8")
-
-  dst_file = directory_out_file + "/" + dst_name + "." + dst_ext
-
-  os.makedirs(directory_out_file, exist_ok=True)
-  base.cmd_in_dir(x2t_directory, "x2t", [file, dst_file])
-
-  change_author_name(dst_file)
-
-  print(name_without_ext + " => " + dst_name)

tools/linux/automate.py

@@ -55,23 +55,14 @@ def install_qt():
   base.cmd_in_dir("./qt-everywhere-opensource-src-5.9.9", "make", ["-j", "4"])
   base.cmd_in_dir("./qt-everywhere-opensource-src-5.9.9", "make", ["install"])
   return
-  
-def install_qt_prebuild():
-  url_amd64 = "https://s3.eu-west-1.amazonaws.com/static-doc.teamlab.eu.com/qt/5.9.9/linux_amd64/qt_binary.7z"
-  base.download(url_amd64, "./qt_amd64.7z")
-  base.extract("./qt_amd64.7z", "./qt_build")
-  base.create_dir("./qt_build/Qt-5.9.9")
-  base.cmd("mv", ["./qt_build/qt_amd64", "./qt_build/Qt-5.9.9/gcc_64"])
-  base.setup_local_qmake("./qt_build/Qt-5.9.9/gcc_64/bin")
-  return
 
 if not base.is_file("./node_js_setup_14.x"):
   print("install dependencies...")
   deps.install_deps()
 
-if not base.is_dir("./qt_build"):
+if not base.is_dir("./qt_build"):  
   print("install qt...")
-  install_qt_prebuild()
+  install_qt()
 
 branch = get_branch_name("../..")
 
@@ -112,3 +103,6 @@ build_tools_params = ["--branch", branch,
 
 base.cmd_in_dir("../..", "./configure.py", build_tools_params)
 base.cmd_in_dir("../..", "./make.py")
+
+
+

tools/linux/deps.py

@@ -39,14 +39,9 @@ def install_deps():
               "libxi-dev",
               "libxrender-dev",
               "libxss1",
-              "libncurses5",
-              "libncurses6",
-              "curl",
-              "libxkbcommon-dev",
-              "libxkbcommon-x11-dev"]
+              "libncurses5"]
 
-  for package in packages:
-    base.cmd("sudo", ["apt-get", "install", "-y", package], True)
+  base.cmd("sudo", ["apt-get", "install", "-y"] + packages)
 
   # nodejs
   base.cmd("sudo", ["apt-get", "install", "-y", "nodejs"])
@@ -84,3 +79,4 @@ def install_deps():
 
 if __name__ == "__main__":
   install_deps()
+

version

@@ -1 +1 @@
-8.2.2
+8.1.1