[Python-checkins] cpython (3.6): Fix launcher.msi from rebuilding during release build.

[steve.dower]

https://hg.python.org/cpython/rev/f7bf01d91abf
changeset:   104439:f7bf01d91abf
branch:      3.6
parent:      104437:17bd5239b886
user:        Steve Dower <steve.dower at microsoft.com>
date:        Mon Oct 10 16:19:06 2016 -0700
summary:
  Fix launcher.msi from rebuilding during release build.

files:
  Tools/msi/buildrelease.bat |  9 ++++++++-
  1 files changed, 8 insertions(+), 1 deletions(-)


diff --git a/Tools/msi/buildrelease.bat b/Tools/msi/buildrelease.bat
--- a/Tools/msi/buildrelease.bat
+++ b/Tools/msi/buildrelease.bat
@@ -170,8 +170,15 @@
     @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

-- 
Repository URL: https://hg.python.org/cpython