Patchwork D11358: pyoxidizer: pass arch to WiXInstaller()

login
register
mail settings
Submitter phabricator
Date Aug. 27, 2021, 5:38 a.m.
Message ID <differential-rev-PHID-DREV-i4dknazrpfttxhalw5hy-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/49673/
State Superseded
Headers show

Comments

phabricator - Aug. 27, 2021, 5:38 a.m.
indygreg created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REVISION SUMMARY
  We just upgraded Windows automation to PyOxidizer 0.17.0. This
  version of PyOxidizer changed the behavior of WiX installers so
  installer architecture defaulted to "x64" (before it defaulted
  to the target of the pyoxidizer.exe binary). To allow controlling
  the architecture of the installer, the `arch` argument was added
  to `WiXInstaller`. This commit passes that argument in.

REPOSITORY
  rHG Mercurial

BRANCH
  stable

REVISION DETAIL
  https://phab.mercurial-scm.org/D11358

AFFECTED FILES
  rust/hgcli/pyoxidizer.bzl

CHANGE DETAILS




To: indygreg, #hg-reviewers
Cc: mercurial-patches, mercurial-devel

Patch

diff --git a/rust/hgcli/pyoxidizer.bzl b/rust/hgcli/pyoxidizer.bzl
--- a/rust/hgcli/pyoxidizer.bzl
+++ b/rust/hgcli/pyoxidizer.bzl
@@ -242,7 +242,7 @@ 
         path = "defaultrc/editor.rc",
     )
 
-    wix = WiXInstaller("hg", "%s-%s.msi" % (MSI_NAME, VERSION))
+    wix = WiXInstaller("hg", "%s-%s.msi" % (MSI_NAME, VERSION), arch = platform)
 
     # Materialize files in the manifest to the install layout.
     wix.add_install_files(manifest)