pengjunjie/desktop-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/desktop-apps.git synced 2026-02-10 18:05:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

[win] online-installer: remove xp support

Browse Source
This commit is contained in:
SimplestStudio
2024-11-25 14:28:40 +02:00
parent 4e11f0ac3c
commit d0058f5af3
3 changed files with 2 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
win-linux/extras/online-installer/OnlineInstaller.pro
View File

@ -17,16 +17,6 @@ ENV_URL_INSTALL_X86 = $$(DESKTOP_URL_INSTALL_CHANNEL_X86)
DEFINES += URL_INSTALL_X86=\\\"$${ENV_URL_INSTALL_X86}\\\"
}
ENV_URL_INSTALL_X64_XP = $$(DESKTOP_URL_INSTALL_CHANNEL_X64_XP)
!isEmpty(ENV_URL_INSTALL_X64_XP) {
DEFINES += URL_INSTALL_X64_XP=\\\"$${ENV_URL_INSTALL_X64_XP}\\\"
}
ENV_URL_INSTALL_X86_XP = $$(DESKTOP_URL_INSTALL_CHANNEL_X86_XP)
!isEmpty(ENV_URL_INSTALL_X86_XP) {
DEFINES += URL_INSTALL_X86_XP=\\\"$${ENV_URL_INSTALL_X86_XP}\\\"
}
ENV_URL_INSTALL_X64_MSI = $$(DESKTOP_URL_INSTALL_CHANNEL_X64_MSI)
!isEmpty(ENV_URL_INSTALL_X64_MSI) {
DEFINES += URL_INSTALL_X64_MSI=\\\"$${ENV_URL_INSTALL_X64_MSI}\\\"

13
win-linux/extras/online-installer/src/main.cpp
View File

@ -3,7 +3,6 @@
#include <locale>
#include "resource.h"
#include "utils.h"
#include "baseutils.h"
#include "translator.h"
#include "../../src/defines.h"
#include "../../src/prop/defines_p.h"
@ -14,12 +13,6 @@
#ifndef URL_INSTALL_X86
# define URL_INSTALL_X86 ""
#endif
#ifndef URL_INSTALL_X64_XP
# define URL_INSTALL_X64_XP ""
#endif
#ifndef URL_INSTALL_X86_XP
# define URL_INSTALL_X86_XP ""
#endif
#ifndef URL_INSTALL_X64_MSI
# define URL_INSTALL_X64_MSI ""
#endif
@ -62,11 +55,7 @@ int WINAPI _tWinMain(_In_ HINSTANCE hInst, _In_opt_ HINSTANCE hPrevInstance, _In
wstring url_or_path, arch;
bool app_installed = NS_Utils::IsAppInstalled(url_or_path, &arch);
if (!app_installed) {
if (NS_Utils::IsWin64()) {
url_or_path = (Utils::getWinVersion() <= Utils::WinVer::WinVista) ? _T(URL_INSTALL_X64_XP) : _T(URL_INSTALL_X64);
} else {
url_or_path = (Utils::getWinVersion() <= Utils::WinVer::WinVista) ? _T(URL_INSTALL_X86_XP) : _T(URL_INSTALL_X86);
}
url_or_path = NS_Utils::IsWin64() ? _T(URL_INSTALL_X64) : _T(URL_INSTALL_X86);
}
Application app(hInst, lpCmdLine, nCmdShow);

14
win-linux/extras/online-installer/src/mainwindow.cpp
View File

@ -26,12 +26,6 @@
#ifndef URL_INSTALL_X86
# define URL_INSTALL_X86 ""
#endif
#ifndef URL_INSTALL_X64_XP
# define URL_INSTALL_X64_XP ""
#endif
#ifndef URL_INSTALL_X86_XP
# define URL_INSTALL_X86_XP ""
#endif
#ifndef URL_INSTALL_X64_MSI
# define URL_INSTALL_X64_MSI ""
#endif
@ -394,11 +388,7 @@ void MainWindow::startUpdate()
if (m_package == L"msi") {
url = (m_arch == L"x64") ? _T(URL_INSTALL_X64_MSI) : _T(URL_INSTALL_X86_MSI);
} else {
if (Utils::getWinVersion() <= Utils::WinVer::WinVista) {
url = (m_arch == L"x64") ? _T(URL_INSTALL_X64_XP) : _T(URL_INSTALL_X86_XP);
} else {
url = (m_arch == L"x64") ? _T(URL_INSTALL_X64) : _T(URL_INSTALL_X86);
}
url = (m_arch == L"x64") ? _T(URL_INSTALL_X64) : _T(URL_INSTALL_X86);
}
CDownloader *dnl = startDownload(url, tmp_path, [=]() {
@ -445,8 +435,6 @@ void MainWindow::startRepair()
wstring url = L"https://github.com/%1/%2/releases/download/%3/%4";
{
wstring url_filename = L"DesktopEditors_" + m_arch;
if (Utils::getWinVersion() <= Utils::WinVer::WinVista)
url_filename.append(L"_xp");
url_filename.append(L"." + m_package);
wstring url_ver = L"v" + m_ver;