This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6137

wix: package missing .dll and .pyd files
ClosedPublic

Authored by indygreg on Mar 14 2019, 9:39 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG9661a9c0695e: wix: package missing .dll and .pyd files
Summary

dist.wxs is currently missing some .pyd and .dll files which are
picked up and staged by py2exe. This means that the WiX installer
is missing some Python extension modules and their dependencies which
are referenced by Mercurial or a Python package distributed with
it.

This commit adds the missing files to the WiX installer.

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.Mar 14 2019, 9:39 PM
Closed by commit rHG9661a9c0695e: wix: package missing .dll and .pyd files (authored by indygreg). · Explain WhyMar 15 2019, 11:11 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mcontrib/packaging/wix/dist.wxs (7 lines)

Diff 14516

contrib/packaging/wix/dist.wxs

<Directory Id="libdir" Name="lib" FileSource="$(var.SourceDir)/lib"> <Directory Id="libdir" Name="lib" FileSource="$(var.SourceDir)/lib">
<Component Id="libOutput" Guid="$(var.lib.guid)" Win64='$(var.IsX64)'> <Component Id="libOutput" Guid="$(var.lib.guid)" Win64='$(var.IsX64)'>
<File Name="library.zip" KeyPath="yes" /> <File Name="library.zip" KeyPath="yes" />
<File Name="mercurial.cext.base85.pyd" /> <File Name="mercurial.cext.base85.pyd" />
<File Name="mercurial.cext.bdiff.pyd" /> <File Name="mercurial.cext.bdiff.pyd" />
<File Name="mercurial.cext.mpatch.pyd" /> <File Name="mercurial.cext.mpatch.pyd" />
<File Name="mercurial.cext.osutil.pyd" /> <File Name="mercurial.cext.osutil.pyd" />
<File Name="mercurial.cext.parsers.pyd" /> <File Name="mercurial.cext.parsers.pyd" />
<File Name="mercurial.thirdparty.zope.interface._zope_interface_coptimizations.pyd" />
<File Name="mercurial.zstd.pyd" /> <File Name="mercurial.zstd.pyd" />
<File Name="hgext.fsmonitor.pywatchman.bser.pyd" /> <File Name="hgext.fsmonitor.pywatchman.bser.pyd" />
<File Name="pyexpat.pyd" /> <File Name="pyexpat.pyd" />
<File Name="bz2.pyd" /> <File Name="bz2.pyd" />
<File Name="select.pyd" /> <File Name="select.pyd" />
<File Name="sqlite3.dll" />
<File Name="tcl85.dll" />
<File Name="tk85.dll" />
<File Name="unicodedata.pyd" /> <File Name="unicodedata.pyd" />
<File Name="_ctypes.pyd" /> <File Name="_ctypes.pyd" />
<File Name="_elementtree.pyd" /> <File Name="_elementtree.pyd" />
<File Name="_testcapi.pyd" /> <File Name="_testcapi.pyd" />
<File Name="_hashlib.pyd" /> <File Name="_hashlib.pyd" />
<File Name="_multiprocessing.pyd" />
<File Name="_socket.pyd" /> <File Name="_socket.pyd" />
<File Name="_sqlite3.pyd" />
<File Name="_ssl.pyd" /> <File Name="_ssl.pyd" />
<File Name="_tkinter.pyd" />
</Component> </Component>
</Directory> </Directory>
</DirectoryRef> </DirectoryRef>
</Fragment> </Fragment>
</Wix> </Wix>