[Python-checkins] cpython: Make PGO use usual build directory on Windows.

Sun Sep 11 23:19:50 EDT 2016

https://hg.python.org/cpython/rev/3308f06726e9
changeset: 103682:3308f06726e9
user: Steve Dower <steve.dower at microsoft.com>
date: Sun Sep 11 20:19:35 2016 -0700
summary:
 Make PGO use usual build directory on Windows.
files:
 PCbuild/pyproject.props | 1 -
 PCbuild/python.props | 1 -
 Tools/msi/buildrelease.bat | 9 +--------
 3 files changed, 1 insertions(+), 10 deletions(-)

diff --git a/PCbuild/pyproject.props b/PCbuild/pyproject.props
--- a/PCbuild/pyproject.props
+++ b/PCbuild/pyproject.props
@@ -7,7 +7,6 @@
 <OutDir Condition="!HasTrailingSlash($(OutDir))">$(OutDir)\</OutDir>
 <Py_IntDir Condition="'$(Py_IntDir)' == ''">$(MSBuildThisFileDirectory)obj\</Py_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
@@ -25,7 +25,6 @@
 -->
 <ArchName Condition="'$(ArchName)' == '' and $(Platform) == 'x64'">amd64</ArchName>
 <ArchName Condition="'$(ArchName)' == ''">win32</ArchName>
- <ArchName Condition="$(Configuration) == 'PGInstrument' or $(Configuration) == 'PGUpdate'">$(ArchName)-pgo</ArchName>
 
 <!-- Root directory of the repository -->
 <PySourcePath Condition="'$(PySourcePath)' == ''">$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)\..\))</PySourcePath>
diff --git a/Tools/msi/buildrelease.bat b/Tools/msi/buildrelease.bat
--- a/Tools/msi/buildrelease.bat
+++ b/Tools/msi/buildrelease.bat
@@ -111,16 +111,10 @@
 set BUILD_PLAT=Win32
 set OUTDIR_PLAT=win32
 set OBJDIR_PLAT=x86
-) else if "%~2" NEQ "" (
- call "%PCBUILD%env.bat" amd64
- set PGO=%~2
- set BUILD=%PCBUILD%amd64-pgo\
- set BUILD_PLAT=x64
- set OUTDIR_PLAT=amd64
- set OBJDIR_PLAT=x64
 ) else (
 call "%PCBUILD%env.bat" amd64
 set BUILD=%PCBUILD%amd64\
+ set PGO=%~2
 set BUILD_PLAT=x64
 set OUTDIR_PLAT=amd64
 set OBJDIR_PLAT=x64
@@ -177,7 +171,6 @@
 )
 
 set BUILDOPTS=/p:Platform=%1 /p:BuildForRelease=true /p:DownloadUrl=%DOWNLOAD_URL% /p:DownloadUrlBase=%DOWNLOAD_URL_BASE% /p:ReleaseUri=%RELEASE_URI%
-if "%PGO%" NEQ "" set BUILDOPTS=%BUILDOPTS% /p:PGOBuildPath=%BUILD%
 msbuild "%D%bundle\releaselocal.wixproj" /t:Rebuild %BUILDOPTS% %CERTOPTS% /p:RebuildAll=true
 if errorlevel 1 exit /B
 msbuild "%D%bundle\releaseweb.wixproj" /t:Rebuild %BUILDOPTS% %CERTOPTS% /p:RebuildAll=false
-- 
Repository URL: https://hg.python.org/cpython
