This is an automated email from the ASF dual-hosted git repository. leginee pushed a commit to branch win10-msvc-trunk in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 41c6ab6dac20d0bad14729bed1d22034fb0e5027 Author: Peter Kovacs <[email protected]> AuthorDate: Sun Aug 23 00:21:02 2026 +0200 installer: name the x64 download x64, not x86 get_download_architecture() tested $installer::globals::iswindowsbuild, which is true for BOTH Windows architectures, so every Windows download was named x86. The x64 build therefore produced Apache_OpenOffice_4.5.0_Win_x86_install_en-US.exe a filename identical to the x86 bundle's and differing only in its contents -- easy to ship, download or test the wrong one. Windows is the only platform in that function that discriminated on a boolean rather than on the compiler string; every other arm already matches $compiler. Doing the same here separates wnt(msc|gcc)i from wnt(msc|gcc)x. wntmscx14 -> x64 wntmsci14 -> x86 wntgccx -> x64 unxlngx6 -> x86-64 unxlngi6 -> x86 wntgcci -> x86 Co-Authored-By: Claude Opus 5 <[email protected]> Claude-Session: https://claude.ai/code/session_01VrM7EMKgiuyVcCUe9nSbZR --- main/solenv/bin/modules/installer/download.pm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/main/solenv/bin/modules/installer/download.pm b/main/solenv/bin/modules/installer/download.pm index 6ad1570ab0..53fc106e7e 100644 --- a/main/solenv/bin/modules/installer/download.pm +++ b/main/solenv/bin/modules/installer/download.pm @@ -598,10 +598,18 @@ sub get_download_architecture if(( $installer::globals::compiler =~ /^unxlngi/ ) || ( $installer::globals::compiler =~ /^unxmac.i/ ) || ( $installer::globals::issolarisx86build ) - || ( $installer::globals::iswindowsbuild )) + || ( $installer::globals::compiler =~ /^wnt(msc|gcc)i/ )) { $arch = "x86"; } + elsif ( $installer::globals::compiler =~ /^wnt(msc|gcc)x/ ) + { + # iswindowsbuild is true for BOTH Windows architectures, so testing it + # here named every Windows download x86 -- an x64 build produced + # Apache_OpenOffice_4.5.0_Win_x86_install_en-US.exe, a filename + # identical to the x86 one and differing only in its contents. + $arch = "x64"; + } elsif(( $installer::globals::compiler =~ /^unxlngx/ ) || ( $installer::globals::compiler =~ /^unxmaccx/ )) {
