Mercurial > public > mercurial-scm > hg
diff rust/hgcli/pyoxidizer.bzl @ 47884:07f3f154e03a stable
pyoxidizer: pass arch to WiXInstaller()
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.
Differential Revision: https://phab.mercurial-scm.org/D11358
| author | Gregory Szorc <gregory.szorc@gmail.com> |
|---|---|
| date | Thu, 26 Aug 2021 20:05:12 -0700 |
| parents | 769cd5703b2c |
| children | 3962503cd1e8 |
line wrap: on
line diff
--- a/rust/hgcli/pyoxidizer.bzl Thu Aug 26 20:01:01 2021 -0700 +++ b/rust/hgcli/pyoxidizer.bzl Thu Aug 26 20:05:12 2021 -0700 @@ -255,7 +255,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)