diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2006-04-04 07:10:59 (GMT) |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2006-04-04 07:10:59 (GMT) |
| commit | 1a494bdf694a9f495021b0e00563c7519754c011 (patch) | |
| tree | 15294770d644d8b7be26c96ccefb3cac0aebc390 /Tools | |
| parent | c95dd9488a7ebd5354dad2061e6b9cb608eb82f8 (diff) | |
| download | cpython-1a494bdf694a9f495021b0e00563c7519754c011.zip cpython-1a494bdf694a9f495021b0e00563c7519754c011.tar.gz cpython-1a494bdf694a9f495021b0e00563c7519754c011.tar.bz2 | |
Add sqlite3 to the Windows build process.
Diffstat (limited to 'Tools')
| -rw-r--r-- | Tools/buildbot/external.bat | 4 | ||||
| -rw-r--r-- | Tools/msi/msi.py | 7 |
2 files changed, 10 insertions, 1 deletions
diff --git a/Tools/buildbot/external.bat b/Tools/buildbot/external.bat index 1195072..918d759 100644 --- a/Tools/buildbot/external.bat +++ b/Tools/buildbot/external.bat @@ -29,3 +29,7 @@ if not exist tcl8.4.12 ( nmake -f makefile.vc TCLDIR=..\..\tcl8.4.12
nmake -f makefile.vc TCLDIR=..\..\tcl8.4.12 INSTALLDIR=..\..\tcltk install
)
+
+@rem sqlite
+if not exist sqlite-source-3.3.4 svn export http://svn.python.org/projects/external/sqlite-source-3.3.4
+if not exist build/Python/PCbuild/sqlite3.dll copy sqlite-source-3.3.4/sqlite3.dll build/Python/PCbuild
diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py index 74a364b..0b8fbc3 100644 --- a/Tools/msi/msi.py +++ b/Tools/msi/msi.py @@ -24,6 +24,8 @@ 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" try: from config import * @@ -86,7 +88,8 @@ extensions = [ '_tkinter.pyd', '_msi.pyd', '_ctypes.pyd', - '_ctypes_test.pyd' + '_ctypes_test.pyd', + '_sqlite3.pyd' ] # Well-known component UUIDs @@ -963,6 +966,8 @@ 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 + lib.add_file(srcdir+"/"+sqlite_dir+"/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 |