Skip to content

Commit b75d4c1

Browse files
ngoldbaumngoldbaum
committed
More minimal fix that doesn't require a new vcxproj
1 parent 96676cf commit b75d4c1

9 files changed

Lines changed: 15 additions & 180 deletions

File tree

‎PCbuild/abi3t-compat.vcxproj‎

Lines changed: 0 additions & 113 deletions
This file was deleted.

‎PCbuild/abi3t-compat.vcxproj.filters‎

Lines changed: 0 additions & 23 deletions
This file was deleted.

‎PCbuild/pcbuild.proj‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,6 @@
6161
</Projects>
6262
<!-- python3.dll -->
6363
<Projects Include="python3dll.vcxproj" />
64-
<!-- abi3t-compat\python3t.dll -->
65-
<Projects Include="abi3t-compat.vcxproj" />
6664
<!-- py[w].exe -->
6765
<Projects Include="pylauncher.vcxproj;pywlauncher.vcxproj" />
6866
<!-- pyshellext.dll -->

‎PCbuild/pcbuild.sln‎

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "python", "python.vcxproj",
3333
{78D80A15-BD8C-44E2-B49E-1F05B0A0A687} = {78D80A15-BD8C-44E2-B49E-1F05B0A0A687}
3434
{86937F53-C189-40EF-8CE8-8759D8E7D480} = {86937F53-C189-40EF-8CE8-8759D8E7D480}
3535
{885D4898-D08D-4091-9C40-C700CFE3FC5A} = {885D4898-D08D-4091-9C40-C700CFE3FC5A}
36-
{947BB5F5-6025-4A4F-8182-1B175469F8D2} = {947BB5F5-6025-4A4F-8182-1B175469F8D2}
3736
{900342D7-516A-4469-B1AD-59A66E49A25F} = {900342D7-516A-4469-B1AD-59A66E49A25F}
3837
{9E48B300-37D1-11DD-8C41-005056C00008} = {9E48B300-37D1-11DD-8C41-005056C00008}
3938
{9EC7190A-249F-4180-A900-548FDCF3055F} = {9EC7190A-249F-4180-A900-548FDCF3055F}
@@ -105,8 +104,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_multiprocessing", "_multip
105104
EndProject
106105
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "python3dll", "python3dll.vcxproj", "{885D4898-D08D-4091-9C40-C700CFE3FC5A}"
107106
EndProject
108-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "abi3t-compat", "abi3t-compat.vcxproj", "{947BB5F5-6025-4A4F-8182-1B175469F8D2}"
109-
EndProject
110107
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xxlimited", "xxlimited.vcxproj", "{F749B822-B489-4CA5-A3AD-CE078F5F338A}"
111108
EndProject
112109
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_testbuffer", "_testbuffer.vcxproj", "{A2697BD3-28C1-4AEC-9106-8B748639FD16}"
@@ -987,38 +984,6 @@ Global
987984
{885D4898-D08D-4091-9C40-C700CFE3FC5A}.Release|Win32.Build.0 = Release|Win32
988985
{885D4898-D08D-4091-9C40-C700CFE3FC5A}.Release|x64.ActiveCfg = Release|x64
989986
{885D4898-D08D-4091-9C40-C700CFE3FC5A}.Release|x64.Build.0 = Release|x64
990-
{947BB5F5-6025-4A4F-8182-1B175469F8D2}.Debug|ARM.ActiveCfg = Debug|ARM
991-
{947BB5F5-6025-4A4F-8182-1B175469F8D2}.Debug|ARM.Build.0 = Debug|ARM
992-
{947BB5F5-6025-4A4F-8182-1B175469F8D2}.Debug|ARM64.ActiveCfg = Debug|ARM64
993-
{947BB5F5-6025-4A4F-8182-1B175469F8D2}.Debug|ARM64.Build.0 = Debug|ARM64
994-
{947BB5F5-6025-4A4F-8182-1B175469F8D2}.Debug|Win32.ActiveCfg = Debug|Win32
995-
{947BB5F5-6025-4A4F-8182-1B175469F8D2}.Debug|Win32.Build.0 = Debug|Win32
996-
{947BB5F5-6025-4A4F-8182-1B175469F8D2}.Debug|x64.ActiveCfg = Debug|x64
997-
{947BB5F5-6025-4A4F-8182-1B175469F8D2}.Debug|x64.Build.0 = Debug|x64
998-
{947BB5F5-6025-4A4F-8182-1B175469F8D2}.PGInstrument|ARM.ActiveCfg = PGInstrument|ARM
999-
{947BB5F5-6025-4A4F-8182-1B175469F8D2}.PGInstrument|ARM.Build.0 = PGInstrument|ARM
1000-
{947BB5F5-6025-4A4F-8182-1B175469F8D2}.PGInstrument|ARM64.ActiveCfg = PGInstrument|ARM64
1001-
{947BB5F5-6025-4A4F-8182-1B175469F8D2}.PGInstrument|ARM64.Build.0 = PGInstrument|ARM64
1002-
{947BB5F5-6025-4A4F-8182-1B175469F8D2}.PGInstrument|Win32.ActiveCfg = Debug|Win32
1003-
{947BB5F5-6025-4A4F-8182-1B175469F8D2}.PGInstrument|Win32.Build.0 = Debug|Win32
1004-
{947BB5F5-6025-4A4F-8182-1B175469F8D2}.PGInstrument|x64.ActiveCfg = Debug|x64
1005-
{947BB5F5-6025-4A4F-8182-1B175469F8D2}.PGInstrument|x64.Build.0 = Debug|x64
1006-
{947BB5F5-6025-4A4F-8182-1B175469F8D2}.PGUpdate|ARM.ActiveCfg = PGUpdate|ARM
1007-
{947BB5F5-6025-4A4F-8182-1B175469F8D2}.PGUpdate|ARM.Build.0 = PGUpdate|ARM
1008-
{947BB5F5-6025-4A4F-8182-1B175469F8D2}.PGUpdate|ARM64.ActiveCfg = PGUpdate|ARM64
1009-
{947BB5F5-6025-4A4F-8182-1B175469F8D2}.PGUpdate|ARM64.Build.0 = PGUpdate|ARM64
1010-
{947BB5F5-6025-4A4F-8182-1B175469F8D2}.PGUpdate|Win32.ActiveCfg = Debug|Win32
1011-
{947BB5F5-6025-4A4F-8182-1B175469F8D2}.PGUpdate|Win32.Build.0 = Debug|Win32
1012-
{947BB5F5-6025-4A4F-8182-1B175469F8D2}.PGUpdate|x64.ActiveCfg = Debug|x64
1013-
{947BB5F5-6025-4A4F-8182-1B175469F8D2}.PGUpdate|x64.Build.0 = Debug|x64
1014-
{947BB5F5-6025-4A4F-8182-1B175469F8D2}.Release|ARM.ActiveCfg = Release|ARM
1015-
{947BB5F5-6025-4A4F-8182-1B175469F8D2}.Release|ARM.Build.0 = Release|ARM
1016-
{947BB5F5-6025-4A4F-8182-1B175469F8D2}.Release|ARM64.ActiveCfg = Release|ARM64
1017-
{947BB5F5-6025-4A4F-8182-1B175469F8D2}.Release|ARM64.Build.0 = Release|ARM64
1018-
{947BB5F5-6025-4A4F-8182-1B175469F8D2}.Release|Win32.ActiveCfg = Release|Win32
1019-
{947BB5F5-6025-4A4F-8182-1B175469F8D2}.Release|Win32.Build.0 = Release|Win32
1020-
{947BB5F5-6025-4A4F-8182-1B175469F8D2}.Release|x64.ActiveCfg = Release|x64
1021-
{947BB5F5-6025-4A4F-8182-1B175469F8D2}.Release|x64.Build.0 = Release|x64
1022987
{F749B822-B489-4CA5-A3AD-CE078F5F338A}.Debug|ARM.ActiveCfg = Debug|ARM
1023988
{F749B822-B489-4CA5-A3AD-CE078F5F338A}.Debug|ARM64.ActiveCfg = Debug|ARM64
1024989
{F749B822-B489-4CA5-A3AD-CE078F5F338A}.Debug|Win32.ActiveCfg = Release|Win32

