changeset: 105119:35f510158490 parent: 105117:6f7a3a1a0a7d parent: 105118:d997e64130bd user: Steve Dower date: Mon Nov 14 17:51:51 2016 -0800 files: Tools/msi/buildrelease.bat description: Issue #28573: Fixes issue with nested if blocks diff -r 6f7a3a1a0a7d -r 35f510158490 Tools/msi/buildrelease.bat --- a/Tools/msi/buildrelease.bat Mon Nov 14 16:16:44 2016 -0800 +++ b/Tools/msi/buildrelease.bat Mon Nov 14 17:51:51 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