Update Wix version and fixes wxs file.

diff --git a/Tools/msi/get_wix.py b/Tools/msi/get_wix.py
index da36a2e54a17a8b18037704b69388533579625cb..c6cf5d92f76a51c65c34c07307061c5e89aa96d5 100644 (file)
--- a/Tools/msi/get_wix.py
+++ b/Tools/msi/get_wix.py
@@ -22,7 +22,7 @@ if not EXTERNALS_DIR:
     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
index 4e5782ce7dd3d1b4e2853ae63b4c387523a457b1..204b4ed261fcffb2630f0ffdfbfbb29b2fef2701 100644 (file)
--- 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="&quot;%L&quot; %*" />
                     </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="&quot;%L&quot; %*" />
                     </Extension>
                 </ProgId>