‎PCbuild/pyproject.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
<_PlatformPreprocessorDefinition Condition="$(Platform) == 'x64'">_WIN64;</_PlatformPreprocessorDefinition>
5050
<_PlatformPreprocessorDefinition Condition="$(Platform) == 'x64' and $(PlatformToolset) != 'ClangCL'">_M_X64;$(_PlatformPreprocessorDefinition)</_PlatformPreprocessorDefinition>
5151
<_Py3NamePreprocessorDefinition>PY3_DLLNAME=L"$(Py3DllName)$(PyDebugExt)";</_Py3NamePreprocessorDefinition>
52-
<_Abi3tCompatDllNamePreprocessorDefinition Condition="$(DisableGil) != 'true'">ABI3T_COMPAT_DLLNAME=L"$(PyAbi3tCompatDllDir)\\$(PyAbi3tCompatDllName)$(PyDebugExt)";</_Abi3tCompatDllNamePreprocessorDefinition>
52+
<_Abi3tCompatDllNamePreprocessorDefinition Condition="$(DisableGil) != 'true'">ABI3T_COMPAT_DLLNAME=L"abi3t-compat\\python3t$(PyDebugExt)";</_Abi3tCompatDllNamePreprocessorDefinition>
5353
<_FreeThreadedPreprocessorDefinition Condition="$(DisableGil) == 'true'">Py_GIL_DISABLED=1;</_FreeThreadedPreprocessorDefinition>
5454
<_PymallocHugepagesPreprocessorDefinition Condition="$(UsePymallocHugepages) == 'true'">PYMALLOC_USE_HUGEPAGES=1;</_PymallocHugepagesPreprocessorDefinition>
5555
</PropertyGroup>

