Disable warnings by default

Feature/googletest

build.pro

@@ -114,6 +114,7 @@ desktop {
 	!no_desktop_apps {
 		core_windows:addSubProject(projicons,	$$ROOT_DIR/desktop-apps/win-linux/extras/projicons/ProjIcons.pro,\
 							documentscore videoplayer)
+		core_windows:!build_xp:addSubProject(updatedaemon, $$ROOT_DIR/desktop-apps/win-linux/extras/update-daemon/UpdateDaemon.pro)
 		addSubProject(desktopapp,	$$ROOT_DIR/desktop-apps/win-linux/ASCDocumentEditor.pro,\
 						documentscore videoplayer)
 	}

make.py

@@ -33,7 +33,7 @@ if ("1" != base.get_env("OO_RUNNING_BRANDING")) and ("" != config.option("brandi
       base.cmd("git", ["clone", config.option("branding-url"), branding_dir])
 
     base.cmd_in_dir(branding_dir, "git", ["fetch"], True)
-   
+
     if not is_exist or ("1" != config.option("update-light")):
       base.cmd_in_dir(branding_dir, "git", ["checkout", "-f", config.option("branch")], True)
 
@@ -75,7 +75,8 @@ if config.check_option("module", "desktop"):
 
   if "windows" == base.host_platform():
     config.extend_option("config", "updmodule")
-    config.extend_option("qmake_addon", "LINK=https://download.onlyoffice.com/install/desktop/editors/windows/onlyoffice/appcast.json")
+    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")
 
 
 

make_package.py

@@ -64,6 +64,10 @@ utils.set_cwd(common.workspace_dir, verbose=True)
 utils.delete_file("deploy.json")
 if "core" in common.targets:
   package_core.make()
+if "closure-maps-os" in common.targets:
+  package_core.deploy_closure_maps("opensource")
+if "closure-maps-com" in common.targets:
+  package_core.deploy_closure_maps("commercial")
 if "desktop" in common.targets:
   package_desktop.make()
 if "builder" in common.targets:

scripts/base.py

@@ -440,9 +440,10 @@ def set_cwd(dir):
   return
 
 # git ---------------------------------------------------
-def git_update(repo, is_no_errors=False, is_current_dir=False):
+def git_update(repo, is_no_errors=False, is_current_dir=False, git_owner=""):
   print("[git] update: " + repo)
-  url = "https://github.com/ONLYOFFICE/" + repo + ".git"
+  owner = git_owner if git_owner else "ONLYOFFICE"
+  url = "https://github.com/" + owner + "/" + repo + ".git"
   if config.option("git-protocol") == "ssh":
     url = "git@github.com:ONLYOFFICE/" + repo + ".git"
   folder = get_script_dir() + "/../../" + repo
@@ -1296,17 +1297,16 @@ def copy_v8_files(core_dir, deploy_dir, platform, is_xp=False):
   if (-1 != config.option("config").find("use_javascript_core")):
     return
   directory_v8 = core_dir + "/Common/3dParty"
+  
   if is_xp:
     directory_v8 += "/v8/v8_xp"
-  
-  if (-1 != config.option("config").lower().find("v8_version_89")) and not is_xp:
-    directory_v8 += "/v8_89/v8/out.gn/"
-  else:
-    directory_v8 += "/v8/v8/out.gn/"
-
-  if is_xp:
     copy_files(directory_v8 + platform + "/release/icudt*.dll", deploy_dir + "/")
     return
+  
+  if config.check_option("config", "v8_version_60"):
+    directory_v8 += "/v8/v8/out.gn/"
+  else:
+    directory_v8 += "/v8_89/v8/out.gn/"
 
   if (0 == platform.find("win")):
     copy_files(directory_v8 + platform + "/release/icudt*.dat", deploy_dir + "/")
@@ -1314,10 +1314,10 @@ def copy_v8_files(core_dir, deploy_dir, platform, is_xp=False):
     copy_files(directory_v8 + platform + "/icudt*.dat", deploy_dir + "/")
   return
 
-def clone_marketplace_plugin(out_dir, is_name_as_guid=False):
+def clone_marketplace_plugin(out_dir, is_name_as_guid=False, is_replace_paths=False, is_delete_git_dir=True, git_owner=""):
   old_cur = os.getcwd()
   os.chdir(out_dir)
-  git_update("onlyoffice.github.io", False, True)
+  git_update("onlyoffice.github.io", False, True, git_owner)
   os.chdir(old_cur)
 
   dst_dir_name = "marketplace"
@@ -1334,9 +1334,14 @@ def clone_marketplace_plugin(out_dir, is_name_as_guid=False):
 
   if is_dir(dst_dir_path):
     delete_dir(dst_dir_path)
-
   copy_dir(out_dir + "/onlyoffice.github.io/store/plugin", dst_dir_path)
-  delete_dir_with_access_error(out_dir + "/onlyoffice.github.io")
+  
+  if is_replace_paths:
+    for file in glob.glob(dst_dir_path + "/*.html"):
+      replaceInFile(file, "https://onlyoffice.github.io/sdkjs-plugins/", "../")
+        
+  if is_delete_git_dir:
+    delete_dir_with_access_error(out_dir + "/onlyoffice.github.io")
   return
 
 def correctPathForBuilder(path):

scripts/build_js.py

@@ -111,6 +111,9 @@ def make():
 def _run_npm(directory):
   return base.cmd_in_dir(directory, "npm", ["install"])
 
+def _run_npm_ci(directory):
+  return base.cmd_in_dir(directory, "npm", ["ci"])
+
 def _run_npm_cli(directory):
   return base.cmd_in_dir(directory, "npm", ["install", "-g", "grunt-cli"])
 
@@ -139,7 +142,7 @@ def build_sdk_desktop(directory):
 def build_sdk_builder(directory):
   #_run_npm_cli(directory)
   _run_npm(directory)
-  _run_grunt(directory, get_build_param() + base.sdkjs_addons_param())
+  _run_grunt(directory, get_build_param() + base.sdkjs_addons_param() + ["--map"])
   return
 
 def build_sdk_native(directory, minimize=True):
@@ -154,7 +157,7 @@ def build_js_develop(root_dir):
   if (external_folder != ""):
     external_folder = "/" + external_folder
     
-  _run_npm(root_dir + external_folder + "/sdkjs/build")
+  _run_npm_ci(root_dir + external_folder + "/sdkjs/build")
   _run_grunt(root_dir + external_folder + "/sdkjs/build", get_build_param(False) + base.sdkjs_addons_param())
   _run_grunt(root_dir + external_folder + "/sdkjs/build", ["develop"] + base.sdkjs_addons_param())
   _run_npm(root_dir + external_folder + "/web-apps/build")

scripts/config.py

@@ -69,23 +69,19 @@ def parse():
   if check_option("platform", "android"):
     options["platform"] += " android_arm64_v8a android_armv7 android_x86 android_x86_64"
 
-  #if check_option("platform", "ios"):
-  #  extend_option("config", "core_ios_32")
-
   # check vs-version
-  if ("" == option("vs-version")):
-    options["vs-version"] = "2015"
-
-  # enable v8 8.9 version, if compiler support sources
-  if ("linux" == host_platform) and (5004 <= base.get_gcc_version()) and not check_option("platform", "android"):
-    extend_option("config", "v8_version_89")
+  if ("windows" == host_platform) and ("" == option("vs-version")):
+    options["vs-version"] = "2019"
+    if check_option("platform", "win_64_xp") or check_option("platform", "win_32_xp"):
+      options["vs-version"] = "2015"
 
   if ("windows" == host_platform) and ("2019" == option("vs-version")):
-    extend_option("config", "v8_version_89")
-    extend_option("config", "vs2019")
+      extend_option("config", "vs2019")
 
-  if check_option("platform", "linux_arm64"):
-    extend_option("config", "v8_version_89")
+  if is_cef_107():
+    extend_option("config", "cef_version_107")
+  if is_v8_60():
+    extend_option("config", "v8_version_60")
 
   # check vs-path
   if ("windows" == host_platform) and ("" == option("vs-path")):
@@ -115,6 +111,14 @@ def parse():
     if not check_option("config", "bundle_dylibs"):
       extend_option("config", "bundle_dylibs")
 
+  if check_option("use-system-qt", "1"):
+    base.cmd_in_dir(base.get_script_dir() + "/../tools/linux", "python", ["use_system_qt.py"])
+    options["qt-dir"] = base.get_script_dir() + "/../tools/linux/system_qt"
+
+  # disable all warnings (enable if needed with core_enable_all_warnings options)
+  if not check_option("config", "core_enable_all_warnings"):
+    extend_option("config", "core_disable_all_warnings")
+
   return
 
 def check_compiler(platform):
@@ -211,3 +215,26 @@ def parse_defaults():
     else:
       options[name] = defaults_options[name]
   return
+
+def is_cef_107():
+  if ("linux" == base.host_platform()) and (5004 > base.get_gcc_version()) and not check_option("platform", "android"):
+    return True
+  return False
+
+def is_v8_60():
+  if check_option("platform", "linux_arm64"):
+    return False
+
+  if ("linux" == base.host_platform()) and (5004 > base.get_gcc_version()) and not check_option("platform", "android"):
+    return True
+
+  if check_option("platform", "android"):
+    return True
+
+  if ("windows" == base.host_platform()) and ("2015" == option("vs-version")):
+    return True
+
+  if check_option("config", "use_v8"):
+    return True
+
+  return False

scripts/core_common/make_common.py

@@ -20,6 +20,7 @@ import hunspell
 import glew
 import harfbuzz
 import hyphen
+import googletest
 
 def check_android_ndk_macos_arm(dir):
   if base.is_dir(dir + "/darwin-x86_64") and not base.is_dir(dir + "/darwin-arm64"):
@@ -43,7 +44,8 @@ def make():
   hunspell.make(False)
   harfbuzz.make()
   glew.make()
-  hyphen.make()  
+  hyphen.make()
+  googletest.make()
   
   if config.check_option("module", "mobile"):
     if (config.check_option("platform", "android")):

scripts/core_common/modules/boost.py

@@ -73,6 +73,8 @@ def make():
       win_toolset = "msvc-14.2"
       win_boot_arg = "vc142"
       win_vs_version = "vc142"
+
+    # add "define=_ITERATOR_DEBUG_LEVEL=0" to b2 args before install for disable _ITERATOR_DEBUG_LEVEL
     if (-1 != config.option("platform").find("win_64")) and not base.is_file("../build/win_64/lib/libboost_system-" + win_vs_version + "-mt-x64-1_72.lib"):
       base.cmd("bootstrap.bat", [win_boot_arg])
       base.cmd("b2.exe", ["headers"])

scripts/core_common/modules/cef.py

@@ -15,54 +15,69 @@ def make():
 
   platforms = ["win_64", "win_32", "win_64_xp", "win_32_xp", "linux_64", "linux_32", "mac_64", "mac_arm64"]
 
-  url = "http://d2ettrnqo7v976.cloudfront.net/cef/4280/"
-
   for platform in platforms:
     if not config.check_option("platform", platform):
       continue
 
+    url = "http://d2ettrnqo7v976.cloudfront.net/cef/"
+    archive_name = "./cef_binary.7z"
+
+    if (-1 != platform.find("_xp")):
+      url += "4280/"
+      archive_name = "./cef_binary_xp.7z"
+    elif (config.check_option("config", "cef_version_107")):
+      url += "5304/"
+      archive_name = "./cef_binary_107.7z"
+    else:
+      url += "5414/"
+
     url_platform = (url + platform + "/cef_binary.7z")
+    archive_name_data = archive_name + ".data"
 
     if not base.is_dir(platform):
       base.create_dir(platform)
 
     os.chdir(platform)
-
+    
     data_url = base.get_file_last_modified_url(url_platform)
-    old_data_url = base.readFile("./cef_binary.7z.data")
+    old_data_url = base.readFile(archive_name_data)
+
+    build_dir_name = "build"
+    if (0 == platform.find("linux")) and (config.check_option("config", "cef_version_107")):
+      build_dir_name = "build_107"
 
     if (data_url != old_data_url):
-      if base.is_file("./cef_binary.7z"):
-        base.delete_file("./cef_binary.7z")
-      if base.is_dir("build"):
-        base.delete_dir("build")
+      if base.is_file(archive_name):
+        base.delete_file(archive_name)
+      if base.is_dir(build_dir_name):
+        base.delete_dir(build_dir_name)
 
-    if base.is_dir("build"):
+    if base.is_dir(build_dir_name):
       os.chdir(base_dir)
       continue
 
     # download
-    if not base.is_file("./cef_binary.7z"):
-      base.download(url_platform, "./cef_binary.7z")
+    if not base.is_file(archive_name):
+      base.download(url_platform, archive_name)
 
     # extract
-    base.extract("./cef_binary.7z", "./")
+    base.extract(archive_name, "./")
 
-    base.delete_file("./cef_binary.7z.data")
-    base.writeFile("./cef_binary.7z.data", data_url)
+    base.delete_file(archive_name_data)
+    base.writeFile(archive_name_data, data_url)
 
-    base.create_dir("./build")
+    base.create_dir("./" + build_dir_name)
 
     # deploy
-    if (0 != platform.find("mac")):
-      base.copy_files("cef_binary/Release/*", "build/")
-      base.copy_files("cef_binary/Resources/*", "build/")
-
-    if (0 == platform.find("linux")):
-      base.cmd("chmod", ["a+xr", "build/locales"])
-
     if (0 == platform.find("mac")):
       base.cmd("mv", ["Chromium Embedded Framework.framework", "build/Chromium Embedded Framework.framework"])
+      base.delete_dir("./Chromium Embedded Framework.framework")
+    else:
+      base.copy_files("cef_binary/Release/*", build_dir_name + "/")
+      base.copy_files("cef_binary/Resources/*", build_dir_name + "/")
+      if (0 == platform.find("linux")):
+        base.cmd("chmod", ["a+xr", build_dir_name + "/locales"])
+      base.delete_dir("./cef_binary")
 
     os.chdir(base_dir)
 

scripts/core_common/modules/googletest.py

@@ -0,0 +1,19 @@
+#!/usr/bin/env python
+
+import sys
+sys.path.append('../..')
+import base
+import os
+
+def make():
+  print("[fetch]: googletest")
+
+  base_dir = base.get_script_dir() + "/../../core/Common/3dParty/googletest"
+  old_cur = os.getcwd()
+  os.chdir(base_dir)
+
+  if not base.is_dir("googletest"):
+    base.cmd("git", ["clone", "https://github.com/google/googletest.git", "-b", "v1.13.0"])
+
+  os.chdir(old_cur)
+  return

scripts/core_common/modules/icu.py

@@ -66,6 +66,7 @@ def make():
       base.create_dir(base_dir + "/icu/cross_build")
       os.chdir("icu/cross_build")
       base.cmd("./../source/runConfigureICU", ["Linux", "--prefix=" + base_dir + "/icu/cross_build_install"])
+      base.replaceInFile("./../source/icudefs.mk.in", "LDFLAGS = @LDFLAGS@ $(RPATHLDFLAGS)", "LDFLAGS = @LDFLAGS@ $(RPATHLDFLAGS) -static-libstdc++ -static-libgcc")
       base.cmd("make", ["-j4"])
       base.cmd("make", ["install"], True)
       base.create_dir(base_dir + "/linux_64")

scripts/core_common/modules/openssl.py

@@ -19,15 +19,16 @@ def make():
 
   print("[fetch & build]: openssl")
 
-  if (-1 != config.option("platform").find("android") or -1 != config.option("platform").find("ios")):
-    openssl_mobile.make()
-    return
-
   base_dir = base.get_script_dir() + "/../../core/Common/3dParty/openssl"
   old_cur = os.getcwd()
   os.chdir(base_dir)
 
-  base.common_check_version("openssl", "3", clean)
+  base.common_check_version("openssl", "4", clean)
+
+  if (-1 != config.option("platform").find("android") or -1 != config.option("platform").find("ios")):
+    os.chdir(old_cur)
+    openssl_mobile.make()
+    return
 
   if not base.is_dir("openssl"):
     base.cmd("git", ["clone", "--depth=1", "--branch", "OpenSSL_1_1_1f", "https://github.com/openssl/openssl.git"])
@@ -41,7 +42,7 @@ def make():
       base.create_dir("./../build/win_64")
       qmake_bat = []
       qmake_bat.append("call \"" + config.option("vs-path") + "/vcvarsall.bat\" x64")      
-      qmake_bat.append("perl Configure VC-WIN64A --prefix=" + old_cur_dir + "\\build\\win_64 --openssldir=" + old_cur_dir + "\\build\\win_64 no-shared no-asm")
+      qmake_bat.append("perl Configure VC-WIN64A --prefix=" + old_cur_dir + "\\build\\win_64 --openssldir=" + old_cur_dir + "\\build\\win_64 no-shared no-asm enable-md2")
       qmake_bat.append("call nmake clean")
       qmake_bat.append("call nmake build_libs install")
       base.run_as_bat(qmake_bat, True)
@@ -49,7 +50,7 @@ def make():
       base.create_dir("./../build/win_32")
       qmake_bat = []
       qmake_bat.append("call \"" + config.option("vs-path") + "/vcvarsall.bat\" x86")
-      qmake_bat.append("perl Configure VC-WIN32 --prefix=" + old_cur_dir + "\\build\\win_32 --openssldir=" + old_cur_dir + "\\build\\win_32 no-shared no-asm")
+      qmake_bat.append("perl Configure VC-WIN32 --prefix=" + old_cur_dir + "\\build\\win_32 --openssldir=" + old_cur_dir + "\\build\\win_32 no-shared no-asm enable-md2")
       qmake_bat.append("call nmake clean")
       qmake_bat.append("call nmake build_libs install")
       base.run_as_bat(qmake_bat, True)
@@ -62,7 +63,7 @@ def make():
       base.create_dir("./../build/win_64_xp")
       qmake_bat = []
       qmake_bat.append("call \"" + config.option("vs-path") + "/vcvarsall.bat\" x64")      
-      qmake_bat.append("perl Configure VC-WIN64A --prefix=" + old_cur_dir + "\\build\\win_64_xp --openssldir=" + old_cur_dir + "\\build\\win_64_xp no-shared no-asm no-async")
+      qmake_bat.append("perl Configure VC-WIN64A --prefix=" + old_cur_dir + "\\build\\win_64_xp --openssldir=" + old_cur_dir + "\\build\\win_64_xp no-shared no-asm no-async enable-md2")
       qmake_bat.append("call nmake clean")
       qmake_bat.append("call nmake build_libs install")
       base.run_as_bat(qmake_bat, True)
@@ -70,7 +71,7 @@ def make():
       base.create_dir("./../build/win_32_xp")
       qmake_bat = []
       qmake_bat.append("call \"" + config.option("vs-path") + "/vcvarsall.bat\" x86")
-      qmake_bat.append("perl Configure VC-WIN32 --prefix=" + old_cur_dir + "\\build\\win_32_xp --openssldir=" + old_cur_dir + "\\build\\win_32_xp no-shared no-asm no-async")
+      qmake_bat.append("perl Configure VC-WIN32 --prefix=" + old_cur_dir + "\\build\\win_32_xp --openssldir=" + old_cur_dir + "\\build\\win_32_xp no-shared no-asm no-async enable-md2")
       qmake_bat.append("call nmake clean")
       qmake_bat.append("call nmake build_libs install")
       base.run_as_bat(qmake_bat, True)
@@ -79,7 +80,7 @@ def make():
     return
 
   if (-1 != config.option("platform").find("linux")) and not base.is_dir("../build/linux_64"):
-    base.cmd("./config", ["no-shared", "no-asm", "--prefix=" + old_cur_dir + "/build/linux_64", "--openssldir=" + old_cur_dir + "/build/linux_64"])
+    base.cmd("./config", ["enable-md2", "no-shared", "no-asm", "--prefix=" + old_cur_dir + "/build/linux_64", "--openssldir=" + old_cur_dir + "/build/linux_64"])
     base.replaceInFile("./Makefile", "CFLAGS=-Wall -O3", "CFLAGS=-Wall -O3 -fvisibility=hidden")
     base.replaceInFile("./Makefile", "CXXFLAGS=-Wall -O3", "CXXFLAGS=-Wall -O3 -fvisibility=hidden")
     base.cmd("make")
@@ -94,14 +95,14 @@ def make():
       if ("" == cross_compiler_arm64):
         cross_compiler_arm64 = "/usr/bin"
       cross_compiler_arm64_prefix = cross_compiler_arm64 + "/" + base.get_prefix_cross_compiler_arm64()
-      base.cmd("./Configure", ["linux-aarch64", "--cross-compile-prefix=" + cross_compiler_arm64_prefix, "no-shared", "no-asm", "no-tests", "--prefix=" + old_cur_dir + "/build/linux_arm64", "--openssldir=" + old_cur_dir + "/build/linux_arm64"])
+      base.cmd("./Configure", ["linux-aarch64", "--cross-compile-prefix=" + cross_compiler_arm64_prefix, "enable-md2", "no-shared", "no-asm", "no-tests", "--prefix=" + old_cur_dir + "/build/linux_arm64", "--openssldir=" + old_cur_dir + "/build/linux_arm64"])
       base.replaceInFile("./Makefile", "CFLAGS=-Wall -O3", "CFLAGS=-Wall -O3 -fvisibility=hidden")
       base.replaceInFile("./Makefile", "CXXFLAGS=-Wall -O3", "CXXFLAGS=-Wall -O3 -fvisibility=hidden")
       base.cmd("make", [], True)
       base.cmd("make", ["install"], True)
 
   if (-1 != config.option("platform").find("mac")) and not base.is_dir("../build/mac_64"):
-    base.cmd("./Configure", ["no-shared", "no-asm", "darwin64-x86_64-cc", "--prefix=" + old_cur_dir + "/build/mac_64", "--openssldir=" + old_cur_dir + "/build/mac_64", "-mmacosx-version-min=10.11"])
+    base.cmd("./Configure", ["enable-md2", "no-shared", "no-asm", "darwin64-x86_64-cc", "--prefix=" + old_cur_dir + "/build/mac_64", "--openssldir=" + old_cur_dir + "/build/mac_64", "-mmacosx-version-min=10.11"])
     base.cmd("make", ["build_libs", "install"])
 
   if (-1 != config.option("platform").find("mac")) and not base.is_dir("../build/mac_arm64"):
@@ -119,7 +120,7 @@ def make():
     },\n\
     \"darwin64-x86_64-cc\" => {"
     base.replaceInFile(base_dir + "/openssl2/Configurations/10-main.conf", replace1, replace2)
-    base.cmd("./Configure", ["no-shared", "no-asm", "darwin64-arm64-cc", "--prefix=" + old_cur_dir + "/build/mac_arm64", "--openssldir=" + old_cur_dir + "/build/mac_arm64"])
+    base.cmd("./Configure", ["enable-md2", "no-shared", "no-asm", "darwin64-arm64-cc", "--prefix=" + old_cur_dir + "/build/mac_arm64", "--openssldir=" + old_cur_dir + "/build/mac_arm64"])
     base.cmd("make", ["build_libs", "install"])
 
   os.chdir(old_cur)

scripts/core_common/modules/v8.py

@@ -68,9 +68,9 @@ def make():
   if ("mac" == base.host_platform()) and (-1 == config.option("config").find("use_v8")):
     return
 
-  use_v8_89 = False
-  if (-1 != config.option("config").lower().find("v8_version_89")):
-    use_v8_89 = True
+  use_v8_89 = True
+  if config.check_option("config", "v8_version_60"):
+    use_v8_89 = False
 
   if (use_v8_89):
     v8_89.make()
@@ -179,6 +179,7 @@ def make():
     base.cmd2("gn", ["gen", "out.gn/mac_64", "--args=\"is_debug=false " + base_args64 + "\""])
     base.cmd("ninja", ["-C", "out.gn/mac_64"])
 
+  # add enable_iterator_debugging=false for disable _ITERATOR_DEBUG_LEVEL
   if config.check_option("platform", "win_64"):
     if (-1 != config.option("config").lower().find("debug")):
       base.cmd2("gn", ["gen", "out.gn/win_64/debug", "--args=\"is_debug=true " + base_args64 + " is_clang=false\""])
@@ -265,6 +266,7 @@ def make_xp():
     "  replaceInFile(file, '<RuntimeLibrary>MultiThreaded</RuntimeLibrary>', '<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>')",
     ]);
 
