diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2008-06-12 20:07:53 (GMT) |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2008-06-12 20:07:53 (GMT) |
| commit | b8a18eaca9e2bdb278a8e45d1cb24e14198d0959 (patch) | |
| tree | 7bd0253ddf0c4d26588fb6596811b3b000ac55e2 /Tools | |
| parent | 7b9e1247764cad4ee556f6ca413760f46456cf2b (diff) | |
| download | cpython-b8a18eaca9e2bdb278a8e45d1cb24e14198d0959.zip cpython-b8a18eaca9e2bdb278a8e45d1cb24e14198d0959.tar.gz cpython-b8a18eaca9e2bdb278a8e45d1cb24e14198d0959.tar.bz2 | |
Fix Tcl/Tk license file in tcl8*/tk8*, include Tix license.
Diffstat (limited to 'Tools')
| -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 d152f75..2fc55e8 100644 --- a/Tools/msi/msi.py +++ b/Tools/msi/msi.py @@ -848,17 +848,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() |