diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2017-06-19 17:34:25 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-19 17:34:25 (GMT) |
| commit | 40a23e88994aca92c83c8e84ab8b8cdc11d7ec54 (patch) | |
| tree | 5a04457af0c0d4be563bf1c153059564bc19c516 /PCbuild/python.vcxproj | |
| parent | eb81795d7d3a8c898fa89a376d63fc3bbfb9a081 (diff) | |
| download | cpython-40a23e88994aca92c83c8e84ab8b8cdc11d7ec54.zip cpython-40a23e88994aca92c83c8e84ab8b8cdc11d7ec54.tar.gz cpython-40a23e88994aca92c83c8e84ab8b8cdc11d7ec54.tar.bz2 | |
bpo-30687: Fixes build scripts to find msbuild.exe and stop relying on vcvarsall.bat (#2252)
* Fixes build scripts to find msbuild.exe and stop relying on vcvarsall.bat
Also fixes bdist_wininst.vcxproj to use correct version in generated name.
Diffstat (limited to 'PCbuild/python.vcxproj')
| -rw-r--r-- | PCbuild/python.vcxproj | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/PCbuild/python.vcxproj b/PCbuild/python.vcxproj index 807213f..2786ac2 100644 --- a/PCbuild/python.vcxproj +++ b/PCbuild/python.vcxproj @@ -83,7 +83,7 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> - <Target Name="ValidateUcrtbase" AfterTargets="AfterBuild"> + <Target Name="ValidateUcrtbase" AfterTargets="AfterBuild" Condition="$(Configuration) != 'PGInstrument'"> <PropertyGroup> <UcrtName>ucrtbase</UcrtName> <UcrtName Condition="'$(Configuration)' == 'Debug'">ucrtbased</UcrtName> @@ -94,6 +94,8 @@ set PYTHONPATH=$(PySourcePath)Lib </Target> <Target Name="GeneratePythonBat" AfterTargets="AfterBuild"> <PropertyGroup> + <_PGOPath Condition="$(Configuration) == 'PGInstrument' and $(Platform) == 'Win32'">@set PATH=%PATH%%3B$(VCInstallDir)bin</_PGOPath> + <_PGOPath Condition="$(Configuration) == 'PGInstrument' and $(Platform) == 'x64'">@set PATH=%PATH%%3B$(VCInstallDir)bin\amd64</_PGOPath> <_Content>@rem This script invokes the most recently built Python with all arguments @rem passed through to the interpreter. This file is generated by the @rem build process and any changes *will* be thrown away by the next @@ -103,6 +105,7 @@ set PYTHONPATH=$(PySourcePath)Lib @echo Running $(Configuration)^|$(Platform) interpreter... @setlocal @set PYTHONHOME=$(PySourcePath) +$(_PGOPath) @"$(OutDir)python$(PyDebugExt).exe" %* </_Content> <_ExistingContent Condition="Exists('$(PySourcePath)python.bat')">$([System.IO.File]::ReadAllText('$(PySourcePath)python.bat'))</_ExistingContent> |