summaryrefslogtreecommitdiffstats
path: root/Tools/msi/doc
diff options
context:
space:
mode:
authorSteve Dower <steve.dower@microsoft.com>2015-05-03 21:54:32 (GMT)
committerSteve Dower <steve.dower@microsoft.com>2015-05-03 21:54:32 (GMT)
commit1d4880db3d48bbb52226a7ea1bfeb6f6c8c81f64 (patch)
tree44179b714c767c59c9408b1b6808649c8cba7ec2 /Tools/msi/doc
parent2d0a69a456831f483a612fa97c7ed1b178b1bdd2 (diff)
downloadcpython-1d4880db3d48bbb52226a7ea1bfeb6f6c8c81f64.zip
cpython-1d4880db3d48bbb52226a7ea1bfeb6f6c8c81f64.tar.gz
cpython-1d4880db3d48bbb52226a7ea1bfeb6f6c8c81f64.tar.bz2
Enables shortcuts to be deselected when installing on Windows.
Diffstat (limited to 'Tools/msi/doc')
-rw-r--r--Tools/msi/doc/doc.wxs7
-rw-r--r--Tools/msi/doc/doc_files.wxs3
2 files changed, 7 insertions, 3 deletions
diff --git a/Tools/msi/doc/doc.wxs b/Tools/msi/doc/doc.wxs
index ddab83b..22b0213 100644
--- a/Tools/msi/doc/doc.wxs
+++ b/Tools/msi/doc/doc.wxs
@@ -8,13 +8,14 @@
<PropertyRef Id="REGISTRYKEY" />
<Feature Id="DefaultFeature" AllowAdvertise="no" Title="!(loc.Title)" Description="!(loc.Description)">
+ <ComponentGroupRef Id="doc" Primary="yes" />
+ </Feature>
+ <Feature Id="Shortcuts" AllowAdvertise="no" Title="!(loc.Title)" Description="!(loc.Description)">
<ComponentGroupRef Id="doc" />
<?ifdef DocFilename ?>
<Component Id="doc_shortcut" Directory="MenuDir" Guid="*">
- <RegistryKey Root="HKMU" Key="[REGISTRYKEY]">
- <RegistryValue Key="Help\Main Python Documentation" Type="string" Value="[#python.chm]" KeyPath="yes" />
- </RegistryKey>
+ <RegistryValue Root="HKMU" Key="[REGISTRYKEY]\DocShortcuts" Type="integer" Value="1" KeyPath="yes" />
<Shortcut Id="python.chm"
Target="[#python.chm]"
Name="!(loc.ShortcutName)"
diff --git a/Tools/msi/doc/doc_files.wxs b/Tools/msi/doc/doc_files.wxs
index b2aabfb..fe09afe 100644
--- a/Tools/msi/doc/doc_files.wxs
+++ b/Tools/msi/doc/doc_files.wxs
@@ -6,6 +6,9 @@
<ComponentGroup Id="doc">
<Component Id="python.chm" Directory="Doc" Guid="*">
<File Id="python.chm" Name="$(var.DocFilename)" KeyPath="yes" />
+ <RegistryKey Root="HKMU" Key="[REGISTRYKEY]">
+ <RegistryValue Key="Help\Main Python Documentation" Type="string" Value="[#python.chm]" />
+ </RegistryKey>
</Component>
</ComponentGroup>
</Fragment>