‎PCbuild/python.props‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -244,10 +244,6 @@
244244
<!-- The name of the resulting pythonX.dll (without the extension) -->
245245
<Py3DllName Condition="$(DisableGil) == 'true'">python3t</Py3DllName>
246246
<Py3DllName Condition="$(Py3DllName) == ''">python3</Py3DllName>
247-
<!-- The directory & name (without extension) of abi3t-compat\pythonXt.dll -->
248-
<PyAbi3tCompatDllDir>abi3t-compat</PyAbi3tCompatDllDir>
249-
<PyAbi3tCompatDllName>python3t</PyAbi3tCompatDllName>
250-
251247
<!-- The version and platform tag to include in .pyd filenames -->
252248
<PydTag Condition="$(ArchName) == 'win32'">.cp$(MajorVersionNumber)$(MinorVersionNumber)-win32</PydTag>
253249
<PydTag Condition="$(ArchName) == 'arm32'">.cp$(MajorVersionNumber)$(MinorVersionNumber)-win_arm32</PydTag>

‎Tools/msi/common.wxs‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,12 @@
7575
</Fragment>
7676

7777
<!-- Top-level directories -->
78+
<Fragment>
79+
<DirectoryRef Id="InstallDirectory">
80+
<Directory Id="abi3t_compat" Name="abi3t-compat" />
81+
</DirectoryRef>
82+
</Fragment>
83+
7884
<Fragment>
7985
<DirectoryRef Id="InstallDirectory">
8086
<Directory Id="DLLs" Name="DLLs">

‎Tools/msi/core/core_files.wxs‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
33
<Fragment>
44
<ComponentGroup Id="core_dll">
5-
<Component Id="python_abi3tcompat.dll" Directory="InstallDirectory" Guid="*">
6-
<File Id="python_abi3tcompat.dll" Name="abi3t-compat\python$(var.MajorVersionNumber)t.dll" KeyPath="yes" />
5+
<Component Id="python_abi3tcompat.dll" Directory="abi3t_compat" Guid="*">
6+
<File Id="python_abi3tcompat.dll" Name="python$(var.MajorVersionNumber)t.dll" Source="!(bindpath.build)\python$(var.MajorVersionNumber).dll" KeyPath="yes" />
77
</Component>
88
<Component Id="python_stable.dll" Directory="InstallDirectory" Guid="*">
99
<File Id="python_stable.dll" Name="python$(var.MajorVersionNumber).dll" KeyPath="yes" />
@@ -22,6 +22,9 @@
2222
</Fragment>
2323
<Fragment>
2424
<ComponentGroup Id="core_dll_d">
25+
<Component Id="python_abi3tcompat_d.dll" Directory="abi3t_compat" Guid="*">
26+
<File Id="python_abi3tcompat_d.dll" Name="python$(var.MajorVersionNumber)t_d.dll" Source="!(bindpath.build)\python$(var.MajorVersionNumber)_d.dll" KeyPath="yes" />
27+
</Component>
2528
<Component Id="python_stable_d.dll" Directory="InstallDirectory" Guid="*">
2629
<File Id="python_stable_d.dll" Name="python$(var.MajorVersionNumber)_d.dll" KeyPath="yes" />
2730
</Component>

‎Tools/msi/msi.props‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,9 @@
131131
<LinkerBindInputPaths Include="$(CRTRedist)">
132132
<BindName>redist</BindName>
133133
</LinkerBindInputPaths>
134+
<LinkerBindInputPaths Include="$(BuildPath)">
135+
<BindName>build</BindName>
136+
</LinkerBindInputPaths>
134137
<LinkerBindInputPaths Include="$(BuildPath32)">
135138
<BindName>build32</BindName>
136139
</LinkerBindInputPaths>

0 commit comments

Comments
 (0)