Fix launcher.msi from rebuilding during release build.

diff --git a/Tools/msi/buildrelease.bat b/Tools/msi/buildrelease.bat
index c672dd0a050901f98b055cb6c371772e19d7ce4a..e34aeac7931e40247ab631d3920280cba7e16a19 100644 (file)
--- a/Tools/msi/buildrelease.bat
+++ b/Tools/msi/buildrelease.bat
@@ -170,8 +170,15 @@ if not "%SKIPBUILD%" EQU "1" (
     @echo off\r
 )\r
 \r
+if "%OUTDIR_PLAT%" EQU "win32" (\r
+    msbuild "%D%launcher\launcher.wixproj" /p:Platform=x86 %CERTOPTS% /p:ReleaseUri=%RELEASE_URI%\r
+    if errorlevel 1 exit /B\r
+) else if not exist "%PCBUILD%win32\en-us\launcher.msi" (\r
+    msbuild "%D%launcher\launcher.wixproj" /p:Platform=x86 %CERTOPTS% /p:ReleaseUri=%RELEASE_URI%\r
+    if errorlevel 1 exit /B\r
+)\r
+\r
 set BUILDOPTS=/p:Platform=%1 /p:BuildForRelease=true /p:DownloadUrl=%DOWNLOAD_URL% /p:DownloadUrlBase=%DOWNLOAD_URL_BASE% /p:ReleaseUri=%RELEASE_URI%\r
-msbuild "%D%launcher\launcher.wixproj" /p:Platform=x86 %CERTOPTS% /p:ReleaseUri=%RELEASE_URI%\r
 msbuild "%D%bundle\releaselocal.wixproj" /t:Rebuild %BUILDOPTS% %CERTOPTS% /p:RebuildAll=true\r
 if errorlevel 1 exit /B\r
 msbuild "%D%bundle\releaseweb.wixproj" /t:Rebuild %BUILDOPTS% %CERTOPTS% /p:RebuildAll=false\r