Refactoring

scripts/base.py

@@ -1972,6 +1972,23 @@ def get_autobuild_version(product, platform="", branch="", build=""):
   download_addon = download_branch + "/" + download_build + "/" + product + "-" + download_platform + ".7z"
   return "http://repo-doc-onlyoffice-com.s3.amazonaws.com/archive/" + download_addon
 
+def is_use_create_artifacts_qemu_any_platform():
+  if config.check_option("platform", "win_arm64") and not base.is_os_arm():
+    return True
+  return False
+
+def is_use_create_artifacts_qemu(platform):
+  if platform == "win_arm64" and not base.is_os_arm():
+    return True
+  return False
+
+def create_artifacts_qemu_any_platform():
+  if not is_use_create_artifacts_qemu_any_platform():
+    return
+  if config.check_option("platform", "win_arm64"):
+    create_artifacts_qemu_win_arm()
+  return;
+
 def create_artifacts_qemu_win_arm():
   if config.option("qemu-win-arm64-dir") == "":
     print("For deploying win_arm64 on non arm host you should provide qemu-win-arm64-dir. More info in tools/win/qemu/README.md")

scripts/deploy.py

@@ -22,6 +22,6 @@ def make():
     deploy_mobile.make()
   if config.check_option("module", "osign"):
     deploy_osign.make()
-  if config.option("platform").find("win_arm64") != -1 and not base.is_os_arm():
-    base.create_artifacts_qemu_win_arm()
+  if base.is_use_create_artifacts_qemu_any_platform():
+    base.create_artifacts_qemu_any_platform()
   return

scripts/deploy_desktop.py

@@ -288,12 +288,12 @@ def make():
 
     is_host_not_arm = False
     host_platform = ""
-    if (platform == "mac_arm64" or platform == "win_arm64") and not base.is_os_arm():
+
+    # TODO: fix this on mac_arm64 (qemu)
+    # on windows we are using qemu
+    if (platform == "mac_arm64") and not base.is_os_arm():
       is_host_not_arm = True
-      if platform == "mac_arm64":
-        host_platform = "mac_64"
-      elif platform == "win_arm64":
-        host_platform = "win_64"
+      host_platform = "mac_64"
 
     # all themes generate ----
     base.copy_exe(core_build_dir + "/bin/" + platform_postfix, root_dir + "/converter", "allfontsgen")
@@ -304,28 +304,28 @@ def make():
       base.for_each_framework(root_dir, "mac", callbacks=[base.generate_plist], max_depth=2)
       base.mac_correct_rpath_desktop(root_dir)
 
-    themes_params = ""
-    if ("" != config.option("themesparams")):
-      themes_params = "--params=\"" + config.option("themesparams") + "\""
-      
     if is_host_not_arm:
-      if platform == "mac_arm64":
-        sdkjs_dir = root_dir + "/editors/sdkjs"
-        end_find_platform = sdkjs_dir.rfind("/" + platform + "/")
-        sdkjs_dir_64 = sdkjs_dir[0:end_find_platform] + "/" + host_platform + "/" + sdkjs_dir[end_find_platform+11:]
-        base.delete_dir(sdkjs_dir)
-        base.copy_dir(sdkjs_dir_64, sdkjs_dir)
+      sdkjs_dir = root_dir + "/editors/sdkjs"
+      str1 = "/" + platform + "/"
+      str2 = "/" + host_platform + "/"
+      sdkjs_dir_host = sdkjs_dir.replace(str1, str2)
+      base.delete_dir(sdkjs_dir)
+      base.copy_dir(sdkjs_dir_host, sdkjs_dir)
     else:
+      themes_params = []
+      if ("" != config.option("themesparams")):
+        themes_params = ["--params=\"" + config.option("themesparams") + "\""]
       base.cmd_exe(root_dir + "/converter/allfontsgen", ["--use-system=\"1\"", "--input=\"" + root_dir + "/fonts\"", "--input=\"" + git_dir + "/core-fonts\"", "--allfonts=\"" + root_dir + "/converter/AllFonts.js\"", "--selection=\"" + root_dir + "/converter/font_selection.bin\""], True)
-      base.cmd_exe(root_dir + "/converter/allthemesgen", ["--converter-dir=\"" + root_dir + "/converter\"", "--src=\"" + root_dir + "/editors/sdkjs/slide/themes\"", "--allfonts=\"AllFonts.js\"", "--output=\"" + root_dir + "/editors/sdkjs/common/Images\""] + [themes_params], True)
+      base.cmd_exe(root_dir + "/converter/allthemesgen", ["--converter-dir=\"" + root_dir + "/converter\"", "--src=\"" + root_dir + "/editors/sdkjs/slide/themes\"", "--allfonts=\"AllFonts.js\"", "--output=\"" + root_dir + "/editors/sdkjs/common/Images\""] + themes_params, True)
       base.delete_file(root_dir + "/converter/AllFonts.js")
       base.delete_file(root_dir + "/converter/font_selection.bin")
       base.delete_file(root_dir + "/converter/fonts.log")
 
-    base.delete_exe(root_dir + "/converter/allfontsgen")
-    base.delete_exe(root_dir + "/converter/allthemesgen")
+    if (base.is_use_create_artifacts_qemu(platform)):
+      base.delete_exe(root_dir + "/converter/allfontsgen")
+      base.delete_exe(root_dir + "/converter/allthemesgen")
 
     if not isUseJSC:
       base.delete_file(root_dir + "/editors/sdkjs/slide/sdk-all.cache")
 
-  return
+  return

tools/win/qemu/automate.bat

@@ -35,6 +35,9 @@ for %%m in (!module_list!) do (
 		call %base_out_dir%\DesktopEditors\converter\x2t.exe -create-js-snapshots
 		call %base_out_dir%\DesktopEditors\converter\allfontsgen.exe --use-system="1" --input="%base_out_dir%\DesktopEditors\fonts" --input="%git_dir%\core-fonts" --allfonts="%base_out_dir%\DesktopEditors\converter\AllFonts.js" --selection="%base_out_dir%\DesktopEditors\converter\font_selection.bin"
 		call %base_out_dir%\DesktopEditors\converter\allthemesgen.exe --converter-dir="%base_out_dir%\DesktopEditors\converter" --src="%base_out_dir%\DesktopEditors\editors\sdkjs\slide\themes" --allfonts="AllFonts.js" --output="%base_out_dir%\DesktopEditors\editors\sdkjs\common\Images" --params="%themesparams%"
+		del %base_out_dir%\DesktopEditors\converter\allfontsgen.exe
+		del %base_out_dir%\DesktopEditors\converter\allthemesgen.exe
+
 	)
 	if "%%m"=="server" (
 		call %base_out_dir%\documentserver\server\FileConverter\bin\x2t -create-js-snapshots