summaryrefslogtreecommitdiffstats
path: root/Tools
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2008-06-13 18:58:47 (GMT)
committerMartin v. Löwis <martin@v.loewis.de>2008-06-13 18:58:47 (GMT)
commitc9798fc7094c8ddcd73cc73870bbe0a1d4b5b1b1 (patch)
tree3080d313090cc4c11f98f639e4ac570c15afd492 /Tools
parentcac8f585b12e2598783b7c570108eaa8d2262c4c (diff)
downloadcpython-c9798fc7094c8ddcd73cc73870bbe0a1d4b5b1b1.zip
cpython-c9798fc7094c8ddcd73cc73870bbe0a1d4b5b1b1.tar.gz
cpython-c9798fc7094c8ddcd73cc73870bbe0a1d4b5b1b1.tar.bz2
Pickup sqlite3.dll from binary directory.
Commit more often.
Diffstat (limited to 'Tools')
-rw-r--r--Tools/msi/msi.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py
index 2fc55e8..ba311bc 100644
--- a/Tools/msi/msi.py
+++ b/Tools/msi/msi.py
@@ -24,8 +24,6 @@ srcdir = os.path.abspath("../..")
full_current_version = None
# Is Tcl available at all?
have_tcl = True
-# Where is sqlite3.dll located, relative to srcdir?
-sqlite_dir = "../sqlite-source-3.3.4"
# path to PCbuild directory
PCBUILD="PCbuild"
# msvcrt version
@@ -939,6 +937,8 @@ def add_files(db):
dirs={}
pydirs = [(root,"Lib")]
while pydirs:
+ # Commit every now and then, or else installer will complain
+ db.Commit()
parent, dir = pydirs.pop()
if dir == ".svn" or dir.startswith("plat-"):
continue
@@ -1041,7 +1041,7 @@ def add_files(db):
else:
sqlite_arch = ""
tclsuffix = ""
- lib.add_file(srcdir+"/"+sqlite_dir+sqlite_arch+"/sqlite3.dll")
+ lib.add_file("sqlite3.dll")
if have_tcl:
if not os.path.exists("%s/%s/_tkinter.pyd" % (srcdir, PCBUILD)):
print "WARNING: Missing _tkinter.pyd"