mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix msi generation on native windows/aarch64

Browse Source 
msidb and other tools from the arm directory are incompatible, so it
needs the intel ones instead

Change-Id: I9029ab3c78708ec5e2b81085597c67ff10ffc188
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/184032
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
This commit is contained in:
Christian Lohmaier 2025-04-11 12:49:14 +02:00
parent 0110cff15c
commit 6b10b00d7d
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
configure.ac
View File

@ -15763,8 +15763,7 @@ else
fi
if test "$WIN_BUILD_ARCH" = "arm64"; then
# needed for msi packaging - as of 10.0.22621 SDK no arm64 ones yet
# the x86 ones probably would work just as well...
pathmunge "$WINDOWS_SDK_BINDIR_NO_ARCH/arm" "before"
pathmunge "$WINDOWS_SDK_BINDIR_NO_ARCH/x86" "before"
fi
# .NET 4.6 and higher don't have bin directory
if test -f "$DOTNET_FRAMEWORK_HOME/bin"; then

2
solenv/bin/modules/installer/windows/msiglobal.pm
View File

@ -524,6 +524,8 @@ sub get_template_for_sis
if (( $allvariables->{'64BITPRODUCT'} ) && ( $allvariables->{'64BITPRODUCT'} == 1 )) { $architecture = "x64"; }
$architecture = "Arm64" if($ENV{'RTL_ARCH'} eq "AARCH64");
my $value = "\"" . $architecture . ";" . $windowslanguage; # adding the Windows language
$value = $value . "\""; # adding ending '"'