+  # add "SET CL=\"/D_ITERATOR_DEBUG_LEVEL=0\"" before devenv for disable _ITERATOR_DEBUG_LEVEL in debug
   if config.check_option("platform", "win_64_xp"):
     if not base.is_dir("win_64/release"):
       base.run_as_bat(["call python v8/build/gyp_v8 -Dtarget_arch=x64", "call python v8/build/common_xp.py", "call devenv v8/tools/gyp/v8.sln /Rebuild Release"])

scripts/core_common/modules/v8_89.patch

@@ -0,0 +1,37 @@
+class StrongRootBlockAllocator {
+ public:
+  using pointer = Address*;
+  using const_pointer = const Address*;
+  using reference = Address&;
+  using const_reference = const Address&;
+  using value_type = Address;
+  using size_type = size_t;
+  using difference_type = ptrdiff_t;
+  template <class U>
+  struct rebind;
+
+  explicit StrongRootBlockAllocator(Heap* heap) : heap_(heap) {}
+
+  Address* allocate(size_t n);
+  void deallocate(Address* p, size_t n) noexcept;
+
+ private:
+  Heap* heap_;
+};
+
+// Rebinding to Address gives another StrongRootBlockAllocator.
+template <>
+struct StrongRootBlockAllocator::rebind<Address> {
+  using other = StrongRootBlockAllocator;
+};
+
+// Rebinding to something other than Address gives a std::allocator that
+// is copy-constructable from StrongRootBlockAllocator.
+template <class U>
+struct StrongRootBlockAllocator::rebind {
+  class other : public std::allocator<U> {
+   public:
+    // NOLINTNEXTLINE
+    other(const StrongRootBlockAllocator&) {}
+  };
+};

