mirror of https://github.com/python/cpython
Add sqlite3.dll to the DLLs component, not to the TkDLLs component.
Fixes #1517388.
This commit is contained in:
parent
a12aa88fd8
commit
88ef637777
|
@ -89,6 +89,9 @@ Extension Modules
|
|||
Build
|
||||
-----
|
||||
|
||||
- Bug #1517388: sqlite3.dll is now installed on Windows independent
|
||||
of Tcl/Tk.
|
||||
|
||||
- Bug #1513032: 'make install' failed on FreeBSD 5.3 due to lib-old
|
||||
trying to be installed even though it's empty.
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue