Skip to content

Commit 432eeec

Browse files
committed
better compatibility with arm64 installer packaging
remove x86_64 special case
1 parent 4231cc7 commit 432eeec

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

packaging/MSWindows/BUILD.sh

-3
Original file line numberDiff line numberDiff line change
@@ -699,9 +699,6 @@ if [ "${DO_INSTALLER}" == "1" ]; then
699699
echo "* Creating the installer using InnoSetup"
700700
rm -f "Xpra_Setup.exe" "${INSTALLER_FILENAME}" "${INNOSETUP_LOG}"
701701
cp -fn "packaging/MSWindows/xpra.iss" "xpra.iss"
702-
if [ "${MSYSTEM_CARCH}" == "x86_64" ]; then
703-
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"
704-
fi
705702
if [ "${DO_FULL}" == "0" ]; then
706703
#don't run post-install openssl:
707704
sed -i"" "s/ PostInstall();/Log('skipped post-install');/g" xpra.iss

packaging/MSWindows/xpra.iss

+3-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,9 @@ WizardImageFile=packaging\MSWindows\xpra-logo.bmp
2323
WizardSmallImageFile=packaging\MSWindows\xpra.bmp
2424
LicenseFile=COPYING
2525
UninstallDisplayIcon={app}\Xpra-Launcher.exe
26-
ArchitecturesInstallIn64BitMode=x64
27-
ArchitecturesAllowed=x64
26+
ArchitecturesInstallIn64BitMode=x64compatible
27+
ArchitecturesAllowed=arm64 and x64compatible
28+
;UsePreviousAppDir=false
2829

2930
[Dirs]
3031
Name: "{app}"; Flags: uninsalwaysuninstall;

0 commit comments

Comments
 (0)