diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2008-02-29 21:03:38 (GMT) |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2008-02-29 21:03:38 (GMT) |
| commit | 20c892db1012a84431c75d21565e4a6af538cfed (patch) | |
| tree | f92cc66309958e986082e701e1b6f4443e5caa13 /Tools | |
| parent | 1561babf0c4709e138f01d30127c7d907ec55228 (diff) | |
| download | cpython-20c892db1012a84431c75d21565e4a6af538cfed.zip cpython-20c892db1012a84431c75d21565e4a6af538cfed.tar.gz cpython-20c892db1012a84431c75d21565e4a6af538cfed.tar.bz2 | |
Merged revisions 61038,61042-61045,61047,61050,61053,61055-61056,61061-61062,61066,61068,61070,61083,61085,61092-61097,61103-61104,61110-61112,61114-61115,61117,61120-61122,61126-61127,61129-61131,61134,61137-61139 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r61138 | martin.v.loewis | 2008-02-29 21:26:53 +0100 (Fr, 29 Feb 2008) | 1 line
Make _hashlib depend on pythoncore.
........
r61139 | martin.v.loewis | 2008-02-29 21:54:44 +0100 (Fr, 29 Feb 2008) | 1 line
Package Tcl from tcltk64 on AMD64.
........
Diffstat (limited to 'Tools')
| -rw-r--r-- | Tools/msi/msi.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py index e4d0945..1b7667d 100644 --- a/Tools/msi/msi.py +++ b/Tools/msi/msi.py @@ -1022,8 +1022,10 @@ def add_files(db): sqlite_arch = "/ia64" elif msilib.msi_type=="x64;1033": sqlite_arch = "/amd64" + tclsuffix = "64" else: sqlite_arch = "" + tclsuffix = "" lib.add_file(srcdir+"/"+sqlite_dir+sqlite_arch+"/sqlite3.dll") if have_tcl: if not os.path.exists("%s/%s/_tkinter.pyd" % (srcdir, PCBUILD)): @@ -1032,7 +1034,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/bin") + tcldir = os.path.normpath(srcdir+("/../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 @@ -1056,7 +1058,7 @@ def add_files(db): lib.add_file('libpython%s%s.a' % (major, minor)) if have_tcl: # Add Tcl/Tk - tcldirs = [(root, '../tcltk/lib', 'tcl')] + tcldirs = [(root, '../tcltk%s/lib' % tclsuffix, 'tcl')] tcltk.set_current() while tcldirs: parent, phys, dir = tcldirs.pop() |