summaryrefslogtreecommitdiffstats
path: root/Tools
diff options
context:
space:
mode:
authorTrent Nelson <trent.nelson@snakebite.org>2008-06-27 02:30:34 (GMT)
committerTrent Nelson <trent.nelson@snakebite.org>2008-06-27 02:30:34 (GMT)
commit6e7e137cff5853ef0b2258b99df852e1ce098965 (patch)
treef3e01471b8d8acdc6b684c476ae888f9af635eb3 /Tools
parentd4a224bd800d9eb5ad68fdfce2193b3ab1c4b4ef (diff)
downloadcpython-6e7e137cff5853ef0b2258b99df852e1ce098965.zip
cpython-6e7e137cff5853ef0b2258b99df852e1ce098965.tar.gz
cpython-6e7e137cff5853ef0b2258b99df852e1ce098965.tar.bz2
Merged revisions 64368-64369 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/tnelson-trunk-bsddb-47-upgrade ........ r64368 | trent.nelson | 2008-06-17 23:13:44 -0500 (Tue, 17 Jun 2008) | 1 line Initial commit of work pertaining to switching the Windows build from Berkeley DB 4.4.20 to 4.7.25. Note that I've deprecated the standalone '_bsddb44.vcproj' in lieu of adding the sources in a separate folder to the _bsddb project. This was a conscious decision and actually makes everything far more easier to manage. With this approach, entire test suite passed straight off the bat. Well, almost -- the timeout in bsddb/test/test_replication.py needed bumping up a little -- 2 seconds was too short. 10 seconds seems to be fine for me, but I'll make sure Jesus verifies. More documentation to come once I've been able to test out this approach on the buildbots (hence keeping the changes in a separate branch for now). ........ r64369 | trent.nelson | 2008-06-17 23:19:12 -0500 (Tue, 17 Jun 2008) | 1 line Bump Berkeley DB version from 4.4.20 to 4.7.25. ........
Diffstat (limited to 'Tools')
-rw-r--r--Tools/buildbot/external-common.bat6
1 files changed, 4 insertions, 2 deletions
diff --git a/Tools/buildbot/external-common.bat b/Tools/buildbot/external-common.bat
index edcc82d..f252cc5 100644
--- a/Tools/buildbot/external-common.bat
+++ b/Tools/buildbot/external-common.bat
@@ -14,6 +14,7 @@ cd ..
@rem if exist tk8.4.16 rd /s/q tk8.4.16
@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 db-4.7.25.0 rd /s/q db-4.7.25.0
@rem if exist openssl-0.9.8g rd /s/q openssl-0.9.8g
@rem if exist sqlite-3.5.9 rd /s/q sqlite-3.5.9
@@ -23,8 +24,9 @@ if not exist bzip2-1.0.5 (
svn export http://svn.python.org/projects/external/bzip2-1.0.5
)
-@rem Sleepycat db
-if not exist db-4.4.20 svn export http://svn.python.org/projects/external/db-4.4.20-vs9 db-4.4.20
+@rem Berkeley DB
+if exist db-4.4.20 rd /s/q db-4.4.20
+if not exist db-4.7.25.0 svn export http://svn.python.org/projects/external/db-4.7.25.0
@rem OpenSSL
if not exist openssl-0.9.8g svn export http://svn.python.org/projects/external/openssl-0.9.8g