Issue #23260: Update Windows installer

5 files changed, 92 insertions, 0 deletions

diff --git a/Tools/msi/doc/doc.wixproj b/Tools/msi/doc/doc.wixproj
new file mode 100644
index 0000000..ea9929a
--- /dev/null
+++ b/Tools/msi/doc/doc.wixproj
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <PropertyGroup>
+        <ProjectGuid>{0D62A2BB-5F71-4447-8C8C-9708407B3674}</ProjectGuid>
+        <SchemaVersion>2.0</SchemaVersion>
+        <OutputName>doc</OutputName>
+        <OutputType>Package</OutputType>
+        <!-- Shortcut validation is not necessary -->
+        <SuppressICEs>ICE43</SuppressICEs>
+    </PropertyGroup>
+    <Import Project="..\msi.props" />
+    <PropertyGroup>
+        <DocFilename>python$(MajorVersionNumber)$(MinorVersionNumber)$(MicroVersionNumber)$(ReleaseLevelName).chm</DocFilename>
+        <IncludeDocFile>false</IncludeDocFile>
+        <IncludeDocFile Condition="$(BuildForRelease) or Exists('$(PySourcePath)Doc\build\htmlhelp\$(DocFilename)')">true</IncludeDocFile>
+    </PropertyGroup>
+    <PropertyGroup Condition="$(IncludeDocFile)">
+        <DefineConstants>$(DefineConstants);DocFilename=$(DocFilename);</DefineConstants>
+    </PropertyGroup>
+    <ItemGroup>
+        <Compile Include="doc.wxs" />
+        <Compile Include="doc_files.wxs" Condition="$(IncludeDocFile)" />
+        <Compile Include="doc_no_files.wxs" Condition="!$(IncludeDocFile)" />
+    </ItemGroup>
+    <ItemGroup>
+        <WxlTemplate Include="*.wxl_template" />
+    </ItemGroup>
+    
+    <Import Project="..\msi.targets" />
+</Project>
\ No newline at end of file
diff --git a/Tools/msi/doc/doc.wxs b/Tools/msi/doc/doc.wxs
new file mode 100644
index 0000000..6becaf6
--- /dev/null
+++ b/Tools/msi/doc/doc.wxs
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+    <Product Id="*" Language="!(loc.LCID)" Name="!(loc.Title)" Version="$(var.Version)" Manufacturer="!(loc.Manufacturer)" UpgradeCode="$(var.UpgradeCode)">
+        <Package InstallerVersion="300" Compressed="yes" InstallScope="perUser" Platform="$(var.Platform)" />
+        <MediaTemplate EmbedCab="yes" CompressionLevel="high" />
+        
+        <PropertyRef Id="UpgradeTable" />
+        <PropertyRef Id="REGISTRYKEY" />
+        
+        <Feature Id="DefaultFeature" AllowAdvertise="no" Title="!(loc.Title)" Description="!(loc.Description)">
+            <ComponentGroupRef Id="doc" />
+            
+            <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>
+                <Shortcut Id="python.chm"
+                          Target="[#python.chm]"
+                          Name="!(loc.ShortcutName)"
+                          Description="!(loc.ShortcutDescription)" />
+                <RemoveFolder Id="Remove_MenuDir" On="uninstall" />
+            </Component>
+
+        </Feature>
+    </Product>
+</Wix>
diff --git a/Tools/msi/doc/doc_en-US.wxl_template b/Tools/msi/doc/doc_en-US.wxl_template
new file mode 100644
index 0000000..09df582
--- /dev/null
+++ b/Tools/msi/doc/doc_en-US.wxl_template
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<WixLocalization Culture="en-us" xmlns="http://schemas.microsoft.com/wix/2006/localization">
+    <String Id="ShortDescriptor">doc</String>
+    <String Id="Descriptor">Documentation</String>
+    <String Id="ShortcutName">Python {{ShortVersion}} {{Bitness}} Manuals</String>
+    <String Id="ShortcutDescription">View the !(loc.ProductName) documentation.</String>
+</WixLocalization>
diff --git a/Tools/msi/doc/doc_files.wxs b/Tools/msi/doc/doc_files.wxs
new file mode 100644
index 0000000..b2aabfb
--- /dev/null
+++ b/Tools/msi/doc/doc_files.wxs
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+    <Fragment>
+        <PropertyRef Id="REGISTRYKEY" />
+        
+        <ComponentGroup Id="doc">
+            <Component Id="python.chm" Directory="Doc" Guid="*">
+                <File Id="python.chm" Name="$(var.DocFilename)" KeyPath="yes" />
+            </Component>
+        </ComponentGroup>
+    </Fragment>
+</Wix>
diff --git a/Tools/msi/doc/doc_no_files.wxs b/Tools/msi/doc/doc_no_files.wxs
new file mode 100644
index 0000000..7ab7c26
--- /dev/null
+++ b/Tools/msi/doc/doc_no_files.wxs
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+    <Fragment>
+        <ComponentGroup Id="doc">
+            <!--
+            This file is included when the CHM is not available.
+            
+            This way, snapshot builds can succeed without having to
+            build the docs.
+            -->
+            <Component Id="EmptyDocFolder" Directory="Doc" Guid="{22FD42DB-EC66-4B1C-B1FC-44E0CF7B2462}">
+                <CreateFolder />
+                <RemoveFolder Id="Remove_EmptyDocFolder" On="uninstall" />
+            </Component>
+        </ComponentGroup>
+    </Fragment>
+</Wix>