Patchwork D11359: pyoxidizer: add arch to PyOxidizer MSIs

login
register
mail settings
Submitter phabricator
Date Aug. 27, 2021, 5:38 a.m.
Message ID <differential-rev-PHID-DREV-qu4mj3i3nadaoe6dwdl7-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/49674/
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
  This is the proper filename pattern. This filename format
  wasn't properly implemented when PyOxidizer took over Python 3
  MSI generation in 603efb3845ba <https://phab.mercurial-scm.org/rHG603efb3845ba099c839b3a30651d3f257fb55fe4>.

REPOSITORY
  rHG Mercurial

BRANCH
  stable

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

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,11 @@ 
         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.
     wix.add_install_files(manifest)