[Python-checkins] [3.5] bpo-31170: Fix inclusion of expat in Windows build projects. (#3751)

Tue Sep 26 09:00:31 EDT 2017

https://github.com/python/cpython/commit/44c1b62939a6192776dc9d093546154044cb2ecb
commit: 44c1b62939a6192776dc9d093546154044cb2ecb
branch: 3.5
author: Steve Dower <steve.dower at microsoft.com>
committer: larryhastings <larry at hastings.org>
date: 2017年09月26日T06:00:28-07:00
summary:
[3.5] bpo-31170: Fix inclusion of expat in Windows build projects. (#3751)
* bpo-31170: Fix inclusion of expat in Windows build projects.
* Fixes line endings
files:
M PCbuild/_elementtree.vcxproj
M PCbuild/_elementtree.vcxproj.filters
M PCbuild/pyexpat.vcxproj
M PCbuild/pyexpat.vcxproj.filters

diff --git a/PCbuild/_elementtree.vcxproj b/PCbuild/_elementtree.vcxproj
index 639ba479db5..12f3bd2ac38 100644
--- a/PCbuild/_elementtree.vcxproj
+++ b/PCbuild/_elementtree.vcxproj
@@ -86,6 +86,7 @@
 <ClInclude Include="..\Modules\expat\xmltok.h" />
 </ItemGroup>
 <ItemGroup>
+ <ClCompile Include="..\Modules\expat\loadlibrary.c" />
 <ClCompile Include="..\Modules\_elementtree.c" />
 <ClCompile Include="..\Modules\expat\xmlparse.c" />
 <ClCompile Include="..\Modules\expat\xmlrole.c" />
@@ -103,4 +104,4 @@
 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
 <ImportGroup Label="ExtensionTargets">
 </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/PCbuild/_elementtree.vcxproj.filters b/PCbuild/_elementtree.vcxproj.filters
index ee78295fa94..e36301ca6a2 100644
--- a/PCbuild/_elementtree.vcxproj.filters
+++ b/PCbuild/_elementtree.vcxproj.filters
@@ -68,5 +68,11 @@
 <ClCompile Include="..\Modules\expat\xmltok.c">
 <Filter>Source Files</Filter>
 </ClCompile>
+ <ClCompile Include="..\Modules\expat\loadlibrary.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <ResourceCompile Include="..\PC\python_nt.rc" />
 </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/PCbuild/pyexpat.vcxproj b/PCbuild/pyexpat.vcxproj
index a2763f02063..0bed878dfc1 100644
--- a/PCbuild/pyexpat.vcxproj
+++ b/PCbuild/pyexpat.vcxproj
@@ -67,6 +67,7 @@
 <ClInclude Include="..\Modules\expat\xmltok.h" />
 </ItemGroup>
 <ItemGroup>
+ <ClCompile Include="..\Modules\expat\loadlibrary.c" />
 <ClCompile Include="..\Modules\pyexpat.c" />
 <ClCompile Include="..\Modules\expat\xmlparse.c" />
 <ClCompile Include="..\Modules\expat\xmlrole.c" />
diff --git a/PCbuild/pyexpat.vcxproj.filters b/PCbuild/pyexpat.vcxproj.filters
index abf362fb0bf..919a9ad2b78 100644
--- a/PCbuild/pyexpat.vcxproj.filters
+++ b/PCbuild/pyexpat.vcxproj.filters
@@ -29,5 +29,11 @@
 <ClCompile Include="..\Modules\expat\xmltok.c">
 <Filter>Source Files</Filter>
 </ClCompile>
+ <ClCompile Include="..\Modules\expat\loadlibrary.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <ResourceCompile Include="..\PC\python_nt.rc" />
 </ItemGroup>
 </Project>
\ No newline at end of file
