From 1f7a7fc4527e056aa9d43a5c5451568f374eb942 Mon Sep 17 00:00:00 2001 From: SimplestStudio Date: Wed, 6 Aug 2025 18:01:14 +0300 Subject: [PATCH] [win] remove online installer --- make.py | 2 -- scripts/deploy_desktop.py | 2 -- scripts/package_desktop.py | 14 -------------- sln.json | 3 +-- 4 files changed, 1 insertion(+), 20 deletions(-) diff --git a/make.py b/make.py index 199b431..9c52800 100755 --- a/make.py +++ b/make.py @@ -92,8 +92,6 @@ 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", "https://download.onlyoffice.com/install/desktop/editors/windows/distrib/onlyoffice/") - base.set_env("DESKTOP_URL_INSTALL_DEV_CHANNEL", "https://download.onlyoffice.com/install/desktop/editors/windows/onlyoffice/onlineinstallerdev/") # build build_sln.make() diff --git a/scripts/deploy_desktop.py b/scripts/deploy_desktop.py index 7869a5e..428b9a6 100644 --- a/scripts/deploy_desktop.py +++ b/scripts/deploy_desktop.py @@ -183,8 +183,6 @@ 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") - else: - 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 13093fd..18af118 100644 --- a/scripts/package_desktop.py +++ b/scripts/package_desktop.py @@ -72,8 +72,6 @@ def make_windows(): else: make_zip("xp") make_inno("xp") - if common.platform == "windows_x86_xp": - make_online() utils.set_cwd(common.workspace_dir) return @@ -163,18 +161,6 @@ def make_advinst(edition = "opensource"): utils.set_summary("desktop advinst " + edition + " deploy", ret) return -def make_online(): - online_file = utils.glob_file("OnlineInstaller-" + package_version + "*.exe") - utils.log_h2("desktop online installer build") - ret = utils.is_file(online_file) - utils.set_summary("desktop online installer build", ret) - - if common.deploy and ret: - utils.log_h2("desktop online installer deploy") - ret = s3_upload([online_file], "desktop/win/online/") - utils.set_summary("desktop online installer deploy", ret) - return - # # macOS # diff --git a/sln.json b/sln.json index 15dc71c..3fd4408 100644 --- a/sln.json +++ b/sln.json @@ -93,8 +93,7 @@ "[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_xp]desktop-apps/win-linux/extras/online-installer/OnlineInstaller.pro" + "[win,!win_xp]desktop-apps/win-linux/extras/update-daemon/UpdateDaemon.pro" ], "mobile" : [