diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2016-10-10 16:19:06 -0700 |
|---|---|---|
| committer | Steve Dower <steve.dower@microsoft.com> | 2016-10-10 16:19:06 -0700 |
| commit | 88d9dff182921bdc787011d141faf7f95d70a3a0 (patch) | |
| tree | cca454cf198c2f60698015ab848e2ebd66d7a29e /Tools | |
| parent | b84321729087b768845bc7caf4a50c3eb050708c (diff) | |
| download | cpython-88d9dff182921bdc787011d141faf7f95d70a3a0.tar.gz | |
Fix launcher.msi from rebuilding during release build.
Diffstat (limited to 'Tools')
| -rw-r--r-- | Tools/msi/buildrelease.bat | 9 |
1 files changed, 8 insertions, 1 deletions
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
|