diff options
author | Steve Dower <steve.dower@microsoft.com> | 2014-11-26 06:43:06 (GMT) |
---|---|---|
committer | Steve Dower <steve.dower@microsoft.com> | 2014-11-26 06:43:06 (GMT) |
commit | a6e6d0a6212e61e64510ef7ad55b121af39b5903 (patch) | |
tree | 9322475e7aeed78388e45a93fdc86eac37436b86 /Tools | |
parent | 016487b54e73fa021cf2503cb9247fe94595836d (diff) | |
download | cpython-a6e6d0a6212e61e64510ef7ad55b121af39b5903.zip cpython-a6e6d0a6212e61e64510ef7ad55b121af39b5903.tar.gz cpython-a6e6d0a6212e61e64510ef7ad55b121af39b5903.tar.bz2 |
Update msi.py and uuids.py for 2.7.9 releases
Diffstat (limited to 'Tools')
-rw-r--r-- | Tools/msi/msi.py | 8 | ||||
-rw-r--r-- | Tools/msi/uuids.py | 2 |
2 files changed, 6 insertions, 4 deletions
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 @@ def generate_license(): ("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 @@ 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 @@ -1141,7 +1141,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() diff --git a/Tools/msi/uuids.py b/Tools/msi/uuids.py index 2e4dc31..d8c426a 100644 --- a/Tools/msi/uuids.py +++ b/Tools/msi/uuids.py @@ -66,4 +66,6 @@ product_codes = { '2.7.7121':'{5E0D187D-238B-4e96-9C75-C4CF141F5385}', # 2.7.7rc1 '2.7.7150':'{049CA433-77A0-4e48-AC76-180A282C4E10}', # 2.7.7 '2.7.8150':'{61121B12-88BD-4261-A6EE-AB32610A56DD}', # 2.7.8 + '2.7.9121':'{AAB1E8FF-6D00-4409-8F13-BE365AB92FFE}', # 2.7.9rc1 + '2.7.9150':'{79F081BF-7454-43DB-BD8F-9EE596813232}', # 2.7.9 } |