mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-22 11:36:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Package Tcl from tcltk64 on AMD64.

Browse source
This commit is contained in:
Martin v. Löwis 2008-02-29 20:54:44 +00:00
parent d9153fdc29
commit 0e795e7d92
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Tools/msi/msi.py
View file

@ -1021,8 +1021,10 @@ def add_files(db):
sqlite_arch = "/ia64" sqlite_arch = "/ia64"
elif msilib.msi_type=="x64;1033": elif msilib.msi_type=="x64;1033":
sqlite_arch = "/amd64" sqlite_arch = "/amd64"
tclsuffix = "64"
else: else:
sqlite_arch = "" sqlite_arch = ""
tclsuffix = ""
lib.add_file(srcdir+"/"+sqlite_dir+sqlite_arch+"/sqlite3.dll") lib.add_file(srcdir+"/"+sqlite_dir+sqlite_arch+"/sqlite3.dll")
if have_tcl: if have_tcl:
if not os.path.exists("%s/%s/_tkinter.pyd" % (srcdir, PCBUILD)): if not os.path.exists("%s/%s/_tkinter.pyd" % (srcdir, PCBUILD)):
@ -1031,7 +1033,7 @@ def add_files(db):
lib.start_component("TkDLLs", tcltk) lib.start_component("TkDLLs", tcltk)
lib.add_file("_tkinter.pyd") lib.add_file("_tkinter.pyd")
dlls.append("_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"): for f in glob.glob1(tcldir, "*.dll"):
lib.add_file(f, src=os.path.join(tcldir, f)) lib.add_file(f, src=os.path.join(tcldir, f))
# check whether there are any unknown extensions # check whether there are any unknown extensions
@ -1055,7 +1057,7 @@ def add_files(db):
lib.add_file('libpython%s%s.a' % (major, minor)) lib.add_file('libpython%s%s.a' % (major, minor))
if have_tcl: if have_tcl:
# Add Tcl/Tk # Add Tcl/Tk
tcldirs = [(root, '../tcltk/lib', 'tcl')] tcldirs = [(root, '../tcltk%s/lib' % tclsuffix, 'tcl')]
tcltk.set_current() tcltk.set_current()
while tcldirs: while tcldirs:
parent, phys, dir = tcldirs.pop() parent, phys, dir = tcldirs.pop()