scripts/core_common/modules/v8_89.py

@@ -24,6 +24,8 @@ def make_args(args, platform, is_64=True, is_debug=False):
   
   if is_debug:
     args_copy.append("is_debug=true")
+    if (platform == "windows"):
+      args_copy.append("enable_iterator_debugging=true")
   else:
     args_copy.append("is_debug=false")
   
@@ -31,7 +33,7 @@ def make_args(args, platform, is_64=True, is_debug=False):
     args_copy.append("is_clang=true")
     args_copy.append("use_sysroot=false")
   if (platform == "windows"):
-    args_copy.append("is_clang=false")    
+    args_copy.append("is_clang=false")
 
   return "--args=\"" + " ".join(args_copy) + "\""
 
@@ -50,6 +52,28 @@ def ninja_windows_make(args, is_64=True, is_debug=False):
   base.move_file("./" + directory_out + "/obj/v8_wrappers.ninja.bak", "./" + directory_out + "/obj/v8_wrappers.ninja")
   return
 
+# patch v8 for build ---------------------------------------------------
+def patch_windows_debug():
+  # v8 8.9 version does not built with enable_iterator_debugging flag
+  # patch heap.h file:
+  file_patch = "./src/heap/heap.h"
+  base.copy_file(file_patch, file_patch + ".bak")
+  content_old = base.readFile(file_patch)
+  posStart = content_old.find("class StrongRootBlockAllocator {")
+  posEnd = content_old.find("};", posStart + 1)
+  posEnd = content_old.find("};", posEnd + 1)
+  content = content_old[0:posStart]
+  content += base.readFile("./../../../../../build_tools/scripts/core_common/modules/v8_89.patch")
+  content += content_old[posEnd + 2:]
+  base.writeFile(file_patch, content)
+  return
+
+def unpatch_windows_debug():
+  file_patch = "./src/heap/heap.h"
+  base.move_file(file_patch + ".bak", file_patch)
+  return
+# ----------------------------------------------------------------------
+
 def make():
   old_env = dict(os.environ)
   old_cur = os.getcwd()
