diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2010-01-02 09:25:21 (GMT) |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2010-01-02 09:25:21 (GMT) |
| commit | f477b93d9d7719c20076bccf516b957c4efd9b22 (patch) | |
| tree | cbdfb94b7292b0446069775267d6f3f88eb7e736 | |
| parent | 1a635e4663ae0cafd07a5819a390f088526cca57 (diff) | |
| download | cpython-f477b93d9d7719c20076bccf516b957c4efd9b22.zip cpython-f477b93d9d7719c20076bccf516b957c4efd9b22.tar.gz cpython-f477b93d9d7719c20076bccf516b957c4efd9b22.tar.bz2 | |
Update Windows build to sqlite 3.6.21.
| -rw-r--r-- | Misc/NEWS | 2 | ||||
| -rw-r--r-- | PCbuild/pyproject.vsprops | 2 | ||||
| -rw-r--r-- | PCbuild/readme.txt | 2 | ||||
| -rw-r--r-- | PCbuild/vs9to8.py | 2 | ||||
| -rw-r--r-- | Tools/buildbot/external-common.bat | 6 |
5 files changed, 7 insertions, 7 deletions
@@ -121,7 +121,7 @@ Build - Issue #7589: Only build the nis module when the correct header files are found. -- Switch to OpenSSL 0.9.8l on Windows. +- Switch to OpenSSL 0.9.8l and sqlite 3.6.21 on Windows. - Issue #7541: when using ``python-config`` with a framework install the compiler might use the wrong library. diff --git a/PCbuild/pyproject.vsprops b/PCbuild/pyproject.vsprops index 1c69a7d..3039885 100644 --- a/PCbuild/pyproject.vsprops +++ b/PCbuild/pyproject.vsprops @@ -74,7 +74,7 @@ /> <UserMacro Name="sqlite3Dir" - Value="$(externalsDir)\sqlite-3.5.9" + Value="$(externalsDir)\sqlite-3.6.21" /> <UserMacro Name="bz2Dir" diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt index 44b7b8f..0386b45 100644 --- a/PCbuild/readme.txt +++ b/PCbuild/readme.txt @@ -107,7 +107,7 @@ _bsddb Wraps Berkeley DB 4.7.25, which is currently built by _bsddb.vcproj. project (see below). _sqlite3 - Wraps SQLite 3.5.9, which is currently built by sqlite3.vcproj (see below). + Wraps SQLite 3.6.21, which is currently built by sqlite3.vcproj (see below). _tkinter Wraps the Tk windowing system. Unlike _bsddb and _sqlite3, there's no corresponding tcltk.vcproj-type project that builds Tcl/Tk from vcproj's diff --git a/PCbuild/vs9to8.py b/PCbuild/vs9to8.py index 2dfbd5d..a4e6801 100644 --- a/PCbuild/vs9to8.py +++ b/PCbuild/vs9to8.py @@ -24,7 +24,7 @@ def vs9to8(src, dest): # Bah. VS8.0 does not expand macros in file names. # Replace them here. - lines = lines.replace('$(sqlite3Dir)', '..\\..\\..\\sqlite-3.5.9') + lines = lines.replace('$(sqlite3Dir)', '..\\..\\..\\sqlite-3.6.21') lines = lines.replace('$(bsddbDir)\\..\\..', '..\\..\\..\\db-4.7.25.0\\build_windows\\..') lines = lines.replace('$(bsddbDir)', '..\\..\\..\\db-4.7.25.0\\build_windows') diff --git a/Tools/buildbot/external-common.bat b/Tools/buildbot/external-common.bat index 839a4cd..7395db5 100644 --- a/Tools/buildbot/external-common.bat +++ b/Tools/buildbot/external-common.bat @@ -16,7 +16,7 @@ cd .. @rem if exist db-4.4.20 rd /s/q db-4.4.20
@rem if exist db-4.7.25.0 rd /s/q db-4.7.25.0
@rem if exist openssl-0.9.8l rd /s/q openssl-0.9.8l
-@rem if exist sqlite-3.5.9 rd /s/q sqlite-3.5.9
+@rem if exist sqlite-3.6.21 rd /s/q sqlite-3.6.21
@rem bzip
if not exist bzip2-1.0.5 (
@@ -39,7 +39,7 @@ if not exist tcl-8.5.2.1 ( if not exist tk-8.5.2.0 svn export http://svn.python.org/projects/external/tk-8.5.2.0
@rem sqlite3
-if not exist sqlite-3.5.9 (
+if not exist sqlite-3.6.21 (
rd /s/q sqlite-source-3.3.4
- svn export http://svn.python.org/projects/external/sqlite-3.5.9
+ svn export http://svn.python.org/projects/external/sqlite-3.6.21
)
|