From: Martin v. Löwis <martin@v.loewis.de>
Date: Fri, 13 Jun 2008 18:58:47 +0000 (+0000)
Subject: Pickup sqlite3.dll from binary directory.
X-Git-Tag: v2.6b1~41
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c9798fc7094c8ddcd73cc73870bbe0a1d4b5b1b1;p=python

Pickup sqlite3.dll from binary directory.
Commit more often.
---

diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py
index 2fc55e8853..ba311bcc13 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"