[Python-checkins] cpython (3.5): Fixes build order and lingering intermediate files.
steve.dower
python-checkins at python.org
Wed Jul 13 22:59:29 EDT 2016
https://hg.python.org/cpython/rev/6c7f356737a8
changeset: 102336:6c7f356737a8
branch: 3.5
parent: 102334:3e44c449433a
user: Steve Dower <steve.dower at microsoft.com>
date: Wed Jul 13 19:58:21 2016 -0700
summary:
Fixes build order and lingering intermediate files.
files:
PCbuild/pcbuild.proj | 8 ++++++--
PCbuild/python3dll.vcxproj | 6 +-----
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/PCbuild/pcbuild.proj b/PCbuild/pcbuild.proj
--- a/PCbuild/pcbuild.proj
+++ b/PCbuild/pcbuild.proj
@@ -33,8 +33,6 @@
<Projects Include="pythoncore.vcxproj">
<BuildInParallel>false</BuildInParallel>
</Projects>
- <!-- python[w].exe -->
- <Projects Include="python.vcxproj;pythonw.vcxproj" />
<!-- python3.dll -->
<Projects Include="python3dll.vcxproj" />
<!-- py[w].exe -->
@@ -58,12 +56,18 @@
<!-- Disable parallel build for test modules -->
<BuildInParallel>false</BuildInParallel>
</Projects>
+
+ <!-- python[w].exe -->
+ <Projects Include="python.vcxproj;pythonw.vcxproj">
+ <BuildInParallel>false</BuildInParallel>
+ </Projects>
</ItemGroup>
<Target Name="Build">
<MSBuild Projects="@(Projects)"
Properties="Configuration=%(Configuration);Platform=%(Platform);%(Properties)"
BuildInParallel="%(BuildInParallel)"
+ StopOnFirstFailure="true"
Targets="%(BuildTarget)" />
</Target>
diff --git a/PCbuild/python3dll.vcxproj b/PCbuild/python3dll.vcxproj
--- a/PCbuild/python3dll.vcxproj
+++ b/PCbuild/python3dll.vcxproj
@@ -58,6 +58,7 @@
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<_Machine>X86</_Machine>
<_Machine Condition="$(Platform) == 'x64'">X64</_Machine>
+ <ExtensionsToDeleteOnClean>$(ExtensionsToDeleteOnClean);$(IntDir)python3_d.def;$(IntDir)python3stub.def</ExtensionsToDeleteOnClean>
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
@@ -133,9 +134,4 @@
<MakeDir Directories="$(IntDir)" />
<WriteLinesToFile File="$(IntDir)python3stub.def" Lines="@(_Lines)" Overwrite="true" />
</Target>
- <Target Name="_CleanStubDef" BeforeTargets="CoreClean">
- <ItemGroup>
- <Clean Include="$(IntDir)python3stub.def" />
- </ItemGroup>
- </Target>
</Project>
\ No newline at end of file
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list