diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2016-09-23 00:07:56 (GMT) |
|---|---|---|
| committer | Steve Dower <steve.dower@microsoft.com> | 2016-09-23 00:07:56 (GMT) |
| commit | fb4a96a58fe0994f1d4b0328874a99376c25fc20 (patch) | |
| tree | a1d394280d0b0813a06102a8c33d2fe27ce2fd1f /Tools | |
| parent | 208bbd29d355d98088d43becdd4f9b818f2ac798 (diff) | |
| download | cpython-fb4a96a58fe0994f1d4b0328874a99376c25fc20.zip cpython-fb4a96a58fe0994f1d4b0328874a99376c25fc20.tar.gz cpython-fb4a96a58fe0994f1d4b0328874a99376c25fc20.tar.bz2 | |
Issue #28251: Improvements to help manuals on Windows.
Diffstat (limited to 'Tools')
| -rw-r--r-- | Tools/msi/build.bat | 3 | ||||
| -rw-r--r-- | Tools/msi/doc/doc.wxs | 12 |
2 files changed, 13 insertions, 2 deletions
diff --git a/Tools/msi/build.bat b/Tools/msi/build.bat index a61ace8..69f00c0 100644 --- a/Tools/msi/build.bat +++ b/Tools/msi/build.bat @@ -43,6 +43,9 @@ if defined BUILDDOC ( if errorlevel 1 goto :eof
)
+rem Build the launcher MSI separately
+msbuild "%D%launcher\launcher.wixproj" /p:Platform=x86
+
set BUILD_CMD="%D%bundle\snapshot.wixproj"
if defined BUILDTEST (
set BUILD_CMD=%BUILD_CMD% /p:UseTestMarker=true
diff --git a/Tools/msi/doc/doc.wxs b/Tools/msi/doc/doc.wxs index 8dd0e21..306fb11 100644 --- a/Tools/msi/doc/doc.wxs +++ b/Tools/msi/doc/doc.wxs @@ -7,6 +7,12 @@ <PropertyRef Id="UpgradeTable" /> <PropertyRef Id="REGISTRYKEY" /> + <Property Id="HHExe" Value="C:\Windows\hh.exe" /> + <CustomAction Id="SetHHExe" Property="HHCExe" Value='[WindowsFolder]\hh.exe' Execute="immediate" /> + <InstallExecuteSequence> + <Custom Action="SetHHExe" Before="CostFinalize">1</Custom> + </InstallExecuteSequence> + <Feature Id="DefaultFeature" AllowAdvertise="no" Title="!(loc.Title)" Description="!(loc.Description)"> <ComponentGroupRef Id="doc" Primary="yes" /> <ComponentRef Id="OptionalFeature" /> @@ -20,10 +26,12 @@ <RegistryValue Name="$(var.OptionalFeatureName)_shortcut" Type="string" Value="$(var.Version)" KeyPath="yes" /> </RegistryKey> <Shortcut Id="python.chm" - Target="[#python.chm]" + Target="[HHExe]" + Arguments="[#python.chm]" Name="!(loc.ShortcutName)" Description="!(loc.ShortcutDescription)" - WorkingDirectory="InstallDirectory" /> + WorkingDirectory="InstallDirectory" + Show="maximized" /> <RemoveFolder Id="Remove_MenuDir" On="uninstall" /> </Component> <?endif ?> |