Patchwork [1,of,2,STABLE] wix: include zstd.pyd in the installation

login
register
mail settings
Submitter Matt Harbison
Date May 26, 2017, 4:11 a.m.
Message ID <990cdb0375cdea5e752f.1495771905@Envy>
Download mbox | patch
Permalink /patch/20924/
State Accepted
Headers show

Comments

Matt Harbison - May 26, 2017, 4:11 a.m.
# HG changeset patch
# User Matt Harbison <matt_harbison@yahoo.com>
# Date 1495767836 14400
#      Thu May 25 23:03:56 2017 -0400
# Branch stable
# Node ID 990cdb0375cdea5e752f4455e3a06aed0df0989a
# Parent  f928d53b687cb5738528d2eae97f58da10ca8bae
wix: include zstd.pyd in the installation

When trying to create a zstd bundle, the MSI based install said:

  abort: compression engine zstd could not be loaded

The Inno installer is unaffected.  The name will need to be updated to include
'cext' when merging into default.
Yuya Nishihara - May 26, 2017, 2:19 p.m.
On Fri, 26 May 2017 00:11:45 -0400, Matt Harbison wrote:
> # HG changeset patch
> # User Matt Harbison <matt_harbison@yahoo.com>
> # Date 1495767836 14400
> #      Thu May 25 23:03:56 2017 -0400
> # Branch stable
> # Node ID 990cdb0375cdea5e752f4455e3a06aed0df0989a
> # Parent  f928d53b687cb5738528d2eae97f58da10ca8bae
> wix: include zstd.pyd in the installation

Queued, thanks.

Patch

diff --git a/contrib/wix/dist.wxs b/contrib/wix/dist.wxs
--- a/contrib/wix/dist.wxs
+++ b/contrib/wix/dist.wxs
@@ -18,6 +18,7 @@ 
           <File Name="mercurial.mpatch.pyd" />
           <File Name="mercurial.osutil.pyd" />
           <File Name="mercurial.parsers.pyd" />
+          <File Name="mercurial.zstd.pyd" />
           <File Name="pyexpat.pyd" />
           <File Name="bz2.pyd" />
           <File Name="select.pyd" />