@@ -85,6 +109,10 @@ def make():
     if not base.is_file("v8/src/base/platform/wrappers.cc"):
       base.writeFile("v8/src/base/platform/wrappers.cc", "#include \"src/base/platform/wrappers.h\"\n")
 
+  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")
+
   os.chdir("v8")
   
   gn_args = ["v8_static_library=true",
@@ -114,7 +142,9 @@ def make():
   if config.check_option("platform", "win_64"):
     if (-1 != config.option("config").lower().find("debug")):
       if not base.is_file("out.gn/win_64/debug/obj/v8_monolith.lib"):
+        patch_windows_debug()
         ninja_windows_make(gn_args, True, True)
+        unpatch_windows_debug()
 
     if not base.is_file("out.gn/win_64/release/obj/v8_monolith.lib"):
       ninja_windows_make(gn_args)
@@ -122,7 +152,9 @@ def make():
   if config.check_option("platform", "win_32"):
     if (-1 != config.option("config").lower().find("debug")):
       if not base.is_file("out.gn/win_32/debug/obj/v8_monolith.lib"):
+        patch_windows_debug()
         ninja_windows_make(gn_args, False, True)
+        unpatch_windows_debug()
 
     if not base.is_file("out.gn/win_32/release/obj/v8_monolith.lib"):
       ninja_windows_make(gn_args, False)

scripts/deploy_builder.py

@@ -51,8 +51,8 @@ def make():
     else:
       base.copy_exe(core_build_dir + "/bin/" + platform_postfix, root_dir, "x2t")
 
-    if (native_platform == "linux_64"):
-      base.generate_check_linux_system(git_dir + "/build_tools", root_dir)
+    #if (native_platform == "linux_64"):
+    #  base.generate_check_linux_system(git_dir + "/build_tools", root_dir)
 
     # icu
     if (0 == platform.find("win")):
@@ -92,6 +92,8 @@ def make():
     base.create_dir(root_dir + "/include")
     base.copy_file(core_dir + "/DesktopEditor/doctrenderer/common_deploy.h", root_dir + "/include/common.h")
     base.copy_file(core_dir + "/DesktopEditor/doctrenderer/docbuilder.h", root_dir + "/include/docbuilder.h")
+    if (0 == platform.find("win")):
+      base.copy_file(core_dir + "/DesktopEditor/doctrenderer/docbuilder.com/src/docbuilder_midl.h", root_dir + "/include/docbuilder_midl.h")
     base.replaceInFile(root_dir + "/include/docbuilder.h", "Q_DECL_EXPORT", "BUILDING_DOCBUILDER")
     
     if ("win_64" == platform):

scripts/deploy_desktop.py

@@ -4,6 +4,33 @@ import config
 import base
 import os
 import platform
+import glob
+
+def deploy_marketplace_plugin(git_dir, root_dir):
+  # old manager
+  #base.copy_sdkjs_plugin(git_dir + "/desktop-sdk/ChromiumBasedEditors/plugins", root_dir + "/editors/sdkjs-plugins", "manager", True)
+
+  # plugin manager with local paths
+  sys_plugins_dir = root_dir + "/editors/sdkjs-plugins"
+  base.clone_marketplace_plugin(sys_plugins_dir, True, True, False, "K0R0L")
+      
+  # store with local paths
+  manager_dir = sys_plugins_dir + "/{AA2EA9B6-9EC2-415F-9762-634EE8D9A95E}"
+  
+  store_dir_path = manager_dir + "/store"
+  if base.is_dir(store_dir_path):
+    base.delete_dir(store_dir_path)
+  base.create_dir(store_dir_path)
+  
+  base.copy_dir_content(sys_plugins_dir + "/onlyoffice.github.io/store", store_dir_path, "", ".git")
+  base.delete_dir(store_dir_path + "/plugin")
+  base.delete_file(store_dir_path + "/build.bat")
+  
+  for file in glob.glob(store_dir_path + "/*.html"):
+    base.replaceInFile(file, "https://onlyoffice.github.io/sdkjs-plugins/", "../../")
+      
+  base.delete_dir_with_access_error(sys_plugins_dir + "/onlyoffice.github.io")
+  return
 
 def make():
   base_dir = base.get_script_dir() + "/../out"
@@ -55,21 +82,20 @@ def make():
     base.copy_lib(core_build_dir + "/lib/" + platform_postfix, root_dir + "/converter", "Fb2File")
     base.copy_lib(core_build_dir + "/lib/" + platform_postfix, root_dir + "/converter", "EpubFile")
     base.copy_lib(core_build_dir + "/lib/" + platform_postfix, root_dir + "/converter", "DocxRenderer")
-    base.copy_file(git_dir + "/sdkjs/pdf/src/engine/cmap.bin", root_dir + "/cmap.bin")
-
+    
     if ("ios" == platform):
       base.copy_lib(core_build_dir + "/lib/" + platform_postfix, root_dir + "/converter", "x2t")
     else:
       base.copy_exe(core_build_dir + "/bin/" + platform_postfix, root_dir + "/converter", "x2t")
 
-    if (native_platform == "linux_64"):
-      base.generate_check_linux_system(git_dir + "/build_tools", root_dir + "/converter")
+    #if (native_platform == "linux_64"):
+    #  base.generate_check_linux_system(git_dir + "/build_tools", root_dir + "/converter")
 
     # icu
     if (0 == platform.find("win")):
       base.copy_file(core_dir + "/Common/3dParty/icu/" + platform + "/build/icudt58.dll", root_dir + "/converter/icudt58.dll")
       base.copy_file(core_dir + "/Common/3dParty/icu/" + platform + "/build/icuuc58.dll", root_dir + "/converter/icuuc58.dll")
-      base.copy_file(git_dir + "/desktop-apps/common/converter/package.config", root_dir + "/converter/package.config")
+      #base.copy_file(git_dir + "/desktop-apps/common/converter/package.config", root_dir + "/converter/package.config")
 
     if (0 == platform.find("linux")):
       base.copy_file(core_dir + "/Common/3dParty/icu/" + platform + "/build/libicudata.so.58", root_dir + "/converter/libicudata.so.58")
@@ -97,10 +123,14 @@ def make():
     base.copy_file(git_dir + "/desktop-apps/common/package/license/3dparty/3DPARTYLICENSE", root_dir + "/3DPARTYLICENSE")
   
     # cef
+    build_dir_name = "build"
+    if (0 == platform.find("linux")) and (config.check_option("config", "cef_version_107")):
+      build_dir_name = "build_107"
+
     if not isWindowsXP:
-      base.copy_files(core_dir + "/Common/3dParty/cef/" + platform + "/build/*", root_dir)
+      base.copy_files(core_dir + "/Common/3dParty/cef/" + platform + "/" + build_dir_name + "/*", root_dir)
     else:
-      base.copy_files(core_dir + "/Common/3dParty/cef/" + native_platform + "/build/*", root_dir)
+      base.copy_files(core_dir + "/Common/3dParty/cef/" + native_platform + "/" + build_dir_name + "/*", root_dir)
 
     isUseQt = True
     if (0 == platform.find("mac")) or (0 == platform.find("ios")):
@@ -152,6 +182,8 @@ def make():
 
       if (0 == platform.find("win")):
         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/" + 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")):
@@ -190,16 +222,14 @@ def make():
     root_help_dir = root_dir + "-help"
     if (base.is_dir(root_help_dir)):
       base.delete_dir(root_help_dir)
-    for i in ["documenteditor", "presentationeditor", "spreadsheeteditor"]:
+    for i in ["common", "documenteditor", "presentationeditor", "spreadsheeteditor"]:
       base.copy_dir(
           base_dir + "/js/" + branding + "/desktop/web-apps/apps/%s/main/resources/help" % i,
           root_help_dir + "/editors/web-apps/apps/%s/main/resources/help" % i)
 
-    if ("1" != config.option("preinstalled-help") and not isWindowsXP):
-      # remove help from install until web-apps containes help
-      base.delete_dir(root_dir + "/editors/web-apps/apps/documenteditor/main/resources/help")
-      base.delete_dir(root_dir + "/editors/web-apps/apps/presentationeditor/main/resources/help")
-      base.delete_dir(root_dir + "/editors/web-apps/apps/spreadsheeteditor/main/resources/help")
+      if ("1" != config.option("preinstalled-help") and not isWindowsXP):
+        # remove help from install until web-apps containes help
+        base.delete_dir(root_dir + "/editors/web-apps/apps/%s/main/resources/help" % i)
 
     base.create_dir(root_dir + "/editors/sdkjs-plugins")
     base.copy_sdkjs_plugins(root_dir + "/editors/sdkjs-plugins", True, True)
@@ -214,14 +244,20 @@ def make():
     base.download("https://onlyoffice.github.io/sdkjs-plugins/v1/plugins.css", root_dir + "/editors/sdkjs-plugins/v1/plugins.css")
     base.support_old_versions_plugins(root_dir + "/editors/sdkjs-plugins")
 
