[Python-checkins] cpython (merge 3.6 -> default): Fixes bad merge for issue #28110
steve.dower
python-checkins at python.org
Sat Sep 17 19:35:15 EDT 2016
https://hg.python.org/cpython/rev/f4cdc125ed52
changeset: 103904:f4cdc125ed52
parent: 103902:64d6e96819a0
parent: 103903:dd7e3c81c4f0
user: Steve Dower <steve.dower at microsoft.com>
date: Sat Sep 17 16:34:52 2016 -0700
summary:
Fixes bad merge for issue #28110
files:
Tools/msi/buildrelease.bat | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/Tools/msi/buildrelease.bat b/Tools/msi/buildrelease.bat
--- a/Tools/msi/buildrelease.bat
+++ b/Tools/msi/buildrelease.bat
@@ -169,6 +169,7 @@
)
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
More information about the Python-checkins
mailing list