mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 00:48:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

bpo-30389 Adds detection of VS 2017 to distutils._msvccompiler (#1632)

Browse source
This commit is contained in:
Steve Dower 2017-09-07 11:49:23 -07:00 • committed by GitHub
parent a853a8ba78
commit 05f01d8525
16 changed files with 1272 additions and 110 deletions
Download patch file Download diff file Expand all files Collapse all files

2
PCbuild/_lzma.vcxproj
View file

@ -65,7 +65,7 @@
<PreprocessorDefinitions>WIN32;_FILE_OFFSET_BITS=64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;LZMA_API_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<AdditionalDependencies>$(OutDir)/liblzma$(PyDebugExt).lib</AdditionalDependencies>
<AdditionalDependencies>$(OutDir)liblzma$(PyDebugExt).lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemGroup>

2
PCbuild/build.bat
View file

@ -84,7 +84,7 @@ if "%~1"=="-E" (set IncludeExternals=false) & shift & goto CheckOpts
if "%~1"=="--no-ssl" (set IncludeSSL=false) & shift & goto CheckOpts
if "%~1"=="--no-tkinter" (set IncludeTkinter=false) & shift & goto CheckOpts
if "%IncludeExternals%"=="" set IncludeExternals=false
if "%IncludeExternals%"=="" set IncludeExternals=true
if "%IncludeSSL%"=="" set IncludeSSL=true
if "%IncludeTkinter%"=="" set IncludeTkinter=true

5
PCbuild/pythoncore.vcxproj
View file

@ -50,6 +50,8 @@
<PropertyGroup>
<KillPython>true</KillPython>
<RequirePGCFiles>true</RequirePGCFiles>
<IncludeExternals Condition="$(IncludeExternals) == '' and Exists('$(zlibDir)\zlib.h')">true</IncludeExternals>
<IncludeExternals Condition="$(IncludeExternals) == ''">false</IncludeExternals>
</PropertyGroup>
<ImportGroup Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@ -73,6 +75,7 @@
</ClCompile>
<Link>
<AdditionalDependencies>version.lib;shlwapi.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories);$(PySourcePath)PC\external\$(PlatformToolset)\$(ArchName)</AdditionalLibraryDirectories>
<BaseAddress>0x1e000000</BaseAddress>
</Link>
</ItemDefinitionGroup>
@ -218,6 +221,7 @@
<ClInclude Include="$(zlibDir)\zutil.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\Modules\_asynciomodule.c" />
<ClCompile Include="..\Modules\_bisectmodule.c" />
<ClCompile Include="..\Modules\_blake2\blake2module.c" />
<ClCompile Include="..\Modules\_blake2\blake2b_impl.c" />
@ -341,6 +345,7 @@
<ClCompile Include="..\PC\config.c" />
<ClCompile Include="..\PC\getpathp.c" />
<ClCompile Include="..\PC\msvcrtmodule.c" />
<ClCompile Include="..\PC\_findvs.cpp" />
<ClCompile Include="..\Python\pyhash.c" />
<ClCompile Include="..\Python\_warnings.c" />
<ClCompile Include="..\Python\asdl.c" />

143
PCbuild/pythoncore.vcxproj.filters
View file

