Update msi.py and uuids.py for 2.7.9 releases
diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py
index 09105a2..b4dcca7 100644
--- a/Tools/msi/msi.py
+++ b/Tools/msi/msi.py
@@ -912,9 +912,9 @@
("Tk", "tk-8*", "license.terms"),
("Tix", "tix-*", "license.terms")):
out.write("\nThis copy of Python includes a copy of %s, which is licensed under the following terms:\n\n" % name)
- dirs = glob.glob(srcdir+"/../"+pat)
+ dirs = glob.glob(srcdir+"/externals/"+pat)
if not dirs:
- raise ValueError, "Could not find "+srcdir+"/../"+pat
+ raise ValueError, "Could not find "+srcdir+"/externals/"+pat
if len(dirs) > 2:
raise ValueError, "Multiple copies of "+pat
dir = dirs[0]
@@ -1117,7 +1117,7 @@
lib.start_component("TkDLLs", tcltk)
lib.add_file("_tkinter.pyd")
dlls.append("_tkinter.pyd")
- tcldir = os.path.normpath(srcdir+("/../tcltk%s/bin" % tclsuffix))
+ tcldir = os.path.normpath(srcdir+("/externals/tcltk%s/bin" % tclsuffix))
for f in glob.glob1(tcldir, "*.dll"):
lib.add_file(f, src=os.path.join(tcldir, f))
# check whether there are any unknown extensions
@@ -1141,7 +1141,7 @@
lib.add_file('libpython%s%s.a' % (major, minor))
if have_tcl:
# Add Tcl/Tk
- tcldirs = [(root, '../tcltk%s/lib' % tclsuffix, 'tcl')]
+ tcldirs = [(root, 'externals/tcltk%s/lib' % tclsuffix, 'tcl')]
tcltk.set_current()
while tcldirs:
parent, phys, dir = tcldirs.pop()