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

Pickup sqlite3.dll from binary directory.

Browse source 
Commit more often.
This commit is contained in:
Martin v. Löwis 2008-06-13 18:58:47 +00:00
parent cac8f585b1
commit c9798fc709
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Tools/msi/msi.py
View file

@ -24,8 +24,6 @@ srcdir = os.path.abspath("../..")
full_current_version = None full_current_version = None
# Is Tcl available at all? # Is Tcl available at all?
have_tcl = True have_tcl = True
# Where is sqlite3.dll located, relative to srcdir?
sqlite_dir = "../sqlite-source-3.3.4"
# path to PCbuild directory # path to PCbuild directory
PCBUILD="PCbuild" PCBUILD="PCbuild"
# msvcrt version # msvcrt version
@ -939,6 +937,8 @@ def add_files(db):
dirs={} dirs={}
pydirs = [(root,"Lib")] pydirs = [(root,"Lib")]
while pydirs: while pydirs:
# Commit every now and then, or else installer will complain
db.Commit()
parent, dir = pydirs.pop() parent, dir = pydirs.pop()
if dir == ".svn" or dir.startswith("plat-"): if dir == ".svn" or dir.startswith("plat-"):
continue continue
@ -1041,7 +1041,7 @@ def add_files(db):
else: else:
sqlite_arch = "" sqlite_arch = ""
tclsuffix = "" tclsuffix = ""
lib.add_file(srcdir+"/"+sqlite_dir+sqlite_arch+"/sqlite3.dll") lib.add_file("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)):
print "WARNING: Missing _tkinter.pyd" print "WARNING: Missing _tkinter.pyd"