[Python-checkins] r64246 - python/trunk/Tools/msi/msi.py
martin.v.loewis
python-checkins at python.org
Fri Jun 13 20:58:48 CEST 2008
Author: martin.v.loewis
Date: Fri Jun 13 20:58:47 2008
New Revision: 64246
Log:
Pickup sqlite3.dll from binary directory.
Commit more often.
Modified:
python/trunk/Tools/msi/msi.py
Modified: python/trunk/Tools/msi/msi.py
==============================================================================
--- python/trunk/Tools/msi/msi.py (original)
+++ python/trunk/Tools/msi/msi.py Fri Jun 13 20:58:47 2008
@@ -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
@@ -939,6 +937,8 @@
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 @@
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"
More information about the Python-checkins
mailing list