@ -321,39 +321,6 @@
<ClInclude Include="..\Modules\_io\_iomodule.h">
<Filter>Modules\_io</Filter>
</ClInclude>
<ClInclude Include="..\Modules\zlib\crc32.h">
<Filter>Modules\zlib</Filter>
</ClInclude>
<ClInclude Include="..\Modules\zlib\deflate.h">
<Filter>Modules\zlib</Filter>
</ClInclude>
<ClInclude Include="..\Modules\zlib\inffast.h">
<Filter>Modules\zlib</Filter>
</ClInclude>
<ClInclude Include="..\Modules\zlib\inffixed.h">
<Filter>Modules\zlib</Filter>
</ClInclude>
<ClInclude Include="..\Modules\zlib\inflate.h">
<Filter>Modules\zlib</Filter>
</ClInclude>
<ClInclude Include="..\Modules\zlib\inftrees.h">
<Filter>Modules\zlib</Filter>
</ClInclude>
<ClInclude Include="..\Modules\zlib\trees.h">
<Filter>Modules\zlib</Filter>
</ClInclude>
<ClInclude Include="..\Modules\zlib\zconf.h">
<Filter>Modules\zlib</Filter>
</ClInclude>
<ClInclude Include="..\Modules\zlib\zconf.in.h">
<Filter>Modules\zlib</Filter>
</ClInclude>
<ClInclude Include="..\Modules\zlib\zlib.h">
<Filter>Modules\zlib</Filter>
</ClInclude>
<ClInclude Include="..\Modules\zlib\zutil.h">
<Filter>Modules\zlib</Filter>
</ClInclude>
<ClInclude Include="..\Modules\cjkcodecs\alg_jisx0201.h">
<Filter>Modules\cjkcodecs</Filter>
</ClInclude>
@ -444,11 +411,41 @@
<ClInclude Include="..\Include\odictobject.h">
<Filter>Include</Filter>
</ClInclude>
<ClInclude Include="$(zlibDir)\crc32.h">
<Filter>Modules\zlib</Filter>
</ClInclude>
<ClInclude Include="$(zlibDir)\deflate.h">
<Filter>Modules\zlib</Filter>
</ClInclude>
<ClInclude Include="$(zlibDir)\inffast.h">
<Filter>Modules\zlib</Filter>
</ClInclude>
<ClInclude Include="$(zlibDir)\inffixed.h">
<Filter>Modules\zlib</Filter>
</ClInclude>
<ClInclude Include="$(zlibDir)\inflate.h">
<Filter>Modules\zlib</Filter>
</ClInclude>
<ClInclude Include="$(zlibDir)\inftrees.h">
<Filter>Modules\zlib</Filter>
</ClInclude>
<ClInclude Include="$(zlibDir)\trees.h">
<Filter>Modules\zlib</Filter>
</ClInclude>
<ClInclude Include="$(zlibDir)\zconf.h">
<Filter>Modules\zlib</Filter>
</ClInclude>
<ClInclude Include="$(zlibDir)\zconf.in.h">
<Filter>Modules\zlib</Filter>
</ClInclude>
<ClInclude Include="$(zlibDir)\zlib.h">
<Filter>Modules\zlib</Filter>
</ClInclude>
<ClInclude Include="$(zlibDir)\zutil.h">
<Filter>Modules\zlib</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\Modules\_asynciomodule.c">
<Filter>Modules</Filter>
</ClCompile>
<ClCompile Include="..\Modules\_bisectmodule.c">
<Filter>Modules</Filter>
</ClCompile>
@ -614,39 +611,6 @@
<ClCompile Include="..\Modules\_io\_iomodule.c">
<Filter>Modules\_io</Filter>
</ClCompile>
<ClCompile Include="..\Modules\zlib\adler32.c">
<Filter>Modules\zlib</Filter>
</ClCompile>
<ClCompile Include="..\Modules\zlib\compress.c">
<Filter>Modules\zlib</Filter>
</ClCompile>
<ClCompile Include="..\Modules\zlib\crc32.c">
<Filter>Modules\zlib</Filter>
</ClCompile>
<ClCompile Include="..\Modules\zlib\deflate.c">
<Filter>Modules\zlib</Filter>
</ClCompile>
<ClCompile Include="..\Modules\zlib\infback.c">
<Filter>Modules\zlib</Filter>
</ClCompile>
<ClCompile Include="..\Modules\zlib\inffast.c">
<Filter>Modules\zlib</Filter>
</ClCompile>
<ClCompile Include="..\Modules\zlib\inflate.c">
<Filter>Modules\zlib</Filter>
</ClCompile>
<ClCompile Include="..\Modules\zlib\inftrees.c">
<Filter>Modules\zlib</Filter>
</ClCompile>
<ClCompile Include="..\Modules\zlib\trees.c">
<Filter>Modules\zlib</Filter>
</ClCompile>
<ClCompile Include="..\Modules\zlib\uncompr.c">
<Filter>Modules\zlib</Filter>
</ClCompile>
<ClCompile Include="..\Modules\zlib\zutil.c">
<Filter>Modules\zlib</Filter>
</ClCompile>
<ClCompile Include="..\Modules\cjkcodecs\_codecs_cn.c">
<Filter>Modules\cjkcodecs</Filter>
</ClCompile>
@ -1001,10 +965,49 @@
<ClCompile Include="..\Objects\odictobject.c">
<Filter>Objects</Filter>
</ClCompile>
<ClCompile Include="..\PC\_findvs.cpp">
<Filter>PC</Filter>
</ClCompile>
<ClCompile Include="..\Modules\_asynciomodule.c">
<Filter>Modules</Filter>
</ClCompile>
<ClCompile Include="$(zlibDir)\adler32.c">
<Filter>Modules\zlib</Filter>
</ClCompile>
<ClCompile Include="$(zlibDir)\compress.c">
<Filter>Modules\zlib</Filter>
</ClCompile>
<ClCompile Include="$(zlibDir)\crc32.c">
<Filter>Modules\zlib</Filter>
</ClCompile>
<ClCompile Include="$(zlibDir)\deflate.c">
<Filter>Modules\zlib</Filter>
</ClCompile>
<ClCompile Include="$(zlibDir)\infback.c">
<Filter>Modules\zlib</Filter>
</ClCompile>
<ClCompile Include="$(zlibDir)\inffast.c">
<Filter>Modules\zlib</Filter>
</ClCompile>
<ClCompile Include="$(zlibDir)\inflate.c">
<Filter>Modules\zlib</Filter>
</ClCompile>
<ClCompile Include="$(zlibDir)\inftrees.c">
<Filter>Modules\zlib</Filter>
</ClCompile>
<ClCompile Include="$(zlibDir)\trees.c">
<Filter>Modules\zlib</Filter>
</ClCompile>
<ClCompile Include="$(zlibDir)\uncompr.c">
<Filter>Modules\zlib</Filter>
</ClCompile>
<ClCompile Include="$(zlibDir)\zutil.c">
<Filter>Modules\zlib</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\PC\python_nt.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
</ItemGroup>
</Project>
</Project>