From: Martin v. Löwis <martin@v.loewis.de>
Date: Thu, 6 Jul 2006 06:55:58 +0000 (+0000)
Subject: Add sqlite3.dll to the DLLs component, not to the TkDLLs component.
X-Git-Tag: v2.5b2~49
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=88ef6377773b9bafdec0c7d85d3eefccf8209c61;p=python

Add sqlite3.dll to the DLLs component, not to the TkDLLs component.
Fixes #1517388.
---

diff --git a/Misc/NEWS b/Misc/NEWS
index 261981ddd4..3de28233e4 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -89,6 +89,9 @@ Extension Modules
 Build
 -----
 
+- Bug #1517388: sqlite3.dll is now installed on Windows independent
+  of Tcl/Tk.
+
 - Bug #1513032: 'make install' failed on FreeBSD 5.3 due to lib-old
   trying to be installed even though it's empty.
 
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