diff options
| author | Trent Nelson <trent.nelson@snakebite.org> | 2008-06-27 02:30:34 (GMT) |
|---|---|---|
| committer | Trent Nelson <trent.nelson@snakebite.org> | 2008-06-27 02:30:34 (GMT) |
| commit | 6e7e137cff5853ef0b2258b99df852e1ce098965 (patch) | |
| tree | f3e01471b8d8acdc6b684c476ae888f9af635eb3 /PCbuild/pyproject.vsprops | |
| parent | d4a224bd800d9eb5ad68fdfce2193b3ab1c4b4ef (diff) | |
| download | cpython-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 'PCbuild/pyproject.vsprops')
| -rw-r--r-- | PCbuild/pyproject.vsprops | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/PCbuild/pyproject.vsprops b/PCbuild/pyproject.vsprops index 4a9f8ec..fb313d2 100644 --- a/PCbuild/pyproject.vsprops +++ b/PCbuild/pyproject.vsprops @@ -50,11 +50,11 @@ /> <UserMacro Name="bsddbDir" - Value="$(bsddb44Dir)" + Value="$(bsddb47Dir)" /> <UserMacro Name="bsddbDepLibs" - Value="$(bsddb44DepLibs)" + Value="$(bsddb47DepLibs)" /> <UserMacro Name="bsddb44Dir" @@ -65,11 +65,11 @@ Value="" /> <UserMacro - Name="bsddb45Dir" - Value="$(externalsDir)\db-4.5.20.x\build_windows" + Name="bsddb47Dir" + Value="$(externalsDir)\db-4.7.25.0\build_windows" /> <UserMacro - Name="bsddb45DepLibs" + Name="bsddb47DepLibs" Value="ws2_32.lib" /> <UserMacro |