From 2f282a9d6cc91b5ac86326a9ee2fedb42596516e Mon Sep 17 00:00:00 2001
From: Steve Dower <steve.dower@microsoft.com>
Date: Mon, 5 Sep 2016 14:05:17 -0700
Subject: Issue #27756: Adds new icons for Python files and processes on
 Windows. Designs by Cherry Wang.

---
 Tools/msi/bundle/bundle.ico           | Bin 19790 -> 0 bytes
 Tools/msi/bundle/bundle.wxs           |   2 +-
 Tools/msi/common.wxs                  |   2 +-
 Tools/msi/exe/exe_files.wxs           |   7 +++++--
 Tools/msi/launcher/launcher_en-US.wxl |   1 +
 Tools/msi/launcher/launcher_reg.wxs   |   8 ++++++--
 6 files changed, 14 insertions(+), 6 deletions(-)
 delete mode 100644 Tools/msi/bundle/bundle.ico

(limited to 'Tools/msi')

diff --git a/Tools/msi/bundle/bundle.ico b/Tools/msi/bundle/bundle.ico
deleted file mode 100644
index 1ab629eff2..0000000000
Binary files a/Tools/msi/bundle/bundle.ico and /dev/null differ
diff --git a/Tools/msi/bundle/bundle.wxs b/Tools/msi/bundle/bundle.wxs
index 38307e063c..c89e6ee4c7 100644
--- a/Tools/msi/bundle/bundle.wxs
+++ b/Tools/msi/bundle/bundle.wxs
@@ -4,7 +4,7 @@
   <Bundle Name="!(loc.FullProductName)"
           UpgradeCode="$(var.CoreUpgradeCode)"
           Version="$(var.Version)"
-          IconSourceFile="bundle.ico"
+          IconSourceFile="..\..\..\PC\icons\setup.ico"
           Manufacturer="!(loc.Manufacturer)"
           AboutUrl="http://www.python.org/"
           DisableModify="button"
diff --git a/Tools/msi/common.wxs b/Tools/msi/common.wxs
index dd41ce88fb..a97ee92f9f 100644
--- a/Tools/msi/common.wxs
+++ b/Tools/msi/common.wxs
@@ -44,7 +44,7 @@
     
     <Fragment>
         <!-- Include an icon for the Programs and Features dialog -->
-        <Icon Id="ARPIcon" SourceFile="!(bindpath.src)PC\pycon.ico" />
+        <Icon Id="ARPIcon" SourceFile="!(bindpath.src)PC\icons\setup.ico" />
         <Property Id="ARPPRODUCTICON" Value="ARPIcon" />
         <Property Id="ARPNOMODIFY" Value="1" />
         <Property Id="DISABLEADVTSHORTCUTS" Value="1" />
diff --git a/Tools/msi/exe/exe_files.wxs b/Tools/msi/exe/exe_files.wxs
index c157f40d32..01385874fa 100644
--- a/Tools/msi/exe/exe_files.wxs
+++ b/Tools/msi/exe/exe_files.wxs
@@ -69,10 +69,13 @@
     <Fragment>
         <ComponentGroup Id="exe_icons">
             <Component Id="py.ico" Directory="DLLs" Guid="*">
-                <File Name="py.ico" Source="!(bindpath.src)PC\py.ico" KeyPath="yes" />
+                <File Name="py.ico" Source="!(bindpath.src)PC\icons\py.ico" KeyPath="yes" />
             </Component>
             <Component Id="pyc.ico" Directory="DLLs" Guid="*">
-                <File Name="pyc.ico" Source="!(bindpath.src)PC\pyc.ico" KeyPath="yes" />
+                <File Name="pyc.ico" Source="!(bindpath.src)PC\icons\pyc.ico" KeyPath="yes" />
+            </Component>
+            <Component Id="pyd.ico" Directory="DLLs" Guid="*">
+                <File Name="pyd.ico" Source="!(bindpath.src)PC\icons\pyd.ico" KeyPath="yes" />
             </Component>
         </ComponentGroup>
     </Fragment>
diff --git a/Tools/msi/launcher/launcher_en-US.wxl b/Tools/msi/launcher/launcher_en-US.wxl
index e4c1aaa9fa..a7e3827c52 100644
--- a/Tools/msi/launcher/launcher_en-US.wxl
+++ b/Tools/msi/launcher/launcher_en-US.wxl
@@ -11,6 +11,7 @@
     <String Id="PythonFileDescription">Python File</String>
     <String Id="PythonNoConFileDescription">Python File (no console)</String>
     <String Id="PythonCompiledFileDescription">Compiled Python File</String>
+    <String Id="PythonExtensionDescription">Python Extension Module</String>
     <String Id="PythonArchiveFileDescription">Python Zip Application File</String>
     <String Id="PythonNoConArchiveFileDescription">Python Zip Application File (no console)</String>
 </WixLocalization>
diff --git a/Tools/msi/launcher/launcher_reg.wxs b/Tools/msi/launcher/launcher_reg.wxs
index 981961ab0d..dace97ee58 100644
--- a/Tools/msi/launcher/launcher_reg.wxs
+++ b/Tools/msi/launcher/launcher_reg.wxs
@@ -27,14 +27,18 @@
                 </ProgId>
                 <RegistryValue Root="HKCR" Key="Python.CompiledFile\shellex\DropHandler" Value="{BEA218D2-6950-497B-9434-61683EC065FE}" Type="string" />
 
-                <ProgId Id="Python.ArchiveFile" Description="!(loc.PythonArchiveFileDescription)" Advertise="no" Icon="py.exe" IconIndex="1">
+                <ProgId Id="Python.Extension" Description="!(loc.PythonExtensionDescription)" Advertise="no" Icon="py.exe" IconIndex="3">
+                    <Extension Id="pyd" />
+                </ProgId>
+
+                <ProgId Id="Python.ArchiveFile" Description="!(loc.PythonArchiveFileDescription)" Advertise="no" Icon="py.exe" IconIndex="5">
                     <Extension Id="pyz" ContentType="application/x-zip-compressed">
                         <Verb Id="open" TargetFile="py.exe" Argument="&quot;%L&quot; %*" />
                     </Extension>
                 </ProgId>
                 <RegistryValue Root="HKCR" Key="Python.ArchiveFile\shellex\DropHandler" Value="{BEA218D2-6950-497B-9434-61683EC065FE}" Type="string" />
                 
-                <ProgId Id="Python.NoConArchiveFile" Description="!(loc.PythonNoConArchiveFileDescription)" Advertise="no" Icon="py.exe" IconIndex="1">
+                <ProgId Id="Python.NoConArchiveFile" Description="!(loc.PythonNoConArchiveFileDescription)" Advertise="no" Icon="py.exe" IconIndex="5">
                     <Extension Id="pyzw" ContentType="application/x-zip-compressed">
                         <Verb Id="open" TargetFile="pyw.exe" Argument="&quot;%L&quot; %*" />
                     </Extension>
-- 
cgit v1.2.1