diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2008-06-13 14:11:59 (GMT) |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2008-06-13 14:11:59 (GMT) |
| commit | f38e0d0c8ced2dd009d9afccc444a42b729dc009 (patch) | |
| tree | 6b9a776e664c120465142d76ba3bf9dee95881a6 /Tools/msi/msi.py | |
| parent | 59683e852906736276df6b8146064666098071b5 (diff) | |
| download | cpython-f38e0d0c8ced2dd009d9afccc444a42b729dc009.zip cpython-f38e0d0c8ced2dd009d9afccc444a42b729dc009.tar.gz cpython-f38e0d0c8ced2dd009d9afccc444a42b729dc009.tar.bz2 | |
Merged revisions 64185-64196 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r64185 | martin.v.loewis | 2008-06-12 20:38:47 +0200 (Do, 12 Jun 2008) | 1 line
Switch to Tcl/Tk 8.5.2.
........
r64189 | martin.v.loewis | 2008-06-12 20:52:00 +0200 (Do, 12 Jun 2008) | 1 line
Switch to Tcl/Tk 8.5.
........
r64191 | martin.v.loewis | 2008-06-12 21:00:14 +0200 (Do, 12 Jun 2008) | 1 line
Revert bogus disabling of Tcl and Tk.
........
r64194 | martin.v.loewis | 2008-06-12 21:51:59 +0200 (Do, 12 Jun 2008) | 1 line
Split Tcl make targets into separate ones.
........
r64195 | martin.v.loewis | 2008-06-12 22:06:18 +0200 (Do, 12 Jun 2008) | 1 line
Support file names which include '+' (for Tk 8.5).
........
r64196 | martin.v.loewis | 2008-06-12 22:07:53 +0200 (Do, 12 Jun 2008) | 1 line
Fix Tcl/Tk license file in tcl8*/tk8*, include Tix license.
........
Diffstat (limited to 'Tools/msi/msi.py')
| -rw-r--r-- | Tools/msi/msi.py | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py index 03ccc57..174a334 100644 --- a/Tools/msi/msi.py +++ b/Tools/msi/msi.py @@ -849,17 +849,18 @@ def generate_license(): import shutil, glob out = open("LICENSE.txt", "w") shutil.copyfileobj(open(os.path.join(srcdir, "LICENSE")), out) - for dir, file in (("bzip2","LICENSE"), - ("db", "LICENSE"), - ("openssl", "LICENSE"), - ("tcl", "license.terms"), - ("tk", "license.terms")): - out.write("\nThis copy of Python includes a copy of %s, which is licensed under the following terms:\n\n" % dir) - dirs = glob.glob(srcdir+"/../"+dir+"-*") + for name, pat, file in (("bzip2","bzip2-*", "LICENSE"), + ("Berkeley DB", "db-*", "LICENSE"), + ("openssl", "openssl-*", "LICENSE"), + ("Tcl", "tcl8*", "license.terms"), + ("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) if not dirs: - raise ValueError, "Could not find "+srcdir+"/../"+dir+"-*" + raise ValueError, "Could not find "+srcdir+"/../"+pat if len(dirs) > 2: - raise ValueError, "Multiple copies of "+dir + raise ValueError, "Multiple copies of "+pat dir = dirs[0] shutil.copyfileobj(open(os.path.join(dir, file)), out) out.close() |