Merged revisions 77226 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r77226 | martin.v.loewis | 2010-01-02 10:25:21 +0100 (Sa, 02 Jan 2010) | 2 lines
Update Windows build to sqlite 3.6.21.
........
diff --git a/Misc/NEWS b/Misc/NEWS
index a751676..d564c50 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -536,7 +536,7 @@
- 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 #5792: Extend the short float repr support to x86 systems using
icc or suncc.
diff --git a/PCbuild/pyproject.vsprops b/PCbuild/pyproject.vsprops
index b475e7a..1b96e35 100644
--- a/PCbuild/pyproject.vsprops
+++ b/PCbuild/pyproject.vsprops
@@ -50,7 +50,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 67714c0..8742b46 100644
--- a/PCbuild/readme.txt
+++ b/PCbuild/readme.txt
@@ -104,7 +104,7 @@
Python-controlled subprojects that wrap external projects:
_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 _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 bab3b6e..3b88a16 100644
--- a/PCbuild/vs9to8.py
+++ b/PCbuild/vs9to8.py
@@ -24,7 +24,7 @@
# 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')
with open(destname, 'wb') as fout:
lines = lines.replace("\n", "\r\n").encode()
diff --git a/Tools/buildbot/external-common.bat b/Tools/buildbot/external-common.bat
index aba7fa9..25ca56b 100644
--- a/Tools/buildbot/external-common.bat
+++ b/Tools/buildbot/external-common.bat
@@ -15,7 +15,7 @@
@rem if exist tk-8.4.18.1 rd /s/q tk-8.4.18.1
@rem if exist db-4.4.20 rd /s/q db-4.4.20
@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 (
@@ -37,7 +37,7 @@
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
)