diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2016-10-10 23:19:20 (GMT) |
|---|---|---|
| committer | Steve Dower <steve.dower@microsoft.com> | 2016-10-10 23:19:20 (GMT) |
| commit | 66fe8febb1f96f31c90a3c11bfb36c596b021e52 (patch) | |
| tree | 5a91d756daa55cdd7d0d39fee6cc020cf7c84e41 /Tools | |
| parent | 38b90f3c5c6bde459f2ffdee4dad9d6ac11d0ba5 (diff) | |
| parent | ec1f28a63c24b81137de1f1b5a45fc80d9f1fdfa (diff) | |
| download | cpython-66fe8febb1f96f31c90a3c11bfb36c596b021e52.zip cpython-66fe8febb1f96f31c90a3c11bfb36c596b021e52.tar.gz cpython-66fe8febb1f96f31c90a3c11bfb36c596b021e52.tar.bz2 | |
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 060c601..5e9677e 100644 --- a/Tools/msi/buildrelease.bat +++ b/Tools/msi/buildrelease.bat @@ -168,8 +168,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
|