Merged revisions 64246 via svnmerge from

loewis · loewis · commit 94b8b82b3059 · 2008-06-13T19:00:35.000Z
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r64246 | martin.v.loewis | 2008-06-13 20:58:47 +0200 (Fr, 13 Jun 2008) | 2 lines

  Pickup sqlite3.dll from binary directory.
  Commit more often.
........
diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py
@@ -24,8 +24,6 @@
 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
@@ -940,6 +938,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
@@ -1042,7 +1042,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")
