summaryrefslogtreecommitdiffstats
path: root/Tools
diff options
context:
space:
mode:
authorSteve Dower <steve.dower@microsoft.com>2015-03-21 05:05:33 (GMT)
committerSteve Dower <steve.dower@microsoft.com>2015-03-21 05:05:33 (GMT)
commite9ae8340a3060637ae74825024683d05e3bb71e3 (patch)
tree1b3ba8644a2184499df4f0b4b6d0fb39f8dd6888 /Tools
parent39dadf7abf24302185f69493808dfb61fb8c4073 (diff)
downloadcpython-e9ae8340a3060637ae74825024683d05e3bb71e3.zip
cpython-e9ae8340a3060637ae74825024683d05e3bb71e3.tar.gz
cpython-e9ae8340a3060637ae74825024683d05e3bb71e3.tar.bz2
Update Wix version and fixes wxs file.
Diffstat (limited to 'Tools')
-rw-r--r--Tools/msi/get_wix.py2
-rw-r--r--Tools/msi/launcher/launcher_reg.wxs4
2 files changed, 3 insertions, 3 deletions
diff --git a/Tools/msi/get_wix.py b/Tools/msi/get_wix.py
index da36a2e..c6cf5d9 100644
--- 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 4e5782c..204b4ed 100644
--- 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>