[Python-checkins] cpython (merge 3.5 -> default): Updates get_wix.py for newer version of WiX.

steve.dower python-checkins at python.org
Tue Jul 21 04:53:45 CEST 2015


https://hg.python.org/cpython/rev/2b56cc9dfd56
changeset:   96971:2b56cc9dfd56
parent:      96969:f0496665e7b7
parent:      96970:a4cbd997d261
user:        Steve Dower <steve.dower at microsoft.com>
date:        Mon Jul 20 19:53:26 2015 -0700
summary:
  Updates get_wix.py for newer version of WiX.

files:
  Tools/msi/get_wix.py |  4 ++--
  1 files changed, 2 insertions(+), 2 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
@@ -13,7 +13,7 @@
 from zipfile import ZipFile
 
 EXTERNALS_DIR = None
-for p in Path(__file__).parents:
+for p in (Path.cwd() / __file__).parents:
     if any(p.glob("PCBuild/*.vcxproj")):
         EXTERNALS_DIR = p / "externals"
         break
@@ -22,7 +22,7 @@
     print("Cannot find project root")
     sys.exit(1)
 
-WIX_BINARIES_ZIP = 'http://wixtoolset.org/downloads/v3.10.0.1519/wix310-binaries.zip'
+WIX_BINARIES_ZIP = 'http://wixtoolset.org/downloads/v3.10.0.1823/wix310-binaries.zip'
 TARGET_BIN_ZIP = EXTERNALS_DIR / "wix.zip"
 TARGET_BIN_DIR = EXTERNALS_DIR / "wix"
 

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


More information about the Python-checkins mailing list