From: Steve Dower <steve.dower@microsoft.com>
Date: Mon, 10 Oct 2016 23:19:06 +0000 (-0700)
Subject: Fix launcher.msi from rebuilding during release build.
X-Git-Tag: v3.6.0b3~138
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ec1f28a63c24b81137de1f1b5a45fc80d9f1fdfa;p=python

Fix launcher.msi from rebuilding during release build.
---

diff --git a/Tools/msi/buildrelease.bat b/Tools/msi/buildrelease.bat
index c672dd0a05..e34aeac793 100644
--- a/Tools/msi/buildrelease.bat
+++ b/Tools/msi/buildrelease.bat
@@ -170,8 +170,15 @@ if not "%SKIPBUILD%" EQU "1" (
     @echo off
 )
 
+if "%OUTDIR_PLAT%" EQU "win32" (
+    msbuild "%D%launcher\launcher.wixproj" /p:Platform=x86 %CERTOPTS% /p:ReleaseUri=%RELEASE_URI%
+    if errorlevel 1 exit /B
+) else if not exist "%PCBUILD%win32\en-us\launcher.msi" (
+    msbuild "%D%launcher\launcher.wixproj" /p:Platform=x86 %CERTOPTS% /p:ReleaseUri=%RELEASE_URI%
+    if errorlevel 1 exit /B
+)
+
 set BUILDOPTS=/p:Platform=%1 /p:BuildForRelease=true /p:DownloadUrl=%DOWNLOAD_URL% /p:DownloadUrlBase=%DOWNLOAD_URL_BASE% /p:ReleaseUri=%RELEASE_URI%
-msbuild "%D%launcher\launcher.wixproj" /p:Platform=x86 %CERTOPTS% /p:ReleaseUri=%RELEASE_URI%
 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