From: Steve Dower <steve.dower@microsoft.com>
Date: Tue, 15 Nov 2016 00:15:39 +0000 (-0800)
Subject: Issue #28573: Avoid setting up env too many times during build
X-Git-Tag: v3.7.0a1~1988
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e044dfa22b4d4cef982fbf01f8f8f6d971381148;p=thirdparty%2FPython%2Fcpython.git

Issue #28573: Avoid setting up env too many times during build
---

e044dfa22b4d4cef982fbf01f8f8f6d971381148
diff --cc Tools/msi/buildrelease.bat
index a1f9ec71db5f,189bef22f2a4..9a20a561ff74
--- a/Tools/msi/buildrelease.bat
+++ b/Tools/msi/buildrelease.bat
@@@ -143,32 -141,14 +141,19 @@@ if not "%CERTNAME%" EQU "" 
  )
  
  if not "%SKIPBUILD%" EQU "1" (
 +    @call "%PCBUILD%build.bat" -e -p %BUILD_PLAT% -d -t %TARGET% %CERTOPTS%
 +    @if errorlevel 1 exit /B
 +    @rem build.bat turns echo back on, so we disable it again
 +    @echo off
 +
      if "%PGO%" EQU "" (
-         @call "%PCBUILD%build.bat" -e -p %BUILD_PLAT% -t %TARGET% %CERTOPTS%
+         set PGOOPTS=
      ) else (
-         @call "%PCBUILD%build.bat" -e -p %BUILD_PLAT% -c PGInstrument -t %TARGET% %CERTOPTS%
-         @if errorlevel 1 exit /B
- 
-         @del "%BUILD%*.pgc"
-         if "%PGO%" EQU "default" (
-             "%BUILD%python.exe" -m test -q --pgo
-         ) else if "%PGO%" EQU "default2" (
-             "%BUILD%python.exe" -m test -r -q --pgo
-             "%BUILD%python.exe" -m test -r -q --pgo
-         ) else if "%PGO%" EQU "default10" (
-             for /L %%i in (0, 1, 9) do "%BUILD%python.exe" -m test -q -r --pgo
-         ) else (
-             "%BUILD%python.exe" %PGO%
-         )
- 
-         @call "%PCBUILD%build.bat" -e -p %BUILD_PLAT% -c PGUpdate -t Build %CERTOPTS%
+         set PGOOPTS=--pgo --pgojob "%PGO%"
      )
+     @call "%PCBUILD%build.bat" -e -p %BUILD_PLAT% -t %TARGET% %CERTOPTS% %PGOOPTS%
      @if errorlevel 1 exit /B
+     @rem build.bat turns echo back on, so we disable it again
      @echo off
  )