changeset:   105118:d997e64130bd
branch:      3.6
parent:      105115:25cb7df5b19d
user:        Steve Dower <steve.dower@microsoft.com>
date:        Mon Nov 14 17:51:42 2016 -0800
files:       Tools/msi/buildrelease.bat
description:
Issue #28573: Fixes issue with nested if blocks


diff -r 25cb7df5b19d -r d997e64130bd Tools/msi/buildrelease.bat
--- a/Tools/msi/buildrelease.bat	Mon Nov 14 16:13:56 2016 -0800
+++ b/Tools/msi/buildrelease.bat	Mon Nov 14 17:51:42 2016 -0800
@@ -139,13 +139,13 @@
 ) else (
     set CERTOPTS=
 )
-
+if not "%PGO%" EQU "" (
+    set PGOOPTS=--pgo-job "%PGO%"
+) else (
+    set PGOOPTS=
+)
 if not "%SKIPBUILD%" EQU "1" (
-    if "%PGO%" EQU "" (
-        set PGOOPTS=
-    ) else (
-        set PGOOPTS=--pgo --pgojob "%PGO%"
-    )
+    @echo call "%PCBUILD%build.bat" -e -p %BUILD_PLAT% -t %TARGET% %CERTOPTS% %PGOOPTS%
     @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