diff --git a/make.py b/make.py index 9c52800..c26da9c 100755 --- a/make.py +++ b/make.py @@ -92,6 +92,10 @@ 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_X64", "https://download.onlyoffice.com/install/desktop/editors/windows/distrib/onlyoffice/DesktopEditors_x64.exe") + base.set_env("DESKTOP_URL_INSTALL_CHANNEL_X86", "https://download.onlyoffice.com/install/desktop/editors/windows/distrib/onlyoffice/DesktopEditors_x86.exe") + base.set_env("DESKTOP_URL_INSTALL_CHANNEL_X64_MSI", "https://download.onlyoffice.com/install/desktop/editors/windows/distrib/onlyoffice/DesktopEditors_x64.msi") + base.set_env("DESKTOP_URL_INSTALL_CHANNEL_X86_MSI", "https://download.onlyoffice.com/install/desktop/editors/windows/distrib/onlyoffice/DesktopEditors_x86.msi") # build build_sln.make() diff --git a/scripts/deploy_desktop.py b/scripts/deploy_desktop.py index 3777021..81429ec 100644 --- a/scripts/deploy_desktop.py +++ b/scripts/deploy_desktop.py @@ -183,6 +183,7 @@ 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")): diff --git a/scripts/package_desktop.py b/scripts/package_desktop.py index c16af17..3685ce4 100644 --- a/scripts/package_desktop.py +++ b/scripts/package_desktop.py @@ -3,6 +3,7 @@ import os import re +import base import package_utils as utils import package_common as common import package_branding as branding @@ -64,6 +65,7 @@ def make_windows(): make_zip() make_inno() make_advinst() + make_onlineinst() utils.set_cwd(common.workspace_dir) return @@ -188,6 +190,18 @@ def make_advinst(): utils.set_summary("desktop advinst deploy", ret) return +def make_onlineinst(): + if not common.platform in ["windows_x64", "windows_x86"]: + return + onlineinst_file = "%s-%s-%s.exe" % ("OnlineInstaller", package_version, suffix) + ret = (base.move_file("online-installer.exe", onlineinst_file) != ""); + + if common.deploy and ret: + utils.log_h2("desktop onlineinst deploy") + ret = s3_upload([onlineinst_file], "desktop/win/onlineinst/") + utils.set_summary("desktop onlineinst deploy", ret) + return + # # macOS # diff --git a/sln.json b/sln.json index 63b7114..6a4160d 100644 --- a/sln.json +++ b/sln.json @@ -90,7 +90,8 @@ "[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/update-daemon/UpdateDaemon.pro", + "[win,!win_xp]desktop-apps/win-linux/extras/online-installer/OnlineInstaller.pro" ], "mobile" : [