[Python-checkins] cpython: Update Wix version and fixes wxs file.

[steve.dower]

https://hg.python.org/cpython/rev/b47996cf2ad8
changeset:   95107:b47996cf2ad8
user:        Steve Dower <steve.dower at microsoft.com>
date:        Fri Mar 20 22:05:33 2015 -0700
summary:
  Update Wix version and fixes wxs file.

files:
  Tools/msi/get_wix.py                |  2 +-
  Tools/msi/launcher/launcher_reg.wxs |  4 ++--
  2 files changed, 3 insertions(+), 3 deletions(-)


diff --git a/Tools/msi/get_wix.py b/Tools/msi/get_wix.py
--- a/Tools/msi/get_wix.py
+++ b/Tools/msi/get_wix.py
@@ -22,7 +22,7 @@
     print("Cannot find project root")
     sys.exit(1)
 
-WIX_BINARIES_ZIP = 'http://wixtoolset.org/downloads/v3.10.0.1403/wix310-binaries.zip'
+WIX_BINARIES_ZIP = 'http://wixtoolset.org/downloads/v3.10.0.1519/wix310-binaries.zip'
 TARGET_BIN_ZIP = EXTERNALS_DIR / "wix.zip"
 TARGET_BIN_DIR = EXTERNALS_DIR / "wix"
 
diff --git a/Tools/msi/launcher/launcher_reg.wxs b/Tools/msi/launcher/launcher_reg.wxs
--- a/Tools/msi/launcher/launcher_reg.wxs
+++ b/Tools/msi/launcher/launcher_reg.wxs
@@ -28,14 +28,14 @@
                 <RegistryValue Root="HKCR" Key="$(var.TestPrefix)Python.CompiledFile\shellex\DropHandler" Value="{60254CA5-953B-11CF-8C96-00AA00B8708C}" Type="string" />
 
                 <ProgId Id="$(var.TestPrefix)Python.ArchiveFile" Description="!(loc.PythonArchiveFileDescription)" Advertise="no" Icon="py.exe" IconIndex="1">
-                    <Extension Id="$(var.ArchiveFileExtension)" ContentType="application/x-zip-compressed">
+                    <Extension Id="$(var.FileExtension)z" ContentType="application/x-zip-compressed">
                         <Verb Id="open" TargetFile="py.exe" Argument=""%L" %*" />
                     </Extension>
                 </ProgId>
                 <RegistryValue Root="HKCR" Key="$(var.TestPrefix)Python.ArchiveFile\shellex\DropHandler" Value="{60254CA5-953B-11CF-8C96-00AA00B8708C}" Type="string" />
                 
                 <ProgId Id="$(var.TestPrefix)Python.NoConArchiveFile" Description="!(loc.PythonNoConArchiveFileDescription)" Advertise="no" Icon="py.exe" IconIndex="1">
-                    <Extension Id="$(var.ArchiveFileExtension)w" ContentType="application/x-zip-compressed">
+                    <Extension Id="$(var.FileExtension)zw" ContentType="application/x-zip-compressed">
                         <Verb Id="open" TargetFile="pyw.exe" Argument=""%L" %*" />
                     </Extension>
                 </ProgId>

-- 
Repository URL: https://hg.python.org/cpython