diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2006-07-06 06:55:58 +0000 |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2006-07-06 06:55:58 +0000 |
| commit | 6db928a51c9db3157e1f39b9a735b8f232c16374 (patch) | |
| tree | 343a9a2d8690341fde1f952fc414afdc13f52b03 /Tools | |
| parent | 48aed82e0b014bbfc205a2d557025f93dc44b85f (diff) | |
| download | cpython-6db928a51c9db3157e1f39b9a735b8f232c16374.tar.gz | |
Add sqlite3.dll to the DLLs component, not to the TkDLLs component.
Fixes #1517388.
Diffstat (limited to 'Tools')
| -rw-r--r-- | Tools/msi/msi.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py index 2576380519..c65c6bc2bb 100644 --- a/Tools/msi/msi.py +++ b/Tools/msi/msi.py @@ -962,6 +962,14 @@ def add_files(db): continue dlls.append(f) lib.add_file(f) + # Add sqlite + if msilib.msi_type=="Intel64;1033": + sqlite_arch = "/ia64" + elif msilib.msi_type=="x64;1033": + sqlite_arch = "/amd64" + else: + sqlite_arch = "" + lib.add_file(srcdir+"/"+sqlite_dir+sqlite_arch+"/sqlite3.dll") if have_tcl: if not os.path.exists(srcdir+"/PCBuild/_tkinter.pyd"): print "WARNING: Missing _tkinter.pyd" @@ -972,14 +980,6 @@ def add_files(db): tcldir = os.path.normpath(srcdir+"/../tcltk/bin") for f in glob.glob1(tcldir, "*.dll"): lib.add_file(f, src=os.path.join(tcldir, f)) - # Add sqlite - if msilib.msi_type=="Intel64;1033": - sqlite_arch = "/ia64" - elif msilib.msi_type=="x64;1033": - sqlite_arch = "/amd64" - else: - sqlite_arch = "" - lib.add_file(srcdir+"/"+sqlite_dir+sqlite_arch+"/sqlite3.dll") # check whether there are any unknown extensions for f in glob.glob1(srcdir+"/PCBuild", "*.pyd"): if f.endswith("_d.pyd"): continue # debug version |