diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2016-09-11 20:19:35 -0700 |
|---|---|---|
| committer | Steve Dower <steve.dower@microsoft.com> | 2016-09-11 20:19:35 -0700 |
| commit | f0bd173957db45816199f8282d444a6fac03bc95 (patch) | |
| tree | 49419a982ff478a90f9ec3600a045f413d2b7340 | |
| parent | cb4ad5cff9012b50a5b727b9e95f57c1199db640 (diff) | |
| download | cpython-f0bd173957db45816199f8282d444a6fac03bc95.tar.gz | |
Make PGO use usual build directory on Windows.
| -rw-r--r-- | PCbuild/pyproject.props | 1 | ||||
| -rw-r--r-- | PCbuild/python.props | 1 | ||||
| -rw-r--r-- | Tools/msi/buildrelease.bat | 9 |
3 files changed, 1 insertions, 10 deletions
diff --git a/PCbuild/pyproject.props b/PCbuild/pyproject.props index d1ac99847b..543b4ca208 100644 --- 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 index 015009864b..2b9b903cc5 100644 --- 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 index 1af5ac1b81..710acaccd6 100644 --- a/Tools/msi/buildrelease.bat +++ b/Tools/msi/buildrelease.bat @@ -111,16 +111,10 @@ if "%1" EQU "x86" ( 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 @@ if not "%SKIPBUILD%" EQU "1" ( )
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
|