changeset:   97681:3594400f3202
branch:      3.5
parent:      97677:4e329892817c
user:        Steve Dower <steve.dower@microsoft.com>
date:        Sat Sep 05 12:47:06 2015 -0700
files:       Misc/NEWS Tools/msi/core/core_d.wxs Tools/msi/core/core_pdb.wxs Tools/msi/dev/dev_d.wxs Tools/msi/exe/exe_d.wxs Tools/msi/exe/exe_pdb.wxs Tools/msi/lib/lib_d.wxs Tools/msi/lib/lib_pdb.wxs Tools/msi/tcltk/tcltk_d.wxs Tools/msi/tcltk/tcltk_pdb.wxs Tools/msi/test/test_d.wxs Tools/msi/test/test_pdb.wxs
description:
Issue #24910: Windows MSIs now have unique display names.


diff -r 4e329892817c -r 3594400f3202 Misc/NEWS
--- a/Misc/NEWS	Fri Sep 04 12:54:36 2015 -0700
+++ b/Misc/NEWS	Sat Sep 05 12:47:06 2015 -0700
@@ -71,6 +71,8 @@
 Build
 -----
 
+- Issue #24910: Windows MSIs now have unique display names.
+
 - Issue #24986: It is now possible to build Python on Windows without errors
   when external libraries are not available.
 
diff -r 4e329892817c -r 3594400f3202 Tools/msi/core/core_d.wxs
--- a/Tools/msi/core/core_d.wxs	Fri Sep 04 12:54:36 2015 -0700
+++ b/Tools/msi/core/core_d.wxs	Sat Sep 05 12:47:06 2015 -0700
@@ -1,6 +1,6 @@
 <?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)">
+    <Product Id="*" Language="!(loc.LCID)" Name="!(loc.Title_d)" Version="$(var.Version)" Manufacturer="!(loc.Manufacturer)" UpgradeCode="$(var.UpgradeCode)">
         <Package InstallerVersion="300" Compressed="yes" InstallScope="perUser" Platform="$(var.Platform)" />
         <MediaTemplate EmbedCab="yes" CompressionLevel="high" />
         
diff -r 4e329892817c -r 3594400f3202 Tools/msi/core/core_pdb.wxs
--- a/Tools/msi/core/core_pdb.wxs	Fri Sep 04 12:54:36 2015 -0700
+++ b/Tools/msi/core/core_pdb.wxs	Sat Sep 05 12:47:06 2015 -0700
@@ -1,6 +1,6 @@
 <?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)">
+    <Product Id="*" Language="!(loc.LCID)" Name="!(loc.TitlePdb)" Version="$(var.Version)" Manufacturer="!(loc.Manufacturer)" UpgradeCode="$(var.UpgradeCode)">
         <Package InstallerVersion="300" Compressed="yes" InstallScope="perUser" Platform="$(var.Platform)" />
         <MediaTemplate EmbedCab="yes" CompressionLevel="high" />
         
diff -r 4e329892817c -r 3594400f3202 Tools/msi/dev/dev_d.wxs
--- a/Tools/msi/dev/dev_d.wxs	Fri Sep 04 12:54:36 2015 -0700
+++ b/Tools/msi/dev/dev_d.wxs	Sat Sep 05 12:47:06 2015 -0700
@@ -1,6 +1,6 @@
 <?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)">
+    <Product Id="*" Language="!(loc.LCID)" Name="!(loc.Title_d)" Version="$(var.Version)" Manufacturer="!(loc.Manufacturer)" UpgradeCode="$(var.UpgradeCode)">
         <Package InstallerVersion="300" Compressed="yes" InstallScope="perUser" Platform="$(var.Platform)" />
         <MediaTemplate EmbedCab="yes" CompressionLevel="high" />
         
diff -r 4e329892817c -r 3594400f3202 Tools/msi/exe/exe_d.wxs
--- a/Tools/msi/exe/exe_d.wxs	Fri Sep 04 12:54:36 2015 -0700
+++ b/Tools/msi/exe/exe_d.wxs	Sat Sep 05 12:47:06 2015 -0700
@@ -1,6 +1,6 @@
 <?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)">
+    <Product Id="*" Language="!(loc.LCID)" Name="!(loc.Title_d)" Version="$(var.Version)" Manufacturer="!(loc.Manufacturer)" UpgradeCode="$(var.UpgradeCode)">
         <Package InstallerVersion="300" Compressed="yes" InstallScope="perUser" Platform="$(var.Platform)" />
         <MediaTemplate EmbedCab="yes" CompressionLevel="high" />
         
diff -r 4e329892817c -r 3594400f3202 Tools/msi/exe/exe_pdb.wxs
--- a/Tools/msi/exe/exe_pdb.wxs	Fri Sep 04 12:54:36 2015 -0700
+++ b/Tools/msi/exe/exe_pdb.wxs	Sat Sep 05 12:47:06 2015 -0700
@@ -1,6 +1,6 @@
 <?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)">
+    <Product Id="*" Language="!(loc.LCID)" Name="!(loc.TitlePdb)" Version="$(var.Version)" Manufacturer="!(loc.Manufacturer)" UpgradeCode="$(var.UpgradeCode)">
         <Package InstallerVersion="300" Compressed="yes" InstallScope="perUser" Platform="$(var.Platform)" />
         <MediaTemplate EmbedCab="yes" CompressionLevel="high" />
         
