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 a751676617eee70a6004cb948db87d19b28e3cc6..d564c50fc28a1e06d3773d9c2ef2946b3744bd82 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -536,7 +536,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 #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 b475e7abe8002e569dc6e36fbb44ea5bda605b48..1b96e350bd31e8980a8b633fa244ed0838dca323 100644 (file)
--- 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 67714c0f41d858f3cf0d84fe7ffd2e8efd5ccd19..8742b464efca784c39cd6685d4fd2f1772f4618b 100644 (file)
--- a/PCbuild/readme.txt
+++ b/PCbuild/readme.txt
@@ -104,7 +104,7 @@ winsound
 
 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 bab3b6e13bf02d08f53d49bd44e5cac4ae772f5e..3b88a16c27c58342119c6d676c1723cdf65d3c48 100644 (file)
--- 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')
 
         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 aba7fa9e6ad553e053b8cebea89599ab1b1824c0..25ca56b1dd33df9d93d766741ffb04bb849d1085 100644 (file)
--- a/Tools/buildbot/external-common.bat
+++ b/Tools/buildbot/external-common.bat
@@ -15,7 +15,7 @@ cd ..
 @rem if exist tk-8.4.18.1 rd /s/q tk-8.4.18.1\r
 @rem if exist db-4.4.20 rd /s/q db-4.4.20\r
 @rem if exist openssl-0.9.8l rd /s/q openssl-0.9.8l\r
-@rem if exist sqlite-3.5.9 rd /s/q sqlite-3.5.9    \r
+@rem if exist sqlite-3.6.21 rd /s/q sqlite-3.6.21    \r
 \r
 @rem bzip\r
 if not exist bzip2-1.0.5 (\r
@@ -37,7 +37,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\r
 \r
 @rem sqlite3\r
-if not exist sqlite-3.5.9 (\r
+if not exist sqlite-3.6.21 (\r
   rd /s/q sqlite-source-3.3.4\r
-  svn export http://svn.python.org/projects/external/sqlite-3.5.9\r
+  svn export http://svn.python.org/projects/external/sqlite-3.6.21\r
 )\r