Merge pull request #665 from ONLYOFFICE/release/v7.4.0

Release/v7.4.0

build.pro

@@ -83,6 +83,8 @@ addSubProject(epubfile,		$$CORE_ROOT_DIR/EpubFile/CEpubFile.pro,\
 					kernel unicodeconverter graphics)
 	addSubProject(docbuilder,	$$CORE_ROOT_DIR/DesktopEditor/doctrenderer/app_builder/docbuilder.pro,\
 					kernel unicodeconverter graphics doctrenderer)
+	addSubProject(pluginsmanager,	$$CORE_ROOT_DIR/DesktopEditor/pluginsmanager/pluginsmanager.pro,\
+					kernel)
 }
 
 !no_tests {

scripts/base.py

@@ -1067,6 +1067,10 @@ def mac_correct_rpath_x2t(dir):
     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"])
+  if is_file("./pluginsmanager"):
+    cmd("chmod", ["-v", "+x", "./pluginsmanager"])
+    cmd("install_name_tool", ["-add_rpath", "@executable_path", "./pluginsmanager"], True)
+    mac_correct_rpath_binary("./pluginsmanager", ["icudata.58", "icuuc.58", "UnicodeConverter", "kernel", "kernel_network"])
   os.chdir(cur_dir)
   return
 

scripts/config.py

@@ -115,6 +115,10 @@ def parse():
     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):

scripts/core_common/modules/openssl.py

@@ -19,16 +19,17 @@ 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", "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"])
 

scripts/deploy_core.py

@@ -55,6 +55,7 @@ def make():
 
     base.copy_exe(core_build_dir + "/bin/" + platform_postfix, archive_dir, "allfontsgen")
     base.copy_exe(core_build_dir + "/bin/" + platform_postfix, archive_dir, "allthemesgen")
+    base.copy_exe(core_build_dir + "/bin/" + platform_postfix, archive_dir, "pluginsmanager")
     base.copy_exe(core_build_dir + "/bin/" + platform_postfix, archive_dir, "standardtester")
     base.copy_exe(core_build_dir + "/bin/" + platform_postfix, archive_dir, "x2ttester")
     base.copy_exe(core_build_dir + "/bin/" + platform_postfix, archive_dir, "ooxml_crypt")

scripts/deploy_server.py

@@ -136,7 +136,8 @@ def make():
     base.create_dir(tools_dir)
     base.copy_exe(core_build_dir + "/bin/" + platform_postfix, tools_dir, "allfontsgen")
     base.copy_exe(core_build_dir + "/bin/" + platform_postfix, tools_dir, "allthemesgen")
-
+    base.copy_exe(core_build_dir + "/bin/" + platform_postfix, tools_dir, "pluginsmanager")
+    
     branding_dir = server_dir + "/branding"
     if("" != config.option("branding") and "onlyoffice" != config.option("branding")):
       branding_dir = git_dir + '/' + config.option("branding") + '/server'

scripts/package_branding.py

@@ -18,10 +18,6 @@ if utils.is_windows():
   desktop_product_name_s = desktop_product_name.replace(" ","")
   desktop_package_name = company_name + "-" + desktop_product_name_s
   desktop_vcredist_list = ["2022"]
-  desktop_update_changes_list = {
-    "en": "changes",
-    "ru": "changes_ru"
-  }
   desktop_changes_url = "https://download.onlyoffice.com/install/desktop/editors/windows/onlyoffice/changes"
   desktop_updates_url = "https://download.onlyoffice.com/install/desktop/editors/windows/onlyoffice/updates"
 

scripts/package_desktop.py

@@ -242,14 +242,11 @@ def make_inno_help():
 def make_update_files():
   utils.log_h2("desktop update files build")
 
-  if branding.onlyoffice:
-    changes_dir = "update\\changes\\" + common.version
-  else:
+  changes_dir = "update\\changes\\" + common.version
+  if not branding.onlyoffice:
     changes_dir = "..\\..\\..\\..\\" + common.branding + "\\desktop-apps\\" + \
         "win-linux\\package\\windows\\update\\changes\\" + common.version
-  for lang, base in branding.desktop_update_changes_list.items():
-    utils.log_h3("changes " + lang + " html")
-    utils.copy_file(changes_dir + "\\" + lang + ".html", "update\\" + base + ".html")
+  utils.copy_dir_content(changes_dir, "update")
 
   appcast_args = [
     "-Version", package_version,
@@ -295,8 +292,9 @@ def make_update_files():
   if common.deploy:
     utils.log_h2("desktop update files deploy")
     ret = aws_s3_upload(
-        utils.glob_path("update/*.json") + utils.glob_path("update/*.xml") + \
-            utils.glob_path("update/*.html"),
+        utils.glob_path("update\\*.json") \
+        + utils.glob_path("update\\*.xml") \
+        + utils.glob_path("update\\*.html"),
         "win/inno/%s/%s/" % (common.version, common.build),
         "Update"
     )
@@ -495,14 +493,10 @@ def make_sparkle_updates():
   utils.create_dir(updates_dir)
   utils.copy_file(macos_zip, updates_dir)
   utils.copy_dir_content(updates_storage_dir, updates_dir, ".zip")
-  utils.copy_file(
-      changes_dir + "/" + app_version + "/ReleaseNotes.html",
-      updates_dir + "/" + zip_filename + ".html"
-  )
-  utils.copy_file(
-      changes_dir + "/" + app_version + "/ReleaseNotesRU.html",
-      updates_dir + "/" + zip_filename + ".ru.html"
-  )
+
+  for file in utils.glob_path(changes_dir + "/" + app_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(