-    base.copy_sdkjs_plugin(git_dir + "/desktop-sdk/ChromiumBasedEditors/plugins", root_dir + "/editors/sdkjs-plugins", "manager", True)
     base.copy_sdkjs_plugin(git_dir + "/desktop-sdk/ChromiumBasedEditors/plugins/encrypt", root_dir + "/editors/sdkjs-plugins", "advanced2", True)
     #base.copy_dir(git_dir + "/desktop-sdk/ChromiumBasedEditors/plugins/encrypt/ui/common/{14A8FC87-8E26-4216-B34E-F27F053B2EC4}", root_dir + "/editors/sdkjs-plugins/{14A8FC87-8E26-4216-B34E-F27F053B2EC4}")
     #base.copy_dir(git_dir + "/desktop-sdk/ChromiumBasedEditors/plugins/encrypt/ui/engine/database/{9AB4BBA8-A7E5-48D5-B683-ECE76A020BB1}", root_dir + "/editors/sdkjs-plugins/{9AB4BBA8-A7E5-48D5-B683-ECE76A020BB1}")
     base.copy_sdkjs_plugin(git_dir + "/desktop-sdk/ChromiumBasedEditors/plugins", root_dir + "/editors/sdkjs-plugins", "sendto", True)
-
+    
+    deploy_marketplace_plugin(git_dir, root_dir)
+    
     base.copy_file(base_dir + "/js/" + branding + "/desktop/index.html", root_dir + "/index.html")
-    base.copy_dir(git_dir + "/desktop-apps/common/loginpage/providers", root_dir + "/providers")
+
+    if isWindowsXP:
+      base.create_dir(root_dir + "/providers")
+      base.copy_dir(git_dir + "/desktop-apps/common/loginpage/providers/onlyoffice", root_dir + "/providers/onlyoffice")
+    else:
+      base.copy_dir(git_dir + "/desktop-apps/common/loginpage/providers", root_dir + "/providers")
 
     isUseJSC = False
     if (0 == platform.find("mac")):

scripts/deploy_server.py

@@ -87,8 +87,8 @@ def make():
     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")
 
-    if (native_platform == "linux_64"):
-      base.generate_check_linux_system(git_dir + "/build_tools", converter_dir)
+    #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")
 

scripts/develop/dependence.py

@@ -209,18 +209,24 @@ def check_java():
   dependence = CDependencies()
 
   base.print_info('Check installed Java')
-  java_version = base.run_command('java -version')['stderr']
+  java_info = base.run_command('java -version')['stderr']
 
-  if (java_version.find('64-Bit') != -1):
+  version_pos = java_info.find('version "')
+  java_v = 0
+  if (version_pos != -1):
+    try:
+      java_v = float(java_info[version_pos + len('version "'): version_pos + len('version "') + 2])
+    except:
+      pass
+
+  if (java_info.find('64-Bit') != -1 and java_v >= 11):
     print('Installed Java is valid')
-    return dependence
-
-  if (java_version.find('32-Bit') != -1):
-    print('Installed Java must be x64')
-  else:
-    print('Java not found')
-
-  dependence.append_install('Java')
+  else: 
+    print('Requires Java version 11+ x64-bit')
+    dependence.append_install('Java')
+    if (version_pos != -1):
+      dependence.append_uninstall('Java')
+  
   return dependence
 
 def get_erlang_path_to_bin():
@@ -825,6 +831,7 @@ def installProgram(sName):
       print(install_command)
       code = os.system(install_command)
       base.delete_file(file_name)
+      
   elif (host_platform == 'linux'):
     if (sName in install_special):
       code = install_special[sName]()
