diff options
| author | Steve Dower <steve.dower@python.org> | 2022-03-22 01:08:37 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-22 01:08:37 (GMT) |
| commit | 3751b6b030b4a3b88959b4f3c4ef2e58d325e497 (patch) | |
| tree | 2e88aeafa9c1e99c1ab33ec0ec4d4c92bb061517 /Tools/msi/doc/doc.wxs | |
| parent | 19058b9f6271338bcc46b7d30fe79a83990cc35c (diff) | |
| download | cpython-3751b6b030b4a3b88959b4f3c4ef2e58d325e497.zip cpython-3751b6b030b4a3b88959b4f3c4ef2e58d325e497.tar.gz cpython-3751b6b030b4a3b88959b4f3c4ef2e58d325e497.tar.bz2 | |
bpo-47086: Remove .chm from Windows installer and add HTML docs (GH-32038)
Diffstat (limited to 'Tools/msi/doc/doc.wxs')
| -rw-r--r-- | Tools/msi/doc/doc.wxs | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/Tools/msi/doc/doc.wxs b/Tools/msi/doc/doc.wxs index 1d7706b..e80fff4 100644 --- a/Tools/msi/doc/doc.wxs +++ b/Tools/msi/doc/doc.wxs @@ -8,35 +8,31 @@ <PropertyRef Id="UpgradeTable" /> <PropertyRef Id="REGISTRYKEY" /> - <Property Id="HHExe" Value="C:\Windows\hh.exe" /> - <CustomAction Id="SetHHExe" Property="HHExe" 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" /> + <ComponentGroupRef Id="doc_html" Primary="yes" /> <ComponentRef Id="OptionalFeature" /> + + <Component Id="doc_reg" Directory="Doc" Guid="*"> + <RegistryKey Root="HKMU" Key="[REGISTRYKEY]"> + <RegistryValue Key="Help\Main Python Documentation" Type="string" Value="[#Doc_html_index.html]" KeyPath="yes" /> + </RegistryKey> + </Component> </Feature> <Feature Id="Shortcuts" AllowAdvertise="no" Title="!(loc.Title)" Description="!(loc.Description)"> - <ComponentGroupRef Id="doc" /> + <ComponentGroupRef Id="doc_html" /> - <?ifdef DocFilename ?> <Component Id="doc_shortcut" Directory="MenuDir" Guid="*"> <RegistryKey Root="HKMU" Key="[OPTIONALFEATURESREGISTRYKEY]"> <RegistryValue Name="$(var.OptionalFeatureName)_shortcut" Type="string" Value="$(var.Version)" KeyPath="yes" /> </RegistryKey> - <Shortcut Id="python.chm" - Target="[HHExe]" - Arguments="[#python.chm]" + <Shortcut Id="python.html" + Target="[#Doc_html_index.html]" Name="!(loc.ShortcutName)" Description="!(loc.ShortcutDescription)" WorkingDirectory="InstallDirectory" Show="maximized" /> <RemoveFolder Id="Remove_MenuDir" On="uninstall" /> </Component> - <?endif ?> - </Feature> </Product> </Wix> |