Skip to content

Commit 4132e85

Browse files
committed
better compatibility with arm64 installer packaging
remove x86_64 special case
1 parent 5bd5666 commit 4132e85

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

packaging/MSWindows/MINGW_BUILD.sh

-3
Original file line numberDiff line numberDiff line change
@@ -661,9 +661,6 @@ if [ "${DO_INSTALLER}" == "1" ]; then
661661
echo "* Creating the installer using InnoSetup"
662662
rm -f "Xpra_Setup.exe" "${INSTALLER_FILENAME}" "${INNOSETUP_LOG}"
663663
cp -fn "packaging/MSWindows/xpra.iss" "xpra.iss"
664-
if [ "${MSYSTEM_CARCH}" == "x86_64" ]; then
665-
cat "packaging/MSWindows/xpra.iss" | sed '/\(ArchitecturesInstallIn64BitMode\|ArchitecturesInstallIn64BitMode\)/ s/=.*/=x64/g' | sed '/\(AppName=\|AppVerName=\|DefaultGroupName=\)/ s/\r$/ (64-bit)\r/g' | sed 's/ArchitecturesAllowed=.*/ArchitecturesAllowed=x64/g' > "xpra.iss"
666-
fi
667664
if [ "${CLIENT_ONLY}" == "1" ]; then
668665
#remove shadow start menu entry
669666
sed -i"" "s/.*Xpra Shadow Server.*//g" xpra.iss

packaging/MSWindows/xpra.iss

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ WizardImageFile=packaging\MSWindows\xpra-logo.bmp
2323
WizardSmallImageFile=packaging\MSWindows\xpra.bmp
2424
LicenseFile=COPYING
2525
UninstallDisplayIcon={app}\Xpra-Launcher.exe
26-
ArchitecturesInstallIn64BitMode=
27-
ArchitecturesAllowed=
26+
ArchitecturesInstallIn64BitMode=x64compatible
27+
ArchitecturesAllowed=win64
2828

2929
[Dirs]
3030
Name: "{app}"; Flags: uninsalwaysuninstall;

0 commit comments

Comments
 (0)