summaryrefslogtreecommitdiffstats
path: root/Tools/msi
diff options
context:
space:
mode:
authorPaul Monson <paulmon@users.noreply.github.com>2019-03-29 23:30:10 (GMT)
committerSteve Dower <steve.dower@microsoft.com>2019-03-29 23:30:10 (GMT)
commit32119e10b792ad7ee4e5f951a2d89ddbaf111cc5 (patch)
tree49219272ab3f00bbc62a9d70a2e05ba938d7ec1e /Tools/msi
parent3396d1e0ca858065c5bb7e5a9737be6ffc4028f7 (diff)
downloadcpython-32119e10b792ad7ee4e5f951a2d89ddbaf111cc5.zip
cpython-32119e10b792ad7ee4e5f951a2d89ddbaf111cc5.tar.gz
cpython-32119e10b792ad7ee4e5f951a2d89ddbaf111cc5.tar.bz2
bpo-35947: Update Windows to the current version of libffi (GH-11797)
We now use a pre-built libffi binary from our binaries repository, and no longer vendor the full implementation.
Diffstat (limited to 'Tools/msi')
-rw-r--r--Tools/msi/lib/lib_files.wxs6
1 files changed, 6 insertions, 0 deletions
diff --git a/Tools/msi/lib/lib_files.wxs b/Tools/msi/lib/lib_files.wxs
index 251f9b1..472bacf 100644
--- a/Tools/msi/lib/lib_files.wxs
+++ b/Tools/msi/lib/lib_files.wxs
@@ -22,6 +22,9 @@
<Component Id="libssl.dll" Directory="DLLs" Guid="*">
<File Name="libssl$(var.ssltag).dll" KeyPath="yes" />
</Component>
+ <Component Id="libffi.dll" Directory="DLLs" Guid="*">
+ <File Name="libffi-7.dll" KeyPath="yes" />
+ </Component>
<Component Id="venvlauncher.exe" Directory="Lib_venv_scripts_nt" Guid="*">
<File Name="python.exe" Source="venvlauncher.exe" KeyPath="yes" />
</Component>
@@ -59,6 +62,9 @@
<Component Id="libssl.pdb" Directory="DLLs" Guid="*">
<File Name="libssl$(var.ssltag).pdb" KeyPath="yes" />
</Component>
+ <Component Id="libffi.pdb" Directory="DLLs" Guid="*">
+ <File Name="libffi-7.pdb" KeyPath="yes" />
+ </Component>
<Component Id="venvlauncher.pdb" Directory="Lib_venv_scripts_nt__pdbs" Guid="*">
<File Name="python.pdb" Source="venvlauncher.pdb" KeyPath="yes" />
</Component>