diff -r 4e329892817c -r 3594400f3202 Tools/msi/lib/lib_d.wxs
--- a/Tools/msi/lib/lib_d.wxs	Fri Sep 04 12:54:36 2015 -0700
+++ b/Tools/msi/lib/lib_d.wxs	Sat Sep 05 12:47:06 2015 -0700
@@ -1,6 +1,6 @@
 <?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)">
+    <Product Id="*" Language="!(loc.LCID)" Name="!(loc.Title_d)" Version="$(var.Version)" Manufacturer="!(loc.Manufacturer)" UpgradeCode="$(var.UpgradeCode)">
         <Package InstallerVersion="300" Compressed="yes" InstallScope="perUser" Platform="$(var.Platform)" />
         <MediaTemplate EmbedCab="yes" CompressionLevel="high" />
         
diff -r 4e329892817c -r 3594400f3202 Tools/msi/lib/lib_pdb.wxs
--- a/Tools/msi/lib/lib_pdb.wxs	Fri Sep 04 12:54:36 2015 -0700
+++ b/Tools/msi/lib/lib_pdb.wxs	Sat Sep 05 12:47:06 2015 -0700
@@ -1,6 +1,6 @@
 <?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)">
+    <Product Id="*" Language="!(loc.LCID)" Name="!(loc.TitlePdb)" Version="$(var.Version)" Manufacturer="!(loc.Manufacturer)" UpgradeCode="$(var.UpgradeCode)">
         <Package InstallerVersion="300" Compressed="yes" InstallScope="perUser" Platform="$(var.Platform)" />
         <MediaTemplate EmbedCab="yes" CompressionLevel="high" />
         
diff -r 4e329892817c -r 3594400f3202 Tools/msi/tcltk/tcltk_d.wxs
--- a/Tools/msi/tcltk/tcltk_d.wxs	Fri Sep 04 12:54:36 2015 -0700
+++ b/Tools/msi/tcltk/tcltk_d.wxs	Sat Sep 05 12:47:06 2015 -0700
@@ -1,6 +1,6 @@
 <?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)">
+    <Product Id="*" Language="!(loc.LCID)" Name="!(loc.Title_d)" Version="$(var.Version)" Manufacturer="!(loc.Manufacturer)" UpgradeCode="$(var.UpgradeCode)">
         <Package InstallerVersion="300" Compressed="yes" InstallScope="perUser" Platform="$(var.Platform)" />
         <MediaTemplate EmbedCab="yes" CompressionLevel="high" />
         
diff -r 4e329892817c -r 3594400f3202 Tools/msi/tcltk/tcltk_pdb.wxs
--- a/Tools/msi/tcltk/tcltk_pdb.wxs	Fri Sep 04 12:54:36 2015 -0700
+++ b/Tools/msi/tcltk/tcltk_pdb.wxs	Sat Sep 05 12:47:06 2015 -0700
@@ -1,6 +1,6 @@
 <?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)">
+    <Product Id="*" Language="!(loc.LCID)" Name="!(loc.TitlePdb)" Version="$(var.Version)" Manufacturer="!(loc.Manufacturer)" UpgradeCode="$(var.UpgradeCode)">
         <Package InstallerVersion="300" Compressed="yes" InstallScope="perUser" Platform="$(var.Platform)" />
         <MediaTemplate EmbedCab="yes" CompressionLevel="high" />
         
diff -r 4e329892817c -r 3594400f3202 Tools/msi/test/test_d.wxs
--- a/Tools/msi/test/test_d.wxs	Fri Sep 04 12:54:36 2015 -0700
+++ b/Tools/msi/test/test_d.wxs	Sat Sep 05 12:47:06 2015 -0700
@@ -1,6 +1,6 @@
 <?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)">
+    <Product Id="*" Language="!(loc.LCID)" Name="!(loc.Title_d)" Version="$(var.Version)" Manufacturer="!(loc.Manufacturer)" UpgradeCode="$(var.UpgradeCode)">
         <Package InstallerVersion="300" Compressed="yes" InstallScope="perUser" Platform="$(var.Platform)" />
         <MediaTemplate EmbedCab="yes" CompressionLevel="high" />
         
diff -r 4e329892817c -r 3594400f3202 Tools/msi/test/test_pdb.wxs
--- a/Tools/msi/test/test_pdb.wxs	Fri Sep 04 12:54:36 2015 -0700
+++ b/Tools/msi/test/test_pdb.wxs	Sat Sep 05 12:47:06 2015 -0700
@@ -1,6 +1,6 @@
 <?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)">
+    <Product Id="*" Language="!(loc.LCID)" Name="!(loc.TitlePdb)" Version="$(var.Version)" Manufacturer="!(loc.Manufacturer)" UpgradeCode="$(var.UpgradeCode)">
         <Package InstallerVersion="300" Compressed="yes" InstallScope="perUser" Platform="$(var.Platform)" />
         <MediaTemplate EmbedCab="yes" CompressionLevel="high" />