diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2016-12-03 20:11:25 (GMT) |
|---|---|---|
| committer | Steve Dower <steve.dower@microsoft.com> | 2016-12-03 20:11:25 (GMT) |
| commit | 9cc113a8f7e80640f445c22fba3f9a448cc37af4 (patch) | |
| tree | e5d0d8e9f25feb29a4b8c9849dc267a30d3fb169 /Tools/msi | |
| parent | 853ec5d408afc21154a08d86f3d92ac66245a159 (diff) | |
| parent | f00ef72ee1ef4f35eaa9ad8a760c11f8c21c5383 (diff) | |
| download | cpython-9cc113a8f7e80640f445c22fba3f9a448cc37af4.zip cpython-9cc113a8f7e80640f445c22fba3f9a448cc37af4.tar.gz cpython-9cc113a8f7e80640f445c22fba3f9a448cc37af4.tar.bz2 | |
Issue #28846: Various installer fixes
Diffstat (limited to 'Tools/msi')
| -rw-r--r-- | Tools/msi/buildrelease.bat | 8 | ||||
| -rw-r--r-- | Tools/msi/bundle/bundle.wxs | 6 | ||||
| -rw-r--r-- | Tools/msi/make_zip.proj | 2 |
3 files changed, 9 insertions, 7 deletions
diff --git a/Tools/msi/buildrelease.bat b/Tools/msi/buildrelease.bat index f203bad..d144c2c 100644 --- a/Tools/msi/buildrelease.bat +++ b/Tools/msi/buildrelease.bat @@ -65,6 +65,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
@@ -78,9 +81,6 @@ call "%D%..\..\doc\make.bat" htmlhelp if errorlevel 1 goto :eof
:skipdoc
-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
-
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"
@@ -181,7 +181,7 @@ msbuild "%D%bundle\releaseweb.wixproj" /t:Rebuild %BUILDOPTS% %CERTOPTS% /p:Rebu 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
)
diff --git a/Tools/msi/bundle/bundle.wxs b/Tools/msi/bundle/bundle.wxs index c89e6ee..02a456b 100644 --- a/Tools/msi/bundle/bundle.wxs +++ b/Tools/msi/bundle/bundle.wxs @@ -1,6 +1,7 @@ <?xml version="1.0"?> <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" - xmlns:bal="http://schemas.microsoft.com/wix/BalExtension"> + xmlns:bal="http://schemas.microsoft.com/wix/BalExtension" + xmlns:dep="http://schemas.microsoft.com/wix/DependencyExtension"> <Bundle Name="!(loc.FullProductName)" UpgradeCode="$(var.CoreUpgradeCode)" Version="$(var.Version)" @@ -8,7 +9,8 @@ Manufacturer="!(loc.Manufacturer)" AboutUrl="http://www.python.org/" DisableModify="button" - Compressed="no"> + Compressed="no" + dep:ProviderKey="CPython-$(var.MajorVersionNumber).$(var.MinorVersionNumber)$(var.PyArchExt)$(var.PyTestExt)"> <BootstrapperApplication Id="PythonBA" SourceFile="$(var.BootstrapApp)"> <Payload Compressed='yes' SourceFile='Default.thm' /> <Payload Compressed='yes' SourceFile='Default.wxl' /> diff --git a/Tools/msi/make_zip.proj b/Tools/msi/make_zip.proj index d2e031f..f78e6ff 100644 --- a/Tools/msi/make_zip.proj +++ b/Tools/msi/make_zip.proj @@ -13,7 +13,7 @@ <SignOutput>false</SignOutput> <TargetName>python-$(PythonVersion)-embed-$(ArchName)</TargetName> <TargetExt>.zip</TargetExt> - <TargetPath>$(OutputPath)\en-us\$(TargetName)$(TargetExt)</TargetPath> + <TargetPath>$(OutputPath)\$(TargetName)$(TargetExt)</TargetPath> <CleanCommand>rmdir /q/s "$(IntermediateOutputPath)\zip_$(ArchName)"</CleanCommand> <Arguments>"$(PythonExe)" "$(MSBuildThisFileDirectory)\make_zip.py"</Arguments> <Arguments>$(Arguments) -e -o "$(TargetPath)" -t "$(IntermediateOutputPath)\zip_$(ArchName)" -a $(ArchName)</Arguments> |