This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11358

pyoxidizer: pass arch to WiXInstaller()
ClosedPublic

Authored by indygreg on Aug 27 2021, 1:37 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG07f3f154e03a: pyoxidizer: pass arch to WiXInstaller()
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.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

indygreg created this revision.Aug 27 2021, 1:37 AM
Alphare accepted this revision.Aug 27 2021, 4:35 AM
This revision is now accepted and ready to land.Aug 27 2021, 4:35 AM
indygreg added a commit: rHG07f3f154e03a: pyoxidizer: pass arch to WiXInstaller().Aug 27 2021, 5:26 AM
Closed by commit rHG07f3f154e03a: pyoxidizer: pass arch to WiXInstaller() (authored by indygreg). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mrust/hgcli/pyoxidizer.bzl (2 lines)

Diff 30080

rust/hgcli/pyoxidizer.bzl

FileContent(path = ROOT + "/contrib/win32/mercurial.ini"), FileContent(path = ROOT + "/contrib/win32/mercurial.ini"),
path = "defaultrc/mercurial.rc", path = "defaultrc/mercurial.rc",
) )
manifest.add_file( manifest.add_file(
FileContent(filename = "editor.rc", content = "[ui]\neditor = notepad\n"), FileContent(filename = "editor.rc", content = "[ui]\neditor = notepad\n"),
path = "defaultrc/editor.rc", 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. # Materialize files in the manifest to the install layout.
wix.add_install_files(manifest) wix.add_install_files(manifest)
# From mercurial.wxs. # From mercurial.wxs.
wix.install_files_root_directory_id = "INSTALLDIR" wix.install_files_root_directory_id = "INSTALLDIR"
# Pull in our custom .wxs files. # Pull in our custom .wxs files.