diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2024-06-03 15:06:53 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-03 15:06:53 (GMT) |
| commit | 671b740f45bf606208d89300b63b1d206c6a6e4a (patch) | |
| tree | 805710317f9fd0c60a82a13bf906514ae6a73fdc /Tools | |
| parent | b26b410ce90214480c96079ff3a9c202b59f54a0 (diff) | |
| download | cpython-671b740f45bf606208d89300b63b1d206c6a6e4a.zip cpython-671b740f45bf606208d89300b63b1d206c6a6e4a.tar.gz cpython-671b740f45bf606208d89300b63b1d206c6a6e4a.tar.bz2 | |
gh-119679: Ensures correct import libraries are included in Windows install packages (GH-119790)
(cherry picked from commit fd01271366abefa8f991e53f090387882fbd6bdd)
Co-authored-by: Steve Dower <steve.dower@python.org>
Diffstat (limited to 'Tools')
| -rw-r--r-- | Tools/msi/freethreaded/freethreaded_files.wxs | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/Tools/msi/freethreaded/freethreaded_files.wxs b/Tools/msi/freethreaded/freethreaded_files.wxs index adaf63c..49ecb34 100644 --- a/Tools/msi/freethreaded/freethreaded_files.wxs +++ b/Tools/msi/freethreaded/freethreaded_files.wxs @@ -48,6 +48,12 @@ <Component Id="freethreaded_python.dll" Directory="InstallDirectory" Guid="*"> <File Id="freethreaded_python.dll" Name="python$(var.MajorVersionNumber)$(var.MinorVersionNumber)t.dll" KeyPath="yes" /> </Component> + <Component Id="freethreaded_python_stable.lib" Directory="libs" Guid="*"> + <File Id="freethreaded_python_stable.lib" Name="python$(var.MajorVersionNumber)t.lib" KeyPath="yes" /> + </Component> + <Component Id="freethreaded_python.lib" Directory="libs" Guid="*"> + <File Id="freethreaded_python.lib" Name="python$(var.MajorVersionNumber)$(var.MinorVersionNumber)t.lib" KeyPath="yes" /> + </Component> </ComponentGroup> </Fragment> <Fragment> @@ -69,8 +75,14 @@ <File Id="freethreaded_python_stable_d.dll" Name="python$(var.MajorVersionNumber)t_d.dll" KeyPath="yes" /> </Component> <Component Id="freethreaded_python_d.dll" Directory="InstallDirectory" Guid="*"> - <File Id="freethreaded_python_d.dll" Name="python$(var.MajorVersionNumber)$(var.MinorVersionNumber)_d.dll" KeyPath="yes" /> - <File Id="freethreaded_python_d.pdb" Name="python$(var.MajorVersionNumber)$(var.MinorVersionNumber)_d.pdb" KeyPath="no" /> + <File Id="freethreaded_python_d.dll" Name="python$(var.MajorVersionNumber)$(var.MinorVersionNumber)t_d.dll" KeyPath="yes" /> + <File Id="freethreaded_python_d.pdb" Name="python$(var.MajorVersionNumber)$(var.MinorVersionNumber)t_d.pdb" KeyPath="no" /> + </Component> + <Component Id="freethreaded_python_stable_d.lib" Directory="libs" Guid="*"> + <File Id="freethreaded_python_stable_d.lib" Name="python$(var.MajorVersionNumber)t_d.lib" KeyPath="yes" /> + </Component> + <Component Id="freethreaded_python_d.lib" Directory="libs" Guid="*"> + <File Id="freethreaded_python_d.lib" Name="python$(var.MajorVersionNumber)$(var.MinorVersionNumber)t_d.lib" KeyPath="yes" /> </Component> </ComponentGroup> </Fragment> @@ -147,12 +159,6 @@ <?endforeach ?> - <Component Id="venvlauncher_d.exe" Directory="Lib_venv_scripts_nt__freethreaded" Guid="*"> - <File Name="python_d.exe" Source="venvlauncher_d.exe" KeyPath="yes" /> - </Component> - <Component Id="venvwlauncher_d.exe" Directory="Lib_venv_scripts_nt__freethreaded" Guid="*"> - <File Name="pythonw_d.exe" Source="venvwlauncher_d.exe" KeyPath="yes" /> - </Component> <Component Id="venvlaunchert_d.pdb" Directory="Lib_venv_scripts_nt__freethreaded" Guid="*"> <File Name="venvlaunchert_d.pdb" KeyPath="yes" /> </Component> |