@@ -909,7 +916,7 @@ downloads_list = {
   'Windows': {
     'Git': 'https://github.com/git-for-windows/git/releases/download/v2.29.0.windows.1/Git-2.29.0-64-bit.exe',
     'Node.js': 'https://nodejs.org/download/release/v14.17.6/node-v14.17.6-x64.msi',
-    'Java': 'https://javadl.oracle.com/webapps/download/AutoDL?BundleId=242990_a4634525489241b9a9e1aa73d9e118e6',
+    'Java': 'https://aka.ms/download-jdk/microsoft-jdk-11.0.18-windows-x64.msi',
     'RabbitMQ': 'https://github.com/rabbitmq/rabbitmq-server/releases/download/v3.8.9/rabbitmq-server-3.8.9.exe',
     'Erlang': 'http://erlang.org/download/otp_win64_23.1.exe',
     'VC2019x64': 'https://aka.ms/vs/17/release/vc_redist.x64.exe',
@@ -944,7 +951,6 @@ uninstall_special = {
 install_params = {
   'BuildTools': '--add Microsoft.VisualStudio.Workload.VCTools --includeRecommended --quiet --wait',
   'Git': '/VERYSILENT /NORESTART',
-  'Java': '/s',
   'MySQLServer': {
     'port': '3306',
 	'user': 'root',
@@ -963,4 +969,3 @@ install_params = {
 uninstall_params = {
   'PostgreSQL': '--mode unattended --unattendedmodeui none'
 }
-

scripts/package_branding.py

@@ -16,7 +16,7 @@ s3_base_url = "https://s3.eu-west-1.amazonaws.com/repo-doc-onlyoffice-com"
 if utils.is_windows():
   desktop_product_name = "Desktop Editors"
   desktop_product_name_s = desktop_product_name.replace(" ","")
-  desktop_package_name = company_name + "_" + desktop_product_name_s
+  desktop_package_name = company_name + "-" + desktop_product_name_s
   desktop_vcredist_list = ["2022"]
   desktop_update_changes_list = {
     "en": "changes",

scripts/package_builder.py

@@ -36,10 +36,7 @@ def aws_s3_upload(files, key, ptype=None):
     if upload and ptype is not None:
       full_key = key
       if full_key.endswith("/"): full_key += utils.get_basename(file)
-      utils.add_deploy_data(
-          "builder", ptype, file, full_key,
-          branding.s3_bucket, branding.s3_region
-      )
+      utils.add_deploy_data("builder", ptype, file, full_key)
   return ret
 
 def make_windows():
@@ -47,19 +44,17 @@ def make_windows():
   utils.set_cwd("document-builder-package")
 
   prefix = common.platforms[common.platform]["prefix"]
-  company = branding.company_name.lower()
-  product = branding.builder_product_name.replace(" ","").lower()
+  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_name = company + "-" + product
   package_version = common.version + "." + common.build
   suffix = {
     "windows_x64": "x64",
-    "windows_x86": "x86",
-    "windows_x64_xp": "x64_xp",
-    "windows_x86_xp": "x86_xp"
+    "windows_x86": "x86"
   }[common.platform]
-  zip_file = "%s_%s_%s.zip" % (package_name, package_version, suffix)
-  inno_file = "%s_%s_%s.exe" % (package_name, package_version, suffix)
+  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")
@@ -85,9 +80,7 @@ def make_zip():
 
   if common.deploy and ret:
     utils.log_h2("builder zip deploy")
-    ret = aws_s3_upload(
-        ["build\\" + zip_file], "win/generic/%s/" % common.channel, "Portable"
-    )
+    ret = aws_s3_upload(["build\\" + zip_file], "win/generic/", "Portable")
     utils.set_summary("builder zip deploy", ret)
   return
 
@@ -96,25 +89,27 @@ def make_inno():
   utils.log_h3(inno_file)
 
   args = [
-    "-Arch " + suffix,
-    "-Version " + common.version,
-    "-Build " + common.build
+    "-Arch", suffix,
+    "-Version", common.version,
+    "-Build", common.build
   ]
   if not branding.onlyoffice:
-    args.append("-Branding '..\\..\\%s\\document-builder-package\\exe'" % common.branding)
+    args += [
+      "-Branding", "%s\\%s\\document-builder-package\\exe" % (common.workspace_dir, common.branding)
+    ]
   if common.sign:
-    args.append("-Sign")
-    args.append("-CertName '%s'" % branding.cert_name)
+    args += [
+      "-Sign",
+      "-CertName", branding.cert_name
+    ]
   ret = utils.ps1(
-      ".\\make_inno.ps1", args, creates="build\\" + inno_file, verbose=True
+      "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 = aws_s3_upload(
-        ["build\\" + inno_file], "win/inno/%s/" % common.channel, "Installer"
-    )
+    ret = aws_s3_upload(["build\\" + inno_file], "win/inno/", "Installer")
     utils.set_summary("builder inno deploy", ret)
   return
 
@@ -140,24 +135,21 @@ def make_linux():
         utils.log_h2("builder tar deploy")
         ret = aws_s3_upload(
             utils.glob_path("tar/*.tar.gz"),
-            "linux/generic/%s/" % common.channel,
-            "Portable"
+            "linux/generic/", "Portable"
         )
         utils.set_summary("builder tar deploy", ret)
       if "deb" in branding.builder_make_targets:
         utils.log_h2("builder deb deploy")
         ret = aws_s3_upload(
             utils.glob_path("deb/*.deb"),
-            "linux/debian/%s/" % common.channel,
-            "Debian"
+            "linux/debian/", "Debian"
         )
         utils.set_summary("builder deb deploy", ret)
       if "rpm" in branding.builder_make_targets:
         utils.log_h2("builder rpm deploy")
         ret = aws_s3_upload(
             utils.glob_path("rpm/builddir/RPMS/" + rpm_arch + "/*.rpm"),
-            "linux/rhel/%s/" % common.channel,
-            "CentOS"
+            "linux/rhel/", "CentOS"
         )
         utils.set_summary("builder rpm deploy", ret)
     else:

scripts/package_common.py

@@ -19,11 +19,11 @@ vcredist_links = {
   "2022": {
     "x64": {
       "url": "https://aka.ms/vs/17/release/vc_redist.x64.exe",
-      "md5": "703bd677778f2a1ba1eb4338bac3b868"
+      "md5": "119dde89a20674349a51893114eae5ed"
     },
     "x86": {
       "url": "https://aka.ms/vs/17/release/vc_redist.x86.exe",
-      "md5": "732d0ac9cd31b8136f1c8e72efec1636"
+      "md5": "ca8c521c30f57c0c199d526b9a23fc4a"
     }
   },
   "2015": {

scripts/package_core.py

@@ -46,7 +46,7 @@ def make_core():
   else:
     ret = utils.sh(" ".join(args), verbose=True)
   if ret:
-    utils.add_deploy_data("core", "Archive", core_7z, dest_version + "core.7z", branding.s3_bucket, branding.s3_region)
+    utils.add_deploy_data("core", "Archive", core_7z, dest_version + "core.7z")
     args = ["aws", "s3", "sync", "--delete",
             "--acl", "public-read", "--no-progress",
             "s3://" + branding.s3_bucket + "/" + dest_version,
@@ -57,3 +57,37 @@ def make_core():
       ret &= utils.sh(" ".join(args), verbose=True)
   utils.set_summary("core deploy", ret)
   return
+
+def deploy_closure_maps(license):
+  if not common.deploy: return
+  utils.log_h1("CLOSURE MAPS")
+  utils.set_cwd(utils.get_path("sdkjs/build/maps"))
+
+  maps = utils.glob_path("*.js.map")
+  if not maps:
+    utils.log_err("files do not exist")
+    utils.set_summary("closure maps " + license + " deploy", False)
+    return
+
+  utils.log_h2("closure maps " + license + " deploy")
+  dest = "closure-maps/%s/%s/%s" % (common.version, common.build, license)
+  ret = True
+  for file in maps:
+    args = ["aws"]
+    if hasattr(branding, "s3_endpoint_url"):
+      args += ["--endpoint-url=" + branding.s3_endpoint_url]
+    args += [
+      "s3", "cp", "--no-progress", file,
+      "s3://" + branding.s3_bucket + "/" + dest + "/"
+    ]
+    if common.os_family == "windows":
+      upload = utils.cmd(*args, verbose=True)
+    else:
+      upload = utils.sh(" ".join(args), verbose=True)
+    ret &= upload
+    if upload:
+      utils.add_deploy_data("core", "Closure maps " + license, file, dest + "/" + file)
+  utils.set_summary("closure maps " + license + " deploy", ret)
+
+  utils.set_cwd(common.workspace_dir)
+  return

scripts/package_desktop.py

@@ -39,10 +39,7 @@ def aws_s3_upload(files, key, ptype=None):
     if upload and ptype is not None:
       full_key = key
       if full_key.endswith("/"): full_key += utils.get_basename(file)
-      utils.add_deploy_data(
-          "desktop", ptype, file, full_key,
-          branding.s3_bucket, branding.s3_region
-      )
+      utils.add_deploy_data("desktop", ptype, file, full_key)
   return ret
 
 #
@@ -56,8 +53,8 @@ def make_windows():
   utils.set_cwd("desktop-apps\\win-linux\\package\\windows")
 
   prefix = common.platforms[common.platform]["prefix"]
-  company = branding.company_name.lower()
-  product = branding.desktop_product_name.replace(" ","").lower()
+  company = branding.company_name
+  product = branding.desktop_product_name.replace(" ","")
   package_name = branding.desktop_package_name
   package_version = common.version + "." + common.build
   source_dir = "..\\..\\..\\..\\build_tools\\out\\%s\\%s\\%s" % (prefix, company, product)
@@ -75,15 +72,16 @@ def make_windows():
     "windows_x86_xp": "32"
   }
   suffix = arch_list[common.platform]
-  if common.platform.endswith("_xp"): suffix += "_xp"
-  zip_file = "%s_%s_%s.zip" % (package_name, package_version, suffix)
-  inno_file = "%s_%s_%s.exe" % (package_name, package_version, suffix)
-  inno_help_file = "%s_Help_%s_%s.exe" % (package_name, package_version, suffix)
-  inno_update_file = "update\\editors_update_%s.exe" % suffix
-  advinst_file = "%s_%s_%s.msi" % (package_name, package_version, suffix)
+  if common.platform.endswith("_xp"): suffix += "-xp"
+  zip_file = "build\\%s-%s-%s.zip" % (package_name, package_version, suffix)
+  inno_file = "%s-%s-%s.exe" % (package_name, package_version, suffix)
+  inno_help_file = "%s-Help-%s-%s.exe" % (package_name, package_version, suffix)
+  inno_update_file = "update\\editors_update_%s.exe" % suffix.replace("-","_")
+  advinst_file = "%s-%s-%s.msi" % (package_name, package_version, suffix)
 
   if common.clean:
     utils.log_h2("desktop clean")
+    utils.delete_dir("build")
     # utils.delete_dir("data\\vcredist")
     utils.delete_dir("DesktopEditors-cache")
     utils.delete_files("*.exe")
@@ -95,6 +93,12 @@ def make_windows():
     utils.delete_files("update\\*.xml")
     utils.delete_files("update\\*.html")
 
+  utils.log_h2("copy arifacts")
+  utils.create_dir("build\\desktop")
+  utils.create_dir("build\\help")
+  utils.copy_dir_content(source_dir, "build\\desktop\\")
+  utils.copy_dir_content(source_help_dir, "build\\help\\")
+
   make_zip()
 
   vcdl = True
@@ -114,8 +118,6 @@ def make_windows():
   if branding.onlyoffice and common.platform in ["windows_x64", "windows_x86"]:
     make_inno_help()
 
-  make_inno_update()
-
   if common.platform == "windows_x64":
     make_update_files()
 
@@ -127,19 +129,21 @@ def make_windows():
 
 def make_zip():
   utils.log_h2("desktop zip build")
-  ret = utils.cmd(
-      "7z", "a", "-y", zip_file, source_dir + "\\*",
-      creates=zip_file, verbose=True
+
+  args = ["-OutFile", zip_file]
+  if common.sign:
+    args += [
+      "-Sign",
+      "-CertName", branding.cert_name
+    ]
+  ret = utils.ps1(
+      "make_zip.ps1", args, creates=zip_file, verbose=True
   )
   utils.set_summary("desktop zip build", ret)
 
   if common.deploy and ret:
     utils.log_h2("desktop zip deploy")
-    ret = aws_s3_upload(
-        [zip_file],
-        "win/generic/%s/" % common.channel,
-        "Portable"
-    )
+    ret = aws_s3_upload([zip_file], "win/generic/", "Portable")
     utils.set_summary("desktop zip deploy", ret)
   return
 
@@ -177,7 +181,7 @@ def make_inno():
     iscc_args.append("/D_WIN_XP=1")
   if common.sign:
     iscc_args.append("/DENABLE_SIGNING=1")
-    iscc_args.append("/Sbyparam=signtool.exe sign /v /n $q" + \
+    iscc_args.append("/Sbyparam=signtool.exe sign /a /v /n $q" + \
         branding.cert_name + "$q /t " + common.tsa_server + " $f")
   args = ["iscc"] + iscc_args + ["common.iss"]
   ret = utils.cmd(*args, creates=inno_file, verbose=True)
@@ -191,6 +195,14 @@ def make_inno():
         "Installer"
     )
     utils.set_summary("desktop inno deploy", ret)
+
+    utils.log_h2("desktop inno update deploy")
+    ret = aws_s3_upload(
+        [inno_file],
+        "win/inno/%s/%s/%s" % (common.version, common.build, utils.get_basename(inno_update_file)),
+        "Installer"
+    )
+    utils.set_summary("desktop inno update deploy", ret)
   return
 
 def make_inno_help():
@@ -211,7 +223,7 @@ def make_inno_help():
         utils.get_abspath(common.workspace_dir + "\\" + common.branding + "\\desktop-apps"))
   if common.sign:
     args.append("/DENABLE_SIGNING=1")
-    args.append("/Sbyparam=signtool.exe sign /v /n $q" + \
+    args.append("/Sbyparam=signtool.exe sign /a /v /n $q" + \
         branding.cert_name + "$q /t " + common.tsa_server + " $f")
   args.append("help.iss")
   ret = utils.cmd(*args, creates=inno_help_file, verbose=True)
@@ -227,24 +239,6 @@ def make_inno_help():
     utils.set_summary("desktop inno help deploy", ret)
   return
 
-def make_inno_update():
-  utils.log_h2("desktop inno update build")
-  utils.log_h3(inno_update_file)
-
-  args = ["iscc"] + iscc_args + ["/DTARGET_NAME=" + inno_file, "update_common.iss"]
-  ret = utils.cmd(*args, creates=inno_update_file, verbose=True)
-  utils.set_summary("desktop inno update build", ret)
-
-  if common.deploy and ret:
-    utils.log_h2("desktop inno update deploy")
-    ret = aws_s3_upload(
-        [inno_update_file],
-        "win/inno/%s/%s/" % (common.version, common.build),
-        "WinSparkle"
-    )
-    utils.set_summary("desktop inno update deploy", ret)
-  return
-
 def make_update_files():
   utils.log_h2("desktop update files build")
 
@@ -267,7 +261,7 @@ def make_update_files():
     "-UpdatesUrlPrefix", branding.desktop_updates_url,
     "-ReleaseNotesUrlPrefix", branding.desktop_changes_url
   ]
-  appcast_test_base_url = "%s/win/inno/%s/%s" % (branding.s3_base_url, common.version, common.build)
+  appcast_test_base_url = "%s/desktop/win/inno/%s/%s" % (branding.s3_base_url, common.version, common.build)
   appcast_test_args = [
     "-UpdatesUrlPrefix", appcast_test_base_url,
     "-ReleaseNotesUrlPrefix", appcast_test_base_url
@@ -390,6 +384,7 @@ def make_advinst():
     "SetCurrentFeature MainFeature",
     "NewSync APPDIR " + source_dir,
     "UpdateFile APPDIR\\DesktopEditors.exe " + source_dir + "\\DesktopEditors.exe",
+    "UpdateFile APPDIR\\updatesvc.exe " + source_dir + "\\updatesvc.exe",
     "SetVersion " + package_version,
     "SetPackageName " + advinst_file + " -buildname DefaultBuild",
     "Rebuild -buildslist DefaultBuild"
@@ -401,11 +396,7 @@ def make_advinst():
 
   if common.deploy and ret:
     utils.log_h2("desktop advinst deploy")
-    ret = aws_s3_upload(
-        [advinst_file],
-        "win/advinst/%s/" % common.channel,
-        "Installer"
-    )
+    ret = aws_s3_upload([advinst_file], "win/advinst/", "Installer")
     utils.set_summary("desktop advinst deploy", ret)
   return
 
@@ -432,41 +423,37 @@ def make_macos():
   utils.set_cwd(branding_dir)
 
   if common.clean:
-    utils.log("\n=== Clean\n")
+    utils.log_h2("clean")
     utils.delete_dir(utils.get_env("HOME") + "/Library/Developer/Xcode/Archives")
     utils.delete_dir(utils.get_env("HOME") + "/Library/Caches/Sparkle_generate_appcast")
 
-  plist_path = "%s/%s/ONLYOFFICE/Resources/%s-%s/Info.plist" \
-      % (common.workspace_dir, branding.desktop_branding_dir, branding.desktop_package_name, suffix)
-  current_version = utils.sh_output(
-    '/usr/libexec/PlistBuddy -c "Print :CFBundleShortVersionString" ' + plist_path,
-    verbose=True).rstrip()
-  current_build = utils.sh_output(
-    '/usr/libexec/PlistBuddy -c "Print :CFBundleVersion" ' + plist_path,
-    verbose=True).rstrip()
-  app_version = current_version
-
   appcast_url = branding.sparkle_base_url + "/" + suffix + "/" + branding.desktop_package_name.lower() + ".xml"
-  release_version = utils.sh_output(
+  release_bundle_version_string = utils.sh_output(
     'curl -Ls ' + appcast_url + ' 2> /dev/null' \
     + ' | xmllint --xpath "/rss/channel/item[1]/enclosure/@*[name()=\'sparkle:shortVersionString\']" -' \
     + ' | cut -f2 -d\\\"',
     verbose=True).rstrip()
-  release_build = utils.sh_output(
+  release_bundle_version = utils.sh_output(
     'curl -Ls ' + appcast_url + ' 2> /dev/null' \
     + ' | xmllint --xpath "/rss/channel/item[1]/enclosure/@*[name()=\'sparkle:version\']" -' \
     + ' | cut -f2 -d\\\"',
     verbose=True).rstrip()
 
-  utils.log("CURRENT=" + current_version + "(" + current_build + ")" \
-        + "\nRELEASE=" + release_version + "(" + release_build + ")")
+  app_version = common.version
+  bundle_version = str(int(release_bundle_version) + 1)
+  plist_path = "%s/%s/ONLYOFFICE/Resources/%s-%s/Info.plist" \
+      % (common.workspace_dir, branding.desktop_branding_dir, branding.desktop_package_name, suffix)
+  utils.sh('/usr/libexec/PlistBuddy -c "Set :CFBundleShortVersionString %s" %s' \
+      % (common.version, plist_path), verbose=True)
+  utils.sh('/usr/libexec/PlistBuddy -c "Set :CFBundleVersion %s" %s' \
+      % (bundle_version, plist_path), verbose=True)
+
+  utils.log("RELEASE=" + release_bundle_version_string + "(" + release_bundle_version + ")" \
+        + "\nCURRENT=" + common.version + "(" + bundle_version + ")")
 
   dmg = make_dmg()
   if dmg:
-    if int(current_build) > int(release_build):
-      make_sparkle_updates()
-    else:
-      utils.log(release_build + " <= " + current_build)
+    make_sparkle_updates()
 
   utils.set_cwd(common.workspace_dir)
   return
@@ -485,7 +472,7 @@ def make_dmg():
     utils.log_h2("desktop dmg deploy")
     ret = aws_s3_upload(
         utils.glob_path("build/*.dmg"),
-        "mac/%s/%s/%s/" % (suffix, common.version, common.build),
+        "mac/%s/%s/%s/" % (common.version, common.build, suffix),
         "Disk Image"
     )
     utils.set_summary("desktop dmg deploy", ret)
@@ -493,7 +480,7 @@ def make_dmg():
     utils.log_h2("desktop zip deploy")
     ret = aws_s3_upload(
         ["build/%s-%s.zip" % (scheme, app_version)],
-        "mac/%s/%s/%s/" % (suffix, common.version, common.build),
+        "mac/%s/%s/%s/" % (common.version, common.build, suffix),
         "Archive"
     )
     utils.set_summary("desktop zip deploy", ret)
@@ -558,7 +545,7 @@ def make_sparkle_updates():
         utils.glob_path("build/update/*.delta") \
         + utils.glob_path("build/update/*.xml") \
         + utils.glob_path("build/update/*.html"),
-        "mac/%s/%s/%s/" % (suffix, common.version, common.build),
+        "mac/%s/%s/%s/" % (common.version, common.build, suffix),
         "Sparkle"
     )
     utils.set_summary("desktop sparkle files deploy", ret)
@@ -566,7 +553,7 @@ def make_sparkle_updates():
     utils.log_h2("desktop checksums deploy")
     ret = aws_s3_upload(
         utils.glob_path("build/update/*.txt"),
-        "mac/%s/%s/%s/" % (suffix, common.version, common.build),
+        "mac/%s/%s/%s/" % (common.version, common.build, suffix),
         "Checksums"
     )
     utils.set_summary("desktop checksums deploy", ret)
@@ -598,24 +585,21 @@ def make_linux():
       if "tar" in branding.desktop_make_targets:
         ret = aws_s3_upload(
             utils.glob_path("tar/*.tar.gz") + utils.glob_path("tar/*.tar.xz"),
-            "linux/generic/%s/" % common.channel,
-            "Portable"
+            "linux/generic/", "Portable"
         )
         utils.set_summary("desktop tar deploy", ret)
       if "deb" in branding.desktop_make_targets:
         utils.log_h2("desktop deb deploy")
         ret = aws_s3_upload(
             utils.glob_path("deb/*.deb"),
-            "linux/debian/%s/" % common.channel,
-            "Debian"
+            "linux/debian/", "Debian"
         )
         utils.set_summary("desktop deb deploy", ret)
       if "deb-astra" in branding.desktop_make_targets:
         utils.log_h2("desktop deb-astra deploy")
         ret = aws_s3_upload(
             utils.glob_path("deb-astra/*.deb"),
-            "linux/astra/",
-            "Astra Linux Signed"
+            "linux/astra/", "Astra Linux Special Edition"
         )
         utils.set_summary("desktop deb-astra deploy", ret)
       if "rpm" in branding.desktop_make_targets:
@@ -623,8 +607,7 @@ def make_linux():
         ret = aws_s3_upload(
             utils.glob_path("rpm/builddir/RPMS/" + rpm_arch + "/*.rpm") \
             + utils.glob_path("rpm/builddir/RPMS/noarch/*.rpm"),
-            "linux/rhel/%s/" % common.channel,
-            "CentOS"
+            "linux/rhel/", "CentOS"
         )
         utils.set_summary("desktop rpm deploy", ret)
       if "suse-rpm" in branding.desktop_make_targets:
@@ -632,8 +615,7 @@ def make_linux():
         ret = aws_s3_upload(
             utils.glob_path("suse-rpm/builddir/RPMS/" + rpm_arch + "/*.rpm") \
             + utils.glob_path("suse-rpm/builddir/RPMS/noarch/*.rpm"),
-            "linux/suse/%s/" % common.channel,
-            "SUSE Linux"
+            "linux/suse/", "SUSE Linux"
         )
         utils.set_summary("desktop suse-rpm deploy", ret)
       if "apt-rpm" in branding.desktop_make_targets:
@@ -641,8 +623,7 @@ def make_linux():
         ret = aws_s3_upload(
             utils.glob_path("apt-rpm/builddir/RPMS/" + rpm_arch + "/*.rpm") \
             + utils.glob_path("apt-rpm/builddir/RPMS/noarch/*.rpm"),
-            "linux/altlinux/%s/" % common.channel,
-            "ALT Linux"
+            "linux/altlinux/", "ALT Linux"
         )
         utils.set_summary("desktop apt-rpm deploy", ret)
       if "urpmi" in branding.desktop_make_targets:
@@ -650,8 +631,7 @@ def make_linux():
         ret = aws_s3_upload(
             utils.glob_path("urpmi/builddir/RPMS/" + rpm_arch + "/*.rpm") \
             + utils.glob_path("urpmi/builddir/RPMS/noarch/*.rpm"),
-            "linux/rosa/%s/" % common.channel,
-            "ROSA"
+            "linux/rosa/", "ROSA"
         )
         utils.set_summary("desktop urpmi deploy", ret)
     else:

scripts/package_mobile.py

@@ -20,7 +20,7 @@ def make_mobile():
     utils.sh("rm -rfv *.zip", verbose=True)
 
   zip_file = "build-" + common.version + "-" + common.build + ".zip"
-  s3_key = "mobile/android/%s/%s" % (common.channel, zip_file)
+  s3_key = "mobile/android/" + zip_file
 
   utils.log_h2("mobile build")
   ret = utils.sh("zip -r " + zip_file + " ./android* ./js", verbose=True)
@@ -35,10 +35,7 @@ def make_mobile():
           verbose=True
       )
     if ret:
-      utils.add_deploy_data(
-          "mobile", "Android", zip_file, s3_key,
-          branding.s3_bucket, branding.s3_region
-      )
+      utils.add_deploy_data("mobile", "Android", zip_file, s3_key)
     utils.set_summary("mobile deploy", ret)
 
   utils.set_cwd(common.workspace_dir)

scripts/package_server.py

@@ -35,10 +35,7 @@ def aws_s3_upload(files, key, edition, ptype=None):
     if upload and ptype is not None:
       full_key = key
       if full_key.endswith("/"): full_key += utils.get_basename(file)
-      utils.add_deploy_data(
-          "server_" + edition, ptype, file, full_key,
-          branding.s3_bucket, branding.s3_region
-      )
+      utils.add_deploy_data("server_" + edition, ptype, file, full_key)
   return ret
 
 def make_windows(edition):
@@ -62,9 +59,7 @@ def make_windows(edition):
     utils.log_h2("server " + edition + " inno deploy")
     ret = aws_s3_upload(
         utils.glob_path("exe/*.exe"),
-        "win/inno/%s/" % common.channel,
-        edition,
-        "Installer"
+        "win/inno/", edition, "Installer"
     )
     utils.set_summary("server " + edition + " inno deploy", ret)
 
@@ -99,36 +94,28 @@ def make_linux(edition):
         utils.log_h2("server " + edition + " deb deploy")
         ret = aws_s3_upload(
             utils.glob_path("deb/*.deb"),
-            "linux/debian/%s/" % common.channel,
-            edition,
-            "Debian"
+            "linux/debian/", edition, "Debian"
         )
         utils.set_summary("server " + edition + " deb deploy", ret)
       if "rpm" in branding.server_make_targets:
         utils.log_h2("server " + edition + " rpm deploy")
         ret = aws_s3_upload(
             utils.glob_path("rpm/builddir/RPMS/" + rpm_arch + "/*.rpm"),
-            "linux/rhel/%s/" % common.channel,
-            edition,
-            "CentOS"
+            "linux/rhel/", edition, "CentOS"
         )
         utils.set_summary("server " + edition + " rpm deploy", ret)
       if "apt-rpm" in branding.server_make_targets:
         utils.log_h2("server " + edition + " apt-rpm deploy")
         ret = aws_s3_upload(
             utils.glob_path("apt-rpm/builddir/RPMS/" + rpm_arch + "/*.rpm"),
-            "linux/altlinux/%s/" % common.channel,
-            edition,
-            "ALT Linux"
+            "linux/altlinux/", edition, "ALT Linux"
         )
         utils.set_summary("server " + edition + " apt-rpm deploy", ret)
       if "tar" in branding.server_make_targets:
         utils.log_h2("server " + edition + " snap deploy")
         ret = aws_s3_upload(
             utils.glob_path("*.tar.gz"),
-            "linux/generic/%s/" % common.channel,
-            edition,
-            "Snap"
+            "linux/generic/", edition, "Snap"
         )
         utils.set_summary("server " + edition + " snap deploy", ret)
     else:

scripts/package_utils.py

@@ -258,15 +258,13 @@ def set_summary(target, status):
   common.summary.append({target: status})
   return
 
-def add_deploy_data(product, ptype, src, dst, bucket, region):
+def add_deploy_data(product, ptype, src, dst):
   common.deploy_data.append({
     "platform": common.platforms[common.platform]["title"],
     "product": product,
     "type": ptype,
     # "local": get_path(src),
     "size": get_file_size(get_path(src)),
-    "bucket": bucket,
-    "region": region,
     "key": dst
   })
   file = open(get_path(common.workspace_dir + "/deploy.json"), 'w')
@@ -325,7 +323,7 @@ def ps1(file, args=[], **kwargs):
   if kwargs.get("creates") and is_exist(kwargs["creates"]):
     return True
   ret = subprocess.call(
-      ["powershell", file] + args, stderr=subprocess.STDOUT, shell=True
+      ["powershell", "-File", file] + args, stderr=subprocess.STDOUT, shell=True
   ) == 0
   return ret
 

tools/linux/automate.py

@@ -56,9 +56,9 @@ def install_qt():
   base.cmd_in_dir("./qt-everywhere-opensource-src-5.9.9", "make", ["install"])
   return
 
-if not base.is_file("./node_js_setup_10.x"):
+if not base.is_file("./node_js_setup_14.x"):
   print("install dependencies...")
-  deps.install_deps()  
+  deps.install_deps()
 
 if not base.is_dir("./qt_build"):  
   print("install qt...")

tools/linux/deps.py

@@ -54,15 +54,15 @@ def install_deps():
     print("Installed Node.js version: " + str(nodejs_cur_version_major) + "." + str(nodejs_cur_version_minor))
   except:
     nodejs_cur = 1
-  if (nodejs_cur < 10020):
-    print("Node.js version cannot be less 10.20")
+  if (nodejs_cur < 14000):
+    print("Node.js version cannot be less 14")
     print("Reinstall")
-    if (base.is_dir("./node_js_setup_10.x")):
-      base.delete_dir("./node_js_setup_10.x")
+    if (base.is_dir("./node_js_setup_14.x")):
+      base.delete_dir("./node_js_setup_14.x")
     base.cmd("sudo", ["apt-get", "remove", "--purge", "-y", "nodejs"])
-    base.download("https://deb.nodesource.com/setup_10.x", "./node_js_setup_10.x")
+    base.download("https://deb.nodesource.com/setup_14.x", "./node_js_setup_14.x")
     base.cmd('curl -fsSL https://deb.nodesource.com/gpgkey/nodesource.gpg.key | sudo apt-key add -')
-    base.cmd("sudo", ["bash", "./node_js_setup_10.x"])
+    base.cmd("sudo", ["bash", "./node_js_setup_14.x"])
     base.cmd("sudo", ["apt-get", "install", "-y", "nodejs"])
     base.cmd("sudo", ["npm", "install", "-g", "npm@6"])
   else:
@@ -73,16 +73,14 @@ def install_deps():
 
   # java
   java_error = base.cmd("sudo", ["apt-get", "-y", "install", "openjdk-11-jdk"], True)
-  if (0 != java_error):
-    java_error = base.cmd("sudo", ["apt-get", "-y", "install", "openjdk-8-jdk"], True)
   if (0 != java_error):
     base.cmd("sudo", ["apt-get", "-y", "install", "software-properties-common"])
     base.cmd("sudo", ["add-apt-repository", "-y", "ppa:openjdk-r/ppa"])
     base.cmd("sudo", ["apt-get", "update"])
-    base.cmd("sudo", ["apt-get", "-y", "install", "openjdk-8-jdk"])
+    base.cmd("sudo", ["apt-get", "-y", "install", "openjdk-11-jdk"])
     base.cmd("sudo", ["update-alternatives", "--config", "java"])
     base.cmd("sudo", ["update-alternatives", "--config", "javac"])
-    
+
   base.writeFile("./packages_complete", "complete")
   return
 

tools/linux/use_system_qt.py

@@ -0,0 +1,24 @@
+#!/usr/bin/env python
+
+import sys
+sys.path.append('../../scripts')
+import base
+import os
+import subprocess
+
+def make():
+  if base.is_dir("./system_qt"):
+    return
+
+  # TODO: check all places...
+  
+  base.create_dir("./system_qt")
+  base.create_dir("./system_qt/gcc_64")
+  base.cmd("ln", ["-s", "/usr/lib/x86_64-linux-gnu/qt5/bin", "./system_qt/gcc_64/bin"])
+  base.cmd("ln", ["-s", "/usr/lib/x86_64-linux-gnu", "./system_qt/gcc_64/lib"])
+  base.cmd("ln", ["-s", "/usr/lib/x86_64-linux-gnu/qt5/plugins", "./system_qt/gcc_64/plugins"])
+  return
+  
+if __name__ == "__main__":
+  make()
+

version

@@ -1 +1 @@
-7.3.3
+7.4.0