[Python-checkins] r87348 - in python/branches/py3k: Misc/NEWS PCbuild/pyproject.vsprops PCbuild/readme.txt Tools/buildbot/external-common.bat

[martin.v.loewis]

Author: martin.v.loewis
Date: Fri Dec 17 22:04:09 2010
New Revision: 87348

Log:
Upgrade to sqlite3 3.7.4.

Modified:
   python/branches/py3k/Misc/NEWS
   python/branches/py3k/PCbuild/pyproject.vsprops
   python/branches/py3k/PCbuild/readme.txt
   python/branches/py3k/Tools/buildbot/external-common.bat

Modified: python/branches/py3k/Misc/NEWS
==============================================================================
--- python/branches/py3k/Misc/NEWS	(original)
+++ python/branches/py3k/Misc/NEWS	Fri Dec 17 22:04:09 2010
@@ -79,7 +79,7 @@
 Build
 -----
 
-- The Windows build now uses Tcl/Tk 8.5.9.
+- The Windows build now uses Tcl/Tk 8.5.9 and sqlite3 3.7.4.
 
 
 What's New in Python 3.2 Beta 1?

Modified: python/branches/py3k/PCbuild/pyproject.vsprops
==============================================================================
--- python/branches/py3k/PCbuild/pyproject.vsprops	(original)
+++ python/branches/py3k/PCbuild/pyproject.vsprops	Fri Dec 17 22:04:09 2010
@@ -50,7 +50,7 @@
 	/>
 	<UserMacro
 		Name="sqlite3Dir"
-		Value="$(externalsDir)\sqlite-3.6.21"
+		Value="$(externalsDir)\sqlite-3.7.4"
 	/>
 	<UserMacro
 		Name="bz2Dir"

Modified: python/branches/py3k/PCbuild/readme.txt
==============================================================================
--- python/branches/py3k/PCbuild/readme.txt	(original)
+++ python/branches/py3k/PCbuild/readme.txt	Fri Dec 17 22:04:09 2010
@@ -104,7 +104,7 @@
 
 Python-controlled subprojects that wrap external projects:
 _sqlite3
-    Wraps SQLite 3.6.21, which is currently built by sqlite3.vcproj (see below).
+    Wraps SQLite 3.7.4, 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

Modified: python/branches/py3k/Tools/buildbot/external-common.bat
==============================================================================
--- python/branches/py3k/Tools/buildbot/external-common.bat	(original)
+++ python/branches/py3k/Tools/buildbot/external-common.bat	Fri Dec 17 22:04:09 2010
@@ -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-1.0.0a rd /s/q openssl-1.0.0a
- at rem if exist sqlite-3.6.21 rd /s/q sqlite-3.6.21    
+ at rem if exist sqlite-3.7.4 rd /s/q sqlite-3.7.4    
 
 @rem bzip
 if not exist bzip2-1.0.5 (
@@ -37,7 +37,7 @@
 if not exist tk-8.5.9.0 svn export http://svn.python.org/projects/external/tk-8.5.9.0
 
 @rem sqlite3
-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.6.21
+if not exist sqlite-3.7.4 (
+  rd /s/q sqlite-source-3.6.21
+  svn export http://svn.python.org/projects/external/sqlite-3.7.4
 )