bpo-41089: Filters and other issues in Visual Studio projects (GH-21070) · wrongnull/cpython@fe2a48c · GitHub
Skip to content

Commit fe2a48c

Browse files
nnemkinnnemkin
authored
bpo-41089: Filters and other issues in Visual Studio projects (pythonGH-21070)
* Add missing header files to pythoncore. * Add missing file filters ("Resource Files" in particular) to all projects. * Add new sub-filters for private headers in pythoncore and for 3rd party source files. * Add missing _zoneinfo configurations in pcbuild.sln. * Update bdist_wininst with the new zlib location.
1 parent f9bd05e commit fe2a48c

46 files changed

Lines changed: 1145 additions & 339 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎PC/bdist_wininst/bdist_wininst.vcxproj‎

Lines changed: 8 additions & 7 deletions

‎PC/bdist_wininst/bdist_wininst.vcxproj.filters‎

Lines changed: 21 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -16,45 +16,51 @@
1616
<UniqueIdentifier>{0c77c1cf-3f87-4f87-bd86-b425211c2181}</UniqueIdentifier>
1717
<Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>
1818
</Filter>
19+
<Filter Include="Header Files\zlib">
20+
<UniqueIdentifier>{d10220c7-69e3-47c5-8d82-c8e0d4d2ac88}</UniqueIdentifier>
21+
</Filter>
1922
</ItemGroup>
2023
<ItemGroup>
21-
<ClCompile Include="..\PC\bdist_wininst\extract.c">
24+
<ClCompile Include="extract.c">
2225
<Filter>Source Files</Filter>
2326
</ClCompile>
24-
<ClCompile Include="..\PC\bdist_wininst\install.c">
27+
<ClCompile Include="install.c">
2528
<Filter>Source Files</Filter>
2629
</ClCompile>
27-
<ClCompile Include="..\Modules\zlib\adler32.c">
30+
<ClCompile Include="$(zlibDir)\adler32.c">
2831
<Filter>Source Files\zlib</Filter>
2932
</ClCompile>
30-
<ClCompile Include="..\Modules\zlib\crc32.c">
33+
<ClCompile Include="$(zlibDir)\crc32.c">
3134
<Filter>Source Files\zlib</Filter>
3235
</ClCompile>
33-
<ClCompile Include="..\Modules\zlib\inffast.c">
36+
<ClCompile Include="$(zlibDir)\inffast.c">
3437
<Filter>Source Files\zlib</Filter>
3538
</ClCompile>
36-
<ClCompile Include="..\Modules\zlib\inflate.c">
39+
<ClCompile Include="$(zlibDir)\inflate.c">
3740
<Filter>Source Files\zlib</Filter>
3841
</ClCompile>
39-
<ClCompile Include="..\Modules\zlib\inftrees.c">
42+
<ClCompile Include="$(zlibDir)\inftrees.c">
4043
<Filter>Source Files\zlib</Filter>
4144
</ClCompile>
42-
<ClCompile Include="..\Modules\zlib\zutil.c">
45+
<ClCompile Include="$(zlibDir)\zutil.c">
4346
<Filter>Source Files\zlib</Filter>
4447
</ClCompile>
4548
</ItemGroup>
4649
<ItemGroup>
47-
<ClInclude Include="..\PC\bdist_wininst\archive.h">
48-
<Filter>Header Files</Filter>
49-
</ClInclude>
50-
</ItemGroup>
51-
<ItemGroup>
52-
<ResourceCompile Include="..\PC\bdist_wininst\install.rc">
50+
<ResourceCompile Include="install.rc">
5351
<Filter>Resource Files</Filter>
5452
</ResourceCompile>
5553
</ItemGroup>
5654
<ItemGroup>
57-
<None Include="..\PC\bdist_wininst\PythonPowered.bmp">
55+
<ClInclude Include="archive.h">
56+
<Filter>Header Files</Filter>
57+
</ClInclude>
58+
<ClInclude Include="$(zlibDir)\zlib.h">
59+
<Filter>Header Files\zlib</Filter>
60+
</ClInclude>
61+
</ItemGroup>
62+
<ItemGroup>
63+
<None Include="PythonPowered.bmp">
5864
<Filter>Resource Files</Filter>
5965
</None>
6066
</ItemGroup>

‎PCbuild/_asyncio.vcxproj.filters‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,21 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<ItemGroup>
4-
<ResourceCompile Include="..\PC\python_nt.rc" />
5-
</ItemGroup>
63
<ItemGroup>
74
<Filter Include="Source Files">
85
<UniqueIdentifier>{2422278e-eeeb-4241-8182-433e2bc5a7fc}</UniqueIdentifier>
96
</Filter>
7+
<Filter Include="Resource Files">
8+
<UniqueIdentifier>{41f1cd52-b682-46aa-a7fd-7bdf81a18010}</UniqueIdentifier>
9+
</Filter>
1010
</ItemGroup>
1111
<ItemGroup>
1212
<ClCompile Include="..\Modules\_asynciomodule.c">
1313
<Filter>Source Files</Filter>
1414
</ClCompile>
1515
</ItemGroup>
16+
<ItemGroup>
17+
<ResourceCompile Include="..\PC\python_nt.rc">
18+
<Filter>Resource Files</Filter>
19+
</ResourceCompile>
20+
</ItemGroup>
1621
</Project>

‎PCbuild/_bz2.vcxproj.filters‎

