[Python-checkins] r77226 - in python/trunk: Misc/NEWS PCbuild/pyproject.vsprops PCbuild/readme.txt PCbuild/vs9to8.py Tools/buildbot/external-common.bat

martin.v.loewis python-checkins at python.org
Sat Jan 2 10:25:22 CET 2010


Author: martin.v.loewis
Date: Sat Jan  2 10:25:21 2010
New Revision: 77226

Log:
Update Windows build to sqlite 3.6.21.


Modified:
   python/trunk/Misc/NEWS
   python/trunk/PCbuild/pyproject.vsprops
   python/trunk/PCbuild/readme.txt
   python/trunk/PCbuild/vs9to8.py
   python/trunk/Tools/buildbot/external-common.bat

Modified: python/trunk/Misc/NEWS
==============================================================================
--- python/trunk/Misc/NEWS	(original)
+++ python/trunk/Misc/NEWS	Sat Jan  2 10:25:21 2010
@@ -121,7 +121,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 #7541: when using ``python-config`` with a framework install the compiler might
   use the wrong library.

Modified: python/trunk/PCbuild/pyproject.vsprops
==============================================================================
--- python/trunk/PCbuild/pyproject.vsprops	(original)
+++ python/trunk/PCbuild/pyproject.vsprops	Sat Jan  2 10:25:21 2010
@@ -74,7 +74,7 @@
 	/>
 	<UserMacro
 		Name="sqlite3Dir"
-		Value="$(externalsDir)\sqlite-3.5.9"
+		Value="$(externalsDir)\sqlite-3.6.21"
 	/>
 	<UserMacro
 		Name="bz2Dir"

Modified: python/trunk/PCbuild/readme.txt
==============================================================================
--- python/trunk/PCbuild/readme.txt	(original)
+++ python/trunk/PCbuild/readme.txt	Sat Jan  2 10:25:21 2010
@@ -107,7 +107,7 @@
     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

Modified: python/trunk/PCbuild/vs9to8.py
==============================================================================
--- python/trunk/PCbuild/vs9to8.py	(original)
+++ python/trunk/PCbuild/vs9to8.py	Sat Jan  2 10:25:21 2010
@@ -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')
             lines = lines.replace('$(bsddbDir)\\..\\..', '..\\..\\..\\db-4.7.25.0\\build_windows\\..')
             lines = lines.replace('$(bsddbDir)', '..\\..\\..\\db-4.7.25.0\\build_windows')
 

Modified: python/trunk/Tools/buildbot/external-common.bat
==============================================================================
--- python/trunk/Tools/buildbot/external-common.bat	(original)
+++ python/trunk/Tools/buildbot/external-common.bat	Sat Jan  2 10:25:21 2010
@@ -16,7 +16,7 @@
 @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
- at rem if exist sqlite-3.5.9 rd /s/q sqlite-3.5.9    
+ at 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 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
 )


More information about the Python-checkins mailing list