mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-25 21:11:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Add sqlite3.dll to the DLLs component, not to the TkDLLs component.

Browse source 
Fixes #1517388.
This commit is contained in:
Martin v. Löwis 2006-07-06 06:55:58 +00:00
parent a12aa88fd8
commit 88ef637777
2 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Tools/msi/msi.py
View file

@ -962,6 +962,14 @@ def add_files(db):
continue
dlls.append(f)
lib.add_file(f)
# Add sqlite
if msilib.msi_type=="Intel64;1033":
sqlite_arch = "/ia64"
elif msilib.msi_type=="x64;1033":
sqlite_arch = "/amd64"
else:
sqlite_arch = ""
lib.add_file(srcdir+"/"+sqlite_dir+sqlite_arch+"/sqlite3.dll")
if have_tcl:
if not os.path.exists(srcdir+"/PCBuild/_tkinter.pyd"):
print "WARNING: Missing _tkinter.pyd"
@ -972,14 +980,6 @@ def add_files(db):
tcldir = os.path.normpath(srcdir+"/../tcltk/bin")
for f in glob.glob1(tcldir, "*.dll"):
lib.add_file(f, src=os.path.join(tcldir, f))
# Add sqlite
if msilib.msi_type=="Intel64;1033":
sqlite_arch = "/ia64"
elif msilib.msi_type=="x64;1033":
sqlite_arch = "/amd64"
else:
sqlite_arch = ""
lib.add_file(srcdir+"/"+sqlite_dir+sqlite_arch+"/sqlite3.dll")
# check whether there are any unknown extensions
for f in glob.glob1(srcdir+"/PCBuild", "*.pyd"):
if f.endswith("_d.pyd"): continue # debug version