This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11359

pyoxidizer: add arch to PyOxidizer MSIs
ClosedPublic

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

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG3962503cd1e8: pyoxidizer: add arch to PyOxidizer MSIs
Summary

This is the proper filename pattern. This filename format
wasn't properly implemented when PyOxidizer took over Python 3
MSI generation in 603efb3845ba.

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:36 AM
This revision is now accepted and ready to land.Aug 27 2021, 4:36 AM
indygreg added a commit: rHG3962503cd1e8: pyoxidizer: add arch to PyOxidizer MSIs.Aug 27 2021, 5:26 AM
Closed by commit rHG3962503cd1e8: pyoxidizer: add arch to PyOxidizer MSIs (authored by indygreg). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

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

Diff 30081

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), arch = platform) wix = WiXInstaller(
"hg",
"%s-%s-%s.msi" % (MSI_NAME, VERSION, platform),
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.