More bsddb-on-Windows fiddling:
+ News blurb, but as much XXX as news.
+ Updated installer (install the new bsddb package, and the Berkeley DLL;
still don't know how to fold that into _bsddb.pyd).
+ Fleshed out build instructions.
+ Debug Python still blows up.
diff --git a/Misc/NEWS b/Misc/NEWS
index 5ee4a92..b248970 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -807,6 +807,14 @@
Windows
-------
+- The Windows distribution now ships with version 4.0.14 of the
+ Sleepycat Berkeley database library. This should be a huge
+ improvement over the previous Berkeley DB 1.85, which had many
+ bugs.
+ XXX What are the licensing issues here?
+ XXX The debug Python still blows up (see PCbuild/readme.txt).
+ XXX The version # is likely to change before 2.3a1.
+
- The Windows distribution now ships with Tcl/Tk version 8.4.1 (it
previously shipped with Tcl/Tk 8.3.2).
diff --git a/PCbuild/python20.wse b/PCbuild/python20.wse
index bfc1e30..7b63d6e 100644
--- a/PCbuild/python20.wse
+++ b/PCbuild/python20.wse
@@ -1725,8 +1725,8 @@
Flags=0000000000000010
end
item: Install File
- Source=.\bsddb.pyd
- Destination=%MAINDIR%\DLLs\bsddb.pyd
+ Source=.\_bsddb.pyd
+ Destination=%MAINDIR%\DLLs\_bsddb.pyd
Flags=0000000000000010
end
item: Install File
@@ -1807,8 +1807,8 @@
Flags=0000000000000010
end
item: Install File
- Source=.\bsddb.lib
- Destination=%MAINDIR%\libs\bsddb.lib
+ Source=.\_bsddb.lib
+ Destination=%MAINDIR%\libs\_bsddb.lib
Flags=0000000000000010
end
item: Install File
@@ -1853,6 +1853,17 @@
end
item: Remark
end
+item: Remark
+ Text=Oddball -- the Sleepcat DLL
+end
+item: Install File
+ Source=..\..\db-4.0.14\build_win32\Release\libdb40.dll
+ Destination=%MAINDIR%\DLLs\libdb40.dll
+ Description=Sleepycat Berekely DB DLL
+ Flags=0000000000000010
+end
+item: Remark
+end
item: Install File
Source=.\python%_pymajor_%%_pyminor_%.lib
Destination=%MAINDIR%\libs\python%_PYMAJOR_%%_PYMINOR_%.lib
@@ -1891,6 +1902,14 @@
item: Remark
end
item: Install File
+ Source=..\lib\bsddb\*.py
+ Destination=%MAINDIR%\Lib\bsddb
+ Description=Berkeley database package
+ Flags=0000000100000010
+end
+item: Remark
+end
+item: Install File
Source=..\lib\compiler\*.py
Destination=%MAINDIR%\Lib\compiler
Description=Python compiler written in Python
diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt
index 8771f03..7f8e138 100644
--- a/PCbuild/readme.txt
+++ b/PCbuild/readme.txt
@@ -176,6 +176,11 @@
http://www.sleepycat.com/docs/ref/build_win/intro.html
and follow the instructions for building the Sleepycat software.
Build the Release version.
+ NOTE: The instructions are for a later release of the software,
+ so use your imagination. Berkeley_DB.dsw in this release was
+ also pre-MSVC6, so you'll be prompted to upgrade the format (say
+ yes, of course). Choose configuration "db_buildall - Win32 Release",
+ and build db_buildall.exe.
XXX You have to copy
XXX dist\db-4.0.14\build_win32\Release\libdb40.dll
@@ -188,8 +193,6 @@
XXX bsddb 1.85 project apparently managed to do, link the Berkeley
XXX DLL into the guts of our _bsddb.pyd. I don't know how to.
- XXX The installer needs to be changed accordingly.
-
XXX The Sleepycat release we use will probably change before
XXX 2.3a1.