From 94b8b82b3059b983f8a276876f12eb2da50e0f84 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Fri, 13 Jun 2008 19:00:35 +0000
Subject: [PATCH] Merged revisions 64246 via svnmerge from
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.
........
---
Tools/msi/msi.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py
index 174a334d1d..a4f87edef5 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
@@ -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")
--
2.49.0