[PATCH 3 of 3] packaging: include hggit in the Windows py3 installer (fixes #5752)

2 views
Skip to first unread message

Matt Harbison

unread,
May 3, 2022, 10:50:29 PMMay 3
to thg...@googlegroups.com
# HG changeset patch
# User Matt Harbison <matt_h...@yahoo.com>
# Date 1651618582 14400
# Tue May 03 18:56:22 2022 -0400
# Node ID 73f802c4c67320ebda6e59b66add1d858ea16b85
# Parent 69131fbd8995b7107fa3e0f6f2530400091f984e
# EXP-Topic windows-py3-packaging
packaging: include hggit in the Windows py3 installer (fixes #5752)

Back by popular demand.

diff --git a/contrib/packaging/thgpackaging/py2exe.py b/contrib/packaging/thgpackaging/py2exe.py
--- a/contrib/packaging/thgpackaging/py2exe.py
+++ b/contrib/packaging/thgpackaging/py2exe.py
@@ -293,7 +293,7 @@
includes = PyQt5.sip, PyQt5.QtPrintSupport, PyQt5.QtSvg, PyQt5.QtXml,
mercurial_keyring, pygit2

-packages = ctypes, curses, email, encodings, iniparse, json, keyring,
+packages = ctypes, curses, dulwich, email, encodings, iniparse, json, keyring,
keyring.backends, nntplib, pygments, sspi, sqlite3, six,

hgext,
@@ -303,7 +303,7 @@
hgext.lfs, hgext.narrow, hgext.remotefilelog, hgext.zeroconf,
mercurial.cext, mercurial.pure, mercurial.defaultrc,

- hgext3rd, hgext3rd.evolve, hgext3rd.topic,
+ hgext3rd, hgext3rd.evolve, hgext3rd.topic, hggit,

tortoisehg.hgqt, tortoisehg.util
'''.strip())
diff --git a/win32/wix/dist-py3.wxs b/win32/wix/dist-py3.wxs
--- a/win32/wix/dist-py3.wxs
+++ b/win32/wix/dist-py3.wxs
@@ -30,6 +30,9 @@
<File Name="libcrypto-1_1.dll" />
<File Name="libssl-1_1.dll" />
<?endif?>
+ <File Name="dulwich._diff_tree.pyd" />
+ <File Name="dulwich._objects.pyd" />
+ <File Name="dulwich._pack.pyd" />
<File Name="pygit2._libgit2.pyd" />
<File Name="pygit2._pygit2.pyd" />
<File Name="Qt5Core.dll" />
diff --git a/win32/wix/guids.wxi b/win32/wix/guids.wxi
--- a/win32/wix/guids.wxi
+++ b/win32/wix/guids.wxi
@@ -32,8 +32,8 @@
<?define templates.static.guid = {2c807a50-27ce-46c4-b8e6-1cb0be1e7105} ?>

<!-- dist.wxs -->
- <?define dist.guid = {e39b0f21-034e-45fa-9da5-802148c1a883} ?>
- <?define lib.guid = {da5cb94e-dae4-45b2-a9b3-8138e97b5d71} ?>
+ <?define dist.guid = {98b18124-41af-449c-9396-202a3e0c0c41} ?>
+ <?define lib.guid = {7b261357-2643-401d-90c9-b31270242927} ?>
<?define imageformats.guid = {12885995-61ed-468f-a964-3654d091138e} ?>
<?define platforms.guid = {4b2c42d4-fbb3-4449-b1df-31bf789e009e} ?>
<?define KDiff3EXE.guid = {075ECC11-1B44-48DB-B7FD-D3207BB801A4} ?>
Reply all
Reply to author
Forward
0 new messages