diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2016-12-03 19:18:53 (GMT) |
|---|---|---|
| committer | Steve Dower <steve.dower@microsoft.com> | 2016-12-03 19:18:53 (GMT) |
| commit | 190dbd9ba20610bfd19b2f3544ec9d9d3fd92b0b (patch) | |
| tree | 1c1a16cc7207424cf8e1d4431f816537cb6fd2d4 /Tools/msi/buildrelease.bat | |
| parent | 2d397dc44b6023aebdaf0fc44bca66752d3ffb03 (diff) | |
| download | cpython-190dbd9ba20610bfd19b2f3544ec9d9d3fd92b0b.zip cpython-190dbd9ba20610bfd19b2f3544ec9d9d3fd92b0b.tar.gz cpython-190dbd9ba20610bfd19b2f3544ec9d9d3fd92b0b.tar.bz2 | |
Issue #28846: Various installer fixes
Diffstat (limited to 'Tools/msi/buildrelease.bat')
| -rw-r--r-- | Tools/msi/buildrelease.bat | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Tools/msi/buildrelease.bat b/Tools/msi/buildrelease.bat index 1fa2dcb..f296e61 100644 --- a/Tools/msi/buildrelease.bat +++ b/Tools/msi/buildrelease.bat @@ -64,6 +64,9 @@ if "%1" NEQ "" echo Invalid option: "%1" && exit /B 1 if not defined BUILDX86 if not defined BUILDX64 (set BUILDX86=1) && (set BUILDX64=1)
+if not exist "%HG%" where hg > "%TEMP%\hg.loc" 2> nul && set /P HG= < "%TEMP%\hg.loc" & del "%TEMP%\hg.loc"
+if not exist "%HG%" echo Cannot find Mercurial on PATH && exit /B 1
+
call "%D%get_externals.bat"
:builddoc
@@ -77,8 +80,6 @@ call "%D%..\..\doc\make.bat" htmlhelp if errorlevel 1 goto :eof
:skipdoc
-where hg /q || echo Cannot find Mercurial on PATH && exit /B 1
-
where dlltool /q && goto skipdlltoolsearch
set _DLLTOOL_PATH=
where /R "%EXTERNALS%\" dlltool > "%TEMP%\dlltool.loc" 2> nul && set /P _DLLTOOL_PATH= < "%TEMP%\dlltool.loc" & del "%TEMP%\dlltool.loc"
@@ -187,7 +188,7 @@ msbuild "%D%bundle\releaseweb.wixproj" /t:Rebuild /p:Platform=%1 %BUILDOPTS% %CE if errorlevel 1 exit /B
if defined BUILDZIP (
- msbuild "%D%make_zip.proj" /t:Build %BUILDOPTS% %CERTOPTS%
+ msbuild "%D%make_zip.proj" /t:Build %BUILDOPTS% %CERTOPTS% /p:OutputPath="%BUILD%en-us"
if errorlevel 1 exit /B
)
|