ilusha/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython synced 2026-09-29 12:10:30 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

bpo-41089: Filters and other issues in Visual Studio projects (GH-21070)

Browse source 
* 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.
This commit is contained in:
Nikita Nemkin 2020-06-23 23:41:49 +05:00 • committed by GitHub
parent f9bd05e83e
commit fe2a48c605
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
46 changed files with 1154 additions and 348 deletions
Download patch file Download diff file Expand all files Collapse all files

15
PC/bdist_wininst/bdist_wininst.vcxproj
View file

@ -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>
@ -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" />

36
PC/bdist_wininst/bdist_wininst.vcxproj.filters
View file

@ -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>