Skip to content

Commit

Permalink
bpo-41089: Filters and other issues in Visual Studio projects (GH-21070)
Browse files Browse the repository at this point in the history 
* 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.
  • Loading branch information
@nnemkin
nnemkin committed Jun 23, 2020
1 parent f9bd05e commit fe2a48c
Show file tree
Hide file tree
Showing 46 changed files with 1,145 additions and 339 deletions.
15 changes: 8 additions & 7 deletions PC/bdist_wininst/bdist_wininst.vcxproj
View file
Expand Up @@ -87,7 +87,7 @@
</Midl>
<ClCompile>
<Optimization>MinSpace</Optimization>
<AdditionalIncludeDirectories>$(PySourcePath)Modules\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(zlibDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary Condition="'$(Configuration)'=='Debug'">MultiThreadedDebug</RuntimeLibrary>
<RuntimeLibrary Condition="'$(Configuration)'=='Release'">MultiThreaded</RuntimeLibrary>
Expand All @@ -102,15 +102,16 @@
<ItemGroup>
<ClCompile Include="extract.c" />
<ClCompile Include="install.c" />
<ClCompile Include="..\..\Modules\zlib\adler32.c" />
<ClCompile Include="..\..\Modules\zlib\crc32.c" />
<ClCompile Include="..\..\Modules\zlib\inffast.c" />
<ClCompile Include="..\..\Modules\zlib\inflate.c" />
<ClCompile Include="..\..\Modules\zlib\inftrees.c" />
<ClCompile Include="..\..\Modules\zlib\zutil.c" />
<ClCompile Include="$(zlibDir)\adler32.c" />
<ClCompile Include="$(zlibDir)\crc32.c" />
<ClCompile Include="$(zlibDir)\inffast.c" />
<ClCompile Include="$(zlibDir)\inflate.c" />
<ClCompile Include="$(zlibDir)\inftrees.c" />
<ClCompile Include="$(zlibDir)\zutil.c" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="archive.h" />
<ClInclude Include="$(zlibDir)\zlib.h" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="install.rc" />
Expand Down
36 changes: 21 additions & 15 deletions PC/bdist_wininst/bdist_wininst.vcxproj.filters
View file
Expand Up @@ -16,45 +16,51 @@
<UniqueIdentifier>{0c77c1cf-3f87-4f87-bd86-b425211c2181}</UniqueIdentifier>
<Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>
</Filter>
<Filter Include="Header Files\zlib">
<UniqueIdentifier>{d10220c7-69e3-47c5-8d82-c8e0d4d2ac88}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\PC\bdist_wininst\extract.c">
<ClCompile Include="extract.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\PC\bdist_wininst\install.c">
<ClCompile Include="install.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\Modules\zlib\adler32.c">
<ClCompile Include="$(zlibDir)\adler32.c">
<Filter>Source Files\zlib</Filter>
</ClCompile>
<ClCompile Include="..\Modules\zlib\crc32.c">
<ClCompile Include="$(zlibDir)\crc32.c">
<Filter>Source Files\zlib</Filter>
</ClCompile>
<ClCompile Include="..\Modules\zlib\inffast.c">
<ClCompile Include="$(zlibDir)\inffast.c">
<Filter>Source Files\zlib</Filter>
</ClCompile>
<ClCompile Include="..\Modules\zlib\inflate.c">
<ClCompile Include="$(zlibDir)\inflate.c">
<Filter>Source Files\zlib</Filter>
</ClCompile>
<ClCompile Include="..\Modules\zlib\inftrees.c">
<ClCompile Include="$(zlibDir)\inftrees.c">
<Filter>Source Files\zlib</Filter>
</ClCompile>
<ClCompile Include="..\Modules\zlib\zutil.c">
<ClCompile Include="$(zlibDir)\zutil.c">
<Filter>Source Files\zlib</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\PC\bdist_wininst\archive.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\PC\bdist_wininst\install.rc">
<ResourceCompile Include="install.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
</ItemGroup>
<ItemGroup>
<None Include="..\PC\bdist_wininst\PythonPowered.bmp">
<ClInclude Include="archive.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="$(zlibDir)\zlib.h">
<Filter>Header Files\zlib</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="PythonPowered.bmp">
<Filter>Resource Files</Filter>
</None>
</ItemGroup>
Expand Down
11 changes: 8 additions & 3 deletions PCbuild/_asyncio.vcxproj.filters
View file
@@ -1,16 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<ResourceCompile Include="..\PC\python_nt.rc" />
</ItemGroup>
<ItemGroup>
<Filter Include="Source Files">
<UniqueIdentifier>{2422278e-eeeb-4241-8182-433e2bc5a7fc}</UniqueIdentifier>
</Filter>
<Filter Include="Resource Files">
<UniqueIdentifier>{41f1cd52-b682-46aa-a7fd-7bdf81a18010}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\Modules\_asynciomodule.c">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\PC\python_nt.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
</ItemGroup>
</Project>
39 changes: 25 additions & 14 deletions PCbuild/_bz2.vcxproj.filters
View file
Expand Up @@ -4,10 +4,16 @@
<Filter Include="Source Files">
<UniqueIdentifier>{f53a859d-dad2-4d5b-ae41-f28d8b571f5a}</UniqueIdentifier>
</Filter>
<Filter Include="bzip2 1.0.6 Header Files">
<Filter Include="Resource Files">
<UniqueIdentifier>{b90c3cee-7700-4e87-bf85-0801866e8d0d}</UniqueIdentifier>
</Filter>
<Filter Include="Header Files">
<UniqueIdentifier>{7e0bed05-ae33-43b7-8797-656455bbb7f3}</UniqueIdentifier>
</Filter>
<Filter Include="bzip2 1.0.6 Source Files">
<Filter Include="Header Files\bzip2">
<UniqueIdentifier>{b53f67d8-fdf0-4e10-a987-e44475ff434a}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files\bzip2">
<UniqueIdentifier>{ed574b89-6983-4cdf-9f98-fe7048d9e89c}</UniqueIdentifier>
</Filter>
</ItemGroup>
Expand All @@ -16,33 +22,38 @@
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="$(bz2Dir)\blocksort.c">
<Filter>bzip2 1.0.6 Source Files</Filter>
<Filter>Source Files\bzip2</Filter>
</ClCompile>
<ClCompile Include="$(bz2Dir)\bzlib.c">
<Filter>bzip2 1.0.6 Source Files</Filter>
<Filter>Source Files\bzip2</Filter>
</ClCompile>
<ClCompile Include="$(bz2Dir)\compress.c">
<Filter>bzip2 1.0.6 Source Files</Filter>
<Filter>Source Files\bzip2</Filter>
</ClCompile>
<ClCompile Include="$(bz2Dir)\crctable.c">
<Filter>bzip2 1.0.6 Source Files</Filter>
<Filter>Source Files\bzip2</Filter>
</ClCompile>
<ClCompile Include="$(bz2Dir)\decompress.c">
<Filter>bzip2 1.0.6 Source Files</Filter>
<Filter>Source Files\bzip2</Filter>
</ClCompile>
<ClCompile Include="$(bz2Dir)\huffman.c">
<Filter>bzip2 1.0.6 Source Files</Filter>
<Filter>Source Files\bzip2</Filter>
</ClCompile>
<ClCompile Include="$(bz2Dir)\randtable.c">
<Filter>bzip2 1.0.6 Source Files</Filter>
<Filter>Source Files\bzip2</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="$(bz2Dir)\bzlib.h">
<Filter>bzip2 1.0.6 Header Files</Filter>
</ClInclude>
<ClInclude Include="$(bz2Dir)\bzlib_private.h">
<Filter>bzip2 1.0.6 Header Files</Filter>
<Filter>Header Files\bzip2</Filter>
</ClInclude>
<ClInclude Include="$(bz2Dir)\bzlib.h">
<Filter>Header Files\bzip2</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\PC\python_nt.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
</ItemGroup>
</Project>
</Project>
7 changes: 6 additions & 1 deletion PCbuild/_ctypes.vcxproj.filters
View file
Expand Up @@ -7,6 +7,9 @@
<Filter Include="Source Files">
<UniqueIdentifier>{dbdea1f2-ad8b-44ca-b782-fcf65d91559b}</UniqueIdentifier>
</Filter>
<Filter Include="Resource Files">
<UniqueIdentifier>{31a37bb4-c384-41ff-9ec1-8ad98d482e22}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\Modules\_ctypes\ctypes.h">
Expand Down Expand Up @@ -37,6 +40,8 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\PC\python_nt.rc" />
<ResourceCompile Include="..\PC\python_nt.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
</ItemGroup>
</Project>
8 changes: 8 additions & 0 deletions PCbuild/_ctypes_test.vcxproj.filters
View file
Expand Up @@ -7,6 +7,9 @@
<Filter Include="Source Files">
<UniqueIdentifier>{38abc486-e143-49dc-8cf0-8aefab0e0d3d}</UniqueIdentifier>
</Filter>
<Filter Include="Resource Files">
<UniqueIdentifier>{5030ff8f-daf5-4bc8-b1dd-e8b59d34c511}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\Modules\_ctypes\_ctypes_test.h">
Expand All @@ -18,4 +21,9 @@
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\PC\python_nt.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
</ItemGroup>
</Project>
82 changes: 48 additions & 34 deletions PCbuild/_decimal.vcxproj.filters
View file
Expand Up @@ -7,107 +7,121 @@
<Filter Include="Source Files">
<UniqueIdentifier>{138089f8-faba-494f-b6ed-051f31fbaf2d}</UniqueIdentifier>
</Filter>
<Filter Include="Resource Files">
<UniqueIdentifier>{632b24a3-0844-4e57-ad34-b0e4cef886dd}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files\libmpdec">
<UniqueIdentifier>{322d127c-1105-4a31-aed2-e29cdececc77}</UniqueIdentifier>
</Filter>
<Filter Include="Header Files\libmpdec">
<UniqueIdentifier>{780c3b7a-7817-4e89-a2f2-fc522f2c5966}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\Modules\_decimal\libmpdec\basearith.h">
<ClInclude Include="..\Modules\_decimal\docstrings.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\Modules\_decimal\libmpdec\basearith.h">
<Filter>Header Files\libmpdec</Filter>
</ClInclude>
<ClInclude Include="..\Modules\_decimal\libmpdec\bits.h">
<Filter>Header Files</Filter>
<Filter>Header Files\libmpdec</Filter>
</ClInclude>
<ClInclude Include="..\Modules\_decimal\libmpdec\constants.h">
<Filter>Header Files</Filter>
<Filter>Header Files\libmpdec</Filter>
</ClInclude>
<ClInclude Include="..\Modules\_decimal\libmpdec\convolute.h">
<Filter>Header Files</Filter>
<Filter>Header Files\libmpdec</Filter>
</ClInclude>
<ClInclude Include="..\Modules\_decimal\libmpdec\crt.h">
<Filter>Header Files</Filter>
<Filter>Header Files\libmpdec</Filter>
</ClInclude>
<ClInclude Include="..\Modules\_decimal\libmpdec\difradix2.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\Modules\_decimal\docstrings.h">
<Filter>Header Files</Filter>
<Filter>Header Files\libmpdec</Filter>
</ClInclude>
<ClInclude Include="..\Modules\_decimal\libmpdec\fnt.h">
<Filter>Header Files</Filter>
<Filter>Header Files\libmpdec</Filter>
</ClInclude>
<ClInclude Include="..\Modules\_decimal\libmpdec\fourstep.h">
<Filter>Header Files</Filter>
<Filter>Header Files\libmpdec</Filter>
</ClInclude>
<ClInclude Include="..\Modules\_decimal\libmpdec\mpdecimal.h">
<Filter>Header Files</Filter>
<Filter>Header Files\libmpdec</Filter>
</ClInclude>
<ClInclude Include="..\Modules\_decimal\libmpdec\numbertheory.h">
<Filter>Header Files</Filter>
<Filter>Header Files\libmpdec</Filter>
</ClInclude>
<ClInclude Include="..\Modules\_decimal\libmpdec\sixstep.h">
<Filter>Header Files</Filter>
<Filter>Header Files\libmpdec</Filter>
</ClInclude>
<ClInclude Include="..\Modules\_decimal\libmpdec\transpose.h">
<Filter>Header Files</Filter>
<Filter>Header Files\libmpdec</Filter>
</ClInclude>
<ClInclude Include="..\Modules\_decimal\libmpdec\typearith.h">
<Filter>Header Files</Filter>
<Filter>Header Files\libmpdec</Filter>
</ClInclude>
<ClInclude Include="..\Modules\_decimal\libmpdec\umodarith.h">
<Filter>Header Files</Filter>
<Filter>Header Files\libmpdec</Filter>
</ClInclude>
<ClInclude Include="..\Modules\_decimal\libmpdec\vccompat.h">
<Filter>Header Files</Filter>
<Filter>Header Files\libmpdec</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\Modules\_decimal\_decimal.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\Modules\_decimal\libmpdec\basearith.c">
<Filter>Source Files</Filter>
<Filter>Source Files\libmpdec</Filter>
</ClCompile>
<ClCompile Include="..\Modules\_decimal\libmpdec\constants.c">
<Filter>Source Files</Filter>
<Filter>Source Files\libmpdec</Filter>
</ClCompile>
<ClCompile Include="..\Modules\_decimal\libmpdec\context.c">
<Filter>Source Files</Filter>
<Filter>Source Files\libmpdec</Filter>
</ClCompile>
<ClCompile Include="..\Modules\_decimal\libmpdec\convolute.c">
<Filter>Source Files</Filter>
<Filter>Source Files\libmpdec</Filter>
</ClCompile>
<ClCompile Include="..\Modules\_decimal\libmpdec\crt.c">
<Filter>Source Files</Filter>
<Filter>Source Files\libmpdec</Filter>
</ClCompile>
<ClCompile Include="..\Modules\_decimal\libmpdec\difradix2.c">
<Filter>Source Files</Filter>
<Filter>Source Files\libmpdec</Filter>
</ClCompile>
<ClCompile Include="..\Modules\_decimal\libmpdec\fnt.c">
<Filter>Source Files</Filter>
<Filter>Source Files\libmpdec</Filter>
</ClCompile>
<ClCompile Include="..\Modules\_decimal\libmpdec\fourstep.c">
<Filter>Source Files</Filter>
<Filter>Source Files\libmpdec</Filter>
</ClCompile>
<ClCompile Include="..\Modules\_decimal\libmpdec\io.c">
<Filter>Source Files</Filter>
<Filter>Source Files\libmpdec</Filter>
</ClCompile>
<ClCompile Include="..\Modules\_decimal\libmpdec\mpalloc.c">
<Filter>Source Files</Filter>
<Filter>Source Files\libmpdec</Filter>
</ClCompile>
<ClCompile Include="..\Modules\_decimal\libmpdec\mpdecimal.c">
<Filter>Source Files</Filter>
<Filter>Source Files\libmpdec</Filter>
</ClCompile>
<ClCompile Include="..\Modules\_decimal\libmpdec\numbertheory.c">
<Filter>Source Files</Filter>
<Filter>Source Files\libmpdec</Filter>
</ClCompile>
<ClCompile Include="..\Modules\_decimal\libmpdec\sixstep.c">
<Filter>Source Files</Filter>
<Filter>Source Files\libmpdec</Filter>
</ClCompile>
<ClCompile Include="..\Modules\_decimal\libmpdec\transpose.c">
<Filter>Source Files</Filter>
<Filter>Source Files\libmpdec</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\PC\python_nt.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
</ItemGroup>
<ItemGroup>
<CustomBuild Include="..\Modules\_decimal\libmpdec\vcdiv64.asm">
<Filter>Source Files</Filter>
<Filter>Source Files\libmpdec</Filter>
</CustomBuild>
</ItemGroup>
</Project>
</Project>

0 comments on commit fe2a48c

Please sign in to comment.