Skip to content

Commit 1f7a7fc

Browse files
[win] remove online installer
1 parent a8ab257 commit 1f7a7fc

File tree

4 files changed

+1
-20
lines changed

4 files changed

+1
-20
lines changed

make.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,6 @@
9292
config.extend_option("config", "updmodule")
9393
base.set_env("DESKTOP_URL_UPDATES_MAIN_CHANNEL", "https://download.onlyoffice.com/install/desktop/editors/windows/onlyoffice/appcast.json")
9494
base.set_env("DESKTOP_URL_UPDATES_DEV_CHANNEL", "https://download.onlyoffice.com/install/desktop/editors/windows/onlyoffice/appcastdev.json")
95-
base.set_env("DESKTOP_URL_INSTALL_CHANNEL", "https://download.onlyoffice.com/install/desktop/editors/windows/distrib/onlyoffice/<file>")
96-
base.set_env("DESKTOP_URL_INSTALL_DEV_CHANNEL", "https://download.onlyoffice.com/install/desktop/editors/windows/onlyoffice/onlineinstallerdev/<file>")
9795

9896
# build
9997
build_sln.make()

scripts/deploy_desktop.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,8 +183,6 @@ def make():
183183
base.copy_file(git_dir + "/desktop-apps/win-linux/extras/projicons/" + apps_postfix + "/projicons.exe", root_dir + "/DesktopEditors.exe")
184184
if not isWindowsXP:
185185
base.copy_file(git_dir + "/desktop-apps/win-linux/extras/update-daemon/" + apps_postfix + "/updatesvc.exe", root_dir + "/updatesvc.exe")
186-
else:
187-
base.copy_file(git_dir + "/desktop-apps/win-linux/extras/online-installer/" + apps_postfix + "/online-installer.exe", root_dir + "/online-installer.exe")
188186
base.copy_file(git_dir + "/desktop-apps/win-linux/" + apps_postfix + "/DesktopEditors.exe", root_dir + "/editors.exe")
189187
base.copy_file(git_dir + "/desktop-apps/win-linux/res/icons/desktopeditors.ico", root_dir + "/app.ico")
190188
elif (0 == platform.find("linux")):

scripts/package_desktop.py

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,6 @@ def make_windows():
7272
else:
7373
make_zip("xp")
7474
make_inno("xp")
75-
if common.platform == "windows_x86_xp":
76-
make_online()
7775

7876
utils.set_cwd(common.workspace_dir)
7977
return
@@ -163,18 +161,6 @@ def make_advinst(edition = "opensource"):
163161
utils.set_summary("desktop advinst " + edition + " deploy", ret)
164162
return
165163

166-
def make_online():
167-
online_file = utils.glob_file("OnlineInstaller-" + package_version + "*.exe")
168-
utils.log_h2("desktop online installer build")
169-
ret = utils.is_file(online_file)
170-
utils.set_summary("desktop online installer build", ret)
171-
172-
if common.deploy and ret:
173-
utils.log_h2("desktop online installer deploy")
174-
ret = s3_upload([online_file], "desktop/win/online/")
175-
utils.set_summary("desktop online installer deploy", ret)
176-
return
177-
178164
#
179165
# macOS
180166
#

sln.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,7 @@
9393
"[win,linux]desktop-apps/win-linux/ASCDocumentEditor.pro",
9494

9595
"[win]desktop-apps/win-linux/extras/projicons/ProjIcons.pro",
96-
"[win,!win_xp]desktop-apps/win-linux/extras/update-daemon/UpdateDaemon.pro",
97-
"[win_xp]desktop-apps/win-linux/extras/online-installer/OnlineInstaller.pro"
96+
"[win,!win_xp]desktop-apps/win-linux/extras/update-daemon/UpdateDaemon.pro"
9897
],
9998

10099
"mobile" : [

0 commit comments

Comments
 (0)