Lines changed: 25 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,16 @@
44
<Filter Include="Source Files">
55
<UniqueIdentifier>{f53a859d-dad2-4d5b-ae41-f28d8b571f5a}</UniqueIdentifier>
66
</Filter>
7-
<Filter Include="bzip2 1.0.6 Header Files">
7+
<Filter Include="Resource Files">
8+
<UniqueIdentifier>{b90c3cee-7700-4e87-bf85-0801866e8d0d}</UniqueIdentifier>
9+
</Filter>
10+
<Filter Include="Header Files">
811
<UniqueIdentifier>{7e0bed05-ae33-43b7-8797-656455bbb7f3}</UniqueIdentifier>
912
</Filter>
10-
<Filter Include="bzip2 1.0.6 Source Files">
13+
<Filter Include="Header Files\bzip2">
14+
<UniqueIdentifier>{b53f67d8-fdf0-4e10-a987-e44475ff434a}</UniqueIdentifier>
15+
</Filter>
16+
<Filter Include="Source Files\bzip2">
1117
<UniqueIdentifier>{ed574b89-6983-4cdf-9f98-fe7048d9e89c}</UniqueIdentifier>
1218
</Filter>
1319
</ItemGroup>
@@ -16,33 +22,38 @@
1622
<Filter>Source Files</Filter>
1723
</ClCompile>
1824
<ClCompile Include="$(bz2Dir)\blocksort.c">
19-
<Filter>bzip2 1.0.6 Source Files</Filter>
25+
<Filter>Source Files\bzip2</Filter>
2026
</ClCompile>
2127
<ClCompile Include="$(bz2Dir)\bzlib.c">
22-
<Filter>bzip2 1.0.6 Source Files</Filter>
28+
<Filter>Source Files\bzip2</Filter>
2329
</ClCompile>
2430
<ClCompile Include="$(bz2Dir)\compress.c">
25-
<Filter>bzip2 1.0.6 Source Files</Filter>
31+
<Filter>Source Files\bzip2</Filter>
2632
</ClCompile>
2733
<ClCompile Include="$(bz2Dir)\crctable.c">
28-
<Filter>bzip2 1.0.6 Source Files</Filter>
34+
<Filter>Source Files\bzip2</Filter>
2935
</ClCompile>
3036
<ClCompile Include="$(bz2Dir)\decompress.c">
31-
<Filter>bzip2 1.0.6 Source Files</Filter>
37+
<Filter>Source Files\bzip2</Filter>
3238
</ClCompile>
3339
<ClCompile Include="$(bz2Dir)\huffman.c">
34-
<Filter>bzip2 1.0.6 Source Files</Filter>
40+
<Filter>Source Files\bzip2</Filter>
3541
</ClCompile>
3642
<ClCompile Include="$(bz2Dir)\randtable.c">
37-
<Filter>bzip2 1.0.6 Source Files</Filter>
43+
<Filter>Source Files\bzip2</Filter>
3844
</ClCompile>
3945
</ItemGroup>
4046
<ItemGroup>
41-
<ClInclude Include="$(bz2Dir)\bzlib.h">
42-
<Filter>bzip2 1.0.6 Header Files</Filter>
43-
</ClInclude>
4447
<ClInclude Include="$(bz2Dir)\bzlib_private.h">
45-
<Filter>bzip2 1.0.6 Header Files</Filter>
48+
<Filter>Header Files\bzip2</Filter>
4649
</ClInclude>
50+
<ClInclude Include="$(bz2Dir)\bzlib.h">
51+
<Filter>Header Files\bzip2</Filter>
52+
</ClInclude>
53+
</ItemGroup>
54+
<ItemGroup>
55+
<ResourceCompile Include="..\PC\python_nt.rc">
56+
<Filter>Resource Files</Filter>
57+
</ResourceCompile>
4758
</ItemGroup>
48-
</Project>
59+
</Project>

‎PCbuild/_ctypes.vcxproj.filters‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77
<Filter Include="Source Files">
88
<UniqueIdentifier>{dbdea1f2-ad8b-44ca-b782-fcf65d91559b}</UniqueIdentifier>
99
</Filter>
10+
<Filter Include="Resource Files">
11+
<UniqueIdentifier>{31a37bb4-c384-41ff-9ec1-8ad98d482e22}</UniqueIdentifier>
12+
</Filter>
1013
</ItemGroup>
1114
<ItemGroup>
1215
<ClInclude Include="..\Modules\_ctypes\ctypes.h">
@@ -37,6 +40,8 @@
3740
</ClCompile>
3841
</ItemGroup>
3942
<ItemGroup>
40-
<ResourceCompile Include="..\PC\python_nt.rc" />
43+
<ResourceCompile Include="..\PC\python_nt.rc">
44+
<Filter>Resource Files</Filter>
45+
</ResourceCompile>
4146
</ItemGroup>
4247
</Project>

‎PCbuild/_ctypes_test.vcxproj.filters‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77
<Filter Include="Source Files">
88
<UniqueIdentifier>{38abc486-e143-49dc-8cf0-8aefab0e0d3d}</UniqueIdentifier>
99
</Filter>
10+
<Filter Include="Resource Files">
11+
<UniqueIdentifier>{5030ff8f-daf5-4bc8-b1dd-e8b59d34c511}</UniqueIdentifier>
12+
</Filter>
1013
</ItemGroup>
1114
<ItemGroup>
1215
<ClInclude Include="..\Modules\_ctypes\_ctypes_test.h">
@@ -18,4 +21,9 @@
1821
<Filter>Source Files</Filter>
1922
</ClCompile>
2023
</ItemGroup>
24+
<ItemGroup>
25+
<ResourceCompile Include="..\PC\python_nt.rc">
26+
<Filter>Resource Files</Filter>
27+
</ResourceCompile>
28+
</ItemGroup>
2129
</Project>

‎PCbuild/_decimal.vcxproj.filters‎

Lines changed: 48 additions & 34 deletions

0 commit comments

Comments
 (0)