[Python-checkins] cpython (merge 3.5 -> default): Merge with 3.5

Mon Jul 27 23:59:43 CEST 2015

https://hg.python.org/cpython/rev/64c39d30014e
changeset: 97095:64c39d30014e
parent: 97093:6f98ef46fede
parent: 97094:0e8fc11cbfca
user: Steve Dower <steve.dower at microsoft.com>
date: Mon Jul 27 14:59:00 2015 -0700
summary:
 Merge with 3.5
files:
 PCbuild/openssl.props | 6 ++++--
 PCbuild/pyproject.props | 10 +++++++---
 PCbuild/python.props | 3 ++-
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/PCbuild/openssl.props b/PCbuild/openssl.props
--- a/PCbuild/openssl.props
+++ b/PCbuild/openssl.props
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <Py_IntDir Condition="'$(Py_IntDir)' == ''">$(opensslDir)tmp\</Py_IntDir>
+ </PropertyGroup>
+ 
 <Import Project="pyproject.props" />
 
 <PropertyGroup Label="Configuration">
 <ConfigurationType>StaticLibrary</ConfigurationType>
- <IntDir>$(opensslDir)tmp\$(ArchName)_$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="$(Configuration) == 'PGInstrument' or $(Configuration) == 'PGUpdate'">$(opensslDir)tmp\$(ArchName)\$(ProjectName)\</IntDir>
 </PropertyGroup>
 
 <ItemGroup>
diff --git a/PCbuild/pyproject.props b/PCbuild/pyproject.props
--- a/PCbuild/pyproject.props
+++ b/PCbuild/pyproject.props
@@ -1,11 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" TreatAsLocalProperty="Py_IntDir">
 <PropertyGroup Label="Globals">
 <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
 <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
 <OutDir>$(BuildPath)</OutDir>
- <IntDir>$(SolutionDir)obj\$(ArchName)_$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="$(Configuration) == 'PGInstrument' or $(Configuration) == 'PGUpdate'">$(SolutionDir)obj\$(ArchName)\$(ProjectName)\</IntDir>
+ <OutDir Condition="'$(Py_OutDir)' != ''">$(Py_OutDir)</OutDir>
+ <OutDir Condition="!HasTrailingSlash($(OutDir))">$(OutDir)\</OutDir>
+ <Py_IntDir Condition="'$(Py_IntDir)' == ''">$(SolutionDir)obj\</Py_IntDir>
+ <IntDir Condition="!HasTrailingSlash($(IntDir))">$(IntDir)\</IntDir>
+ <IntDir>$(Py_IntDir)\$(ArchName)_$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="$(Configuration) == 'PGInstrument' or $(Configuration) == 'PGUpdate'">$(Py_IntDir)\$(ArchName)_PGO\$(ProjectName)\</IntDir>
 <TargetName Condition="'$(TargetName)' == ''">$(ProjectName)</TargetName>
 <TargetName>$(TargetName)$(PyDebugExt)</TargetName>
 <GenerateManifest>false</GenerateManifest>
diff --git a/PCbuild/python.props b/PCbuild/python.props
--- a/PCbuild/python.props
+++ b/PCbuild/python.props
@@ -26,7 +26,8 @@
 <PySourcePath Condition="!HasTrailingSlash($(PySourcePath))">$(PySourcePath)\</PySourcePath>
 
 <!-- Directory where build outputs are put -->
- <BuildPath Condition="'$(BuildPath)' == ''">$(PySourcePath)PCBuild\$(ArchName)\</BuildPath>
+ <BuildPath Condition="'$(PyBuildPath)' == ''">$(PySourcePath)PCBuild\$(ArchName)\</BuildPath>
+ <BuildPath Condition="'$(PyBuildPath)' != ''">$(PyBuildPath)</BuildPath>
 <BuildPath Condition="!HasTrailingSlash($(BuildPath))">$(BuildPath)\</BuildPath>
 
 <!-- Directories of external projects. tcltk is handled in tcltk.props -->
-- 
Repository URL: https://hg.python.org/cpython
