Patchwork [[STABLE] ] wix: update list of necessary pyd files

login
register
mail settings
Submitter Steve Borho
Date July 21, 2017, 5:30 p.m.
Message ID <a3259bc367c557b6e44a.1500658257@localhost>
Download mbox | patch
Permalink /patch/22541/
State Accepted
Headers show

Comments

Steve Borho - July 21, 2017, 5:30 p.m.
# HG changeset patch
# User Steve Borho <steve@borho.org>
# Date 1500654411 18000
#      Fri Jul 21 11:26:51 2017 -0500
# Branch stable
# Node ID a3259bc367c557b6e44a961d650e803b43dafbed
# Parent  e9850cc580a758f06506276140cc424bc8a415be
wix: update list of necessary pyd files
Yuya Nishihara - July 23, 2017, 2:06 p.m.
On Fri, 21 Jul 2017 12:30:57 -0500, Steve Borho wrote:
> # HG changeset patch
> # User Steve Borho <steve@borho.org>
> # Date 1500654411 18000
> #      Fri Jul 21 11:26:51 2017 -0500
> # Branch stable
> # Node ID a3259bc367c557b6e44a961d650e803b43dafbed
> # Parent  e9850cc580a758f06506276140cc424bc8a415be
> wix: update list of necessary pyd files

Queued, thanks.

> diff -r e9850cc580a7 -r a3259bc367c5 contrib/wix/dist.wxs
> --- a/contrib/wix/dist.wxs	Wed Jul 19 07:58:03 2017 -0500
> +++ b/contrib/wix/dist.wxs	Fri Jul 21 11:26:51 2017 -0500
> @@ -19,12 +19,15 @@
>            <File Name="mercurial.cext.osutil.pyd" />
>            <File Name="mercurial.cext.parsers.pyd" />
>            <File Name="mercurial.zstd.pyd" />
> +          <File Name="hgext.fsmonitor.pywatchman.bser.pyd" />
>            <File Name="pyexpat.pyd" />
>            <File Name="bz2.pyd" />
>            <File Name="select.pyd" />
>            <File Name="unicodedata.pyd" />
>            <File Name="_ctypes.pyd" />
>            <File Name="_elementtree.pyd" />
> +          <File Name="_multiprocessing.pyd" />
> +          <File Name="_testcapi.pyd" />

Dropped _multiprocessing.pyd per discussion in another thread.

Patch

diff -r e9850cc580a7 -r a3259bc367c5 contrib/wix/dist.wxs
--- a/contrib/wix/dist.wxs	Wed Jul 19 07:58:03 2017 -0500
+++ b/contrib/wix/dist.wxs	Fri Jul 21 11:26:51 2017 -0500
@@ -19,12 +19,15 @@ 
           <File Name="mercurial.cext.osutil.pyd" />
           <File Name="mercurial.cext.parsers.pyd" />
           <File Name="mercurial.zstd.pyd" />
+          <File Name="hgext.fsmonitor.pywatchman.bser.pyd" />
           <File Name="pyexpat.pyd" />
           <File Name="bz2.pyd" />
           <File Name="select.pyd" />
           <File Name="unicodedata.pyd" />
           <File Name="_ctypes.pyd" />
           <File Name="_elementtree.pyd" />
+          <File Name="_multiprocessing.pyd" />
+          <File Name="_testcapi.pyd" />
           <File Name="_hashlib.pyd" />
           <File Name="_socket.pyd" />
           <File Name="_ssl.pyd" />
diff -r e9850cc580a7 -r a3259bc367c5 contrib/wix/guids.wxi
--- a/contrib/wix/guids.wxi	Wed Jul 19 07:58:03 2017 -0500
+++ b/contrib/wix/guids.wxi	Fri Jul 21 11:26:51 2017 -0500
@@ -10,7 +10,7 @@ 
 
   <!-- dist.wxs -->
   <?define dist.guid = {CE405FE6-CD1E-4873-9C9A-7683AE5A3D90} ?>
-  <?define lib.guid = {91D53B14-E924-432A-ACA2-65F9B3F7C56A} ?>
+  <?define lib.guid = {877633b5-0b7e-4b46-8f1c-224a61733297} ?>
 
   <!-- doc.wxs -->
   <?define doc.hg.1.html.guid = {AAAA3FDA-EDC5-4220-B59D-D342722358A2} ?>