pengjunjie/desktop-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/desktop-apps.git synced 2026-04-07 14:09:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug 78681 - Block arm64 installer on unsupported architectures

Browse Source
This commit is contained in:
Semyon Bezrukov
2025-11-25 12:31:36 +03:00
committed by Alexey Golubev
parent eabb76f296
commit e04e3b27b5
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
win-linux/package/windows/DesktopEditors.aip
View File

@ -1535,6 +1535,7 @@
<ROW Condition="(VersionNT &lt;&gt; 400)" Description="[ProductName] cannot be installed on [WindowsTypeNT40Display]." DescriptionLocId="AI.LaunchCondition.NoNT40" IsPredefined="true" Builds="MsiBuild64;MsiBuild32;MsiBuildARM64"/>
<ROW Condition="(VersionNT &lt;&gt; 500)" Description="[ProductName] cannot be installed on [WindowsTypeNT50Display]." DescriptionLocId="AI.LaunchCondition.NoNT50" IsPredefined="true" Builds="MsiBuild64;MsiBuild32;MsiBuildARM64"/>
<ROW Condition="(VersionNT &lt;&gt; 600)" Description="[ProductName] cannot be installed on [WindowsTypeNT60Display]." DescriptionLocId="AI.LaunchCondition.NoNT60" IsPredefined="true" Builds="MsiBuild64;MsiBuild32;MsiBuildARM64"/>
<ROW Condition="AiArm64" Description="[ProductName] can only be installed on Arm64 Windows versions." Builds="MsiBuildARM64"/>
<ROW Condition="VersionNT" Description="[ProductName] cannot be installed on [WindowsType9XDisplay]." DescriptionLocId="AI.LaunchCondition.No9X" IsPredefined="true" Builds="MsiBuild64;MsiBuild32;MsiBuildARM64"/>
</COMPONENT>
<COMPONENT cid="caphyon.advinst.msicomp.MsiMergeModsComponent">

13
win-linux/package/windows/common.iss
View File

@ -79,14 +79,15 @@ AppMutex ={code:getAppMutex}
ChangesEnvironment =yes
SetupMutex =ASC
#if ARCH == "x64" | ARCH == "arm64"
#if Int(DecodeVer(PREPROCVER,1)) >= 6
ArchitecturesAllowed = x64compatible or arm64
ArchitecturesInstallIn64BitMode = x64compatible or arm64
#else
#if Ver < EncodeVer(6,0,0) & ARCH == "x64"
ArchitecturesAllowed = x64
ArchitecturesInstallIn64BitMode = x64
#endif
#elif Ver >= EncodeVer(6,0,0) & ARCH == "x64"
ArchitecturesAllowed = x64compatible
ArchitecturesInstallIn64BitMode = x64compatible
#elif ARCH == "arm64"
ArchitecturesAllowed = arm64
ArchitecturesInstallIn64BitMode = arm64
#endif
#ifdef _WIN_XP