summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin v. L?wis <martin@v.loewis.de>2015-02-09 07:51:32 +0100
committerMartin v. L?wis <martin@v.loewis.de>2015-02-09 07:51:32 +0100
commite1d5b95d141a93635d4b871143569c19c497b953 (patch)
treee9cc2296a8c934e3ce1de780dee1079a19e8e49a
parente25f3e766d86a7262c404b2ccd1ae3e540f89547 (diff)
downloadcpython-e1d5b95d141a93635d4b871143569c19c497b953.tar.gz
Issue #17896: Update msi.py to new externals dir.
-rw-r--r--Tools/msi/msi.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py
index b48f09af0b..d50056a966 100644
--- a/Tools/msi/msi.py
+++ b/Tools/msi/msi.py
@@ -929,9 +929,9 @@ def generate_license():
("Tk", "tk8*", "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 and not snapshot:
raise ValueError, "Multiple copies of "+pat
dir = dirs[0]
@@ -1115,7 +1115,7 @@ def add_files(db):
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
@@ -1140,7 +1140,7 @@ def add_files(db):
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()