traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
........
This commit is contained in:
Martin v. Löwis 2008-06-13 19:00:35 +00:00
parent 2061155dc6
commit 94b8b82b30
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Tools/msi/msi.py
View File

@ -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")