Merge branch 'develop' into feature/appimage-build

scripts/develop/print_repositories.py

@@ -35,8 +35,12 @@ config.parse_defaults()
 repositories = base.get_repositories()
 
 # Add other repositories
+if (config.check_option("module", "desktop")):
+  repositories['appimage-desktopeditors'] = [False, False]
+
 if config.check_option("module", "builder"):
   repositories['document-builder-package'] = [False, False]
+  repositories['appimage-documentbuilder'] = [False, False]
 
 if (config.check_option("module", "server")):
   repositories['document-server-package'] = [False, False]

scripts/package_builder.py

@@ -197,5 +197,27 @@ def make_linux():
       if "rpm" in branding.builder_make_targets:
         utils.set_summary("builder rpm deploy", False)
 
+  utils.set_cwd(common.workspace_dir)
+
+  make_appimage()
+  return
+
+def make_appimage():
+  if not onlyoffice:
+    return
+  if not utils.is_file("document-builder-package/deb/onlyoffice-documentbuilder_%s-%s_amd64.deb" % (common.version, common.build))
+    return
+
+  utils.set_cwd("appimage-documentbuilder")
+
+  rc = utils.sh("make clean", verbose=True)
+  common.summary["builder appimage clean"] = rc
+
+  # args = []
+  # if common.platform == "linux_aarch64":
+  #   args += ["-e", "UNAME_M=aarch64"]
+  rc = utils.sh("make testing", verbose=True)
+  common.summary["builder appimage build"] = rc
+
   utils.set_cwd(common.workspace_dir)
   return

scripts/package_desktop.py

@@ -601,5 +601,27 @@ def make_linux():
       if "urpmi" in branding.desktop_make_targets:
         utils.set_summary("desktop urpmi deploy", False)
 
+  utils.set_cwd(common.workspace_dir)
+
+  make_appimage()
+  return
+
+def make_appimage():
+  if not onlyoffice:
+    return
+  if not utils.is_file("desktop-apps/win-linux/package/linux/deb/onlyoffice-desktopeditors_%s-%s_amd64.deb" % (common.version, common.build))
+    return
+
+  utils.set_cwd("appimage-desktopeditors")
+
+  rc = utils.sh("make clean", verbose=True)
+  common.summary["desktop appimage clean"] = rc
+
+  # args = []
+  # if common.platform == "linux_aarch64":
+  #   args += ["-e", "UNAME_M=aarch64"]
+  rc = utils.sh("make testing", verbose=True)
+  common.summary["desktop appimage build"] = rc
+
   utils.set_cwd(common.workspace_dir)
   return