[Python-checkins] python/dist/src/PCbuild _bsddb.dsp,1.2,1.3 readme.txt,1.38,1.39 bsddb_patch.txt,1.1,NONE

tim_one@users.sourceforge.net tim_one@users.sourceforge.net
Fri, 24 Jan 2003 07:31:35 -0800


Update of /cvsroot/python/python/dist/src/PCbuild
In directory sc8-pr-cvs1:/tmp/cvs-serv21630/python/PCbuild

Modified Files:
	_bsddb.dsp readme.txt 
Removed Files:
	bsddb_patch.txt 
Log Message:
Bump the Windows build to use Sleepycat's 4.1.25.NC release (the
latest bsddb release without strong cryptography).


Index: _bsddb.dsp
===================================================================
RCS file: /cvsroot/python/python/dist/src/PCbuild/_bsddb.dsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** _bsddb.dsp	23 Nov 2002 18:48:06 -0000	1.2
--- _bsddb.dsp	24 Jan 2003 15:31:31 -0000	1.3
***************
*** 45,49 ****
  F90=df.exe
  # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
! # ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "..\Include" /I "..\PC" /I "..\..\db-4.0.14\build_win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c
  # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
  # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
--- 45,49 ----
  F90=df.exe
  # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
! # ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "..\Include" /I "..\PC" /I "..\..\db-4.1.25\build_win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c
  # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
  # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
***************
*** 55,59 ****
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
! # ADD LINK32 user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ..\..\db-4.0.14\build_win32\Release_static\libdb40s.lib /nologo /base:"0x1e180000" /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"msvcrt" /out:"./_bsddb.pyd"
  # SUBTRACT LINK32 /pdb:none
  
--- 55,59 ----
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
! # ADD LINK32 user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ..\..\db-4.1.25\build_win32\Release_static\libdb41s.lib /nologo /base:"0x1e180000" /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"msvcrt" /out:"./_bsddb.pyd"
  # SUBTRACT LINK32 /pdb:none
  
***************
*** 73,77 ****
  F90=df.exe
  # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
! # ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\Include" /I "..\PC" /I "..\..\db-4.0.14\build_win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c
  # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
  # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
--- 73,77 ----
  F90=df.exe
  # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
! # ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\Include" /I "..\PC" /I "..\..\db-4.1.25\build_win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c
  # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
  # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
***************
*** 83,87 ****
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
! # ADD LINK32 user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ..\..\db-4.0.14\build_win32\Release_static\libdb40s.lib /nologo /base:"0x1e180000" /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"msvcrtd" /out:"./_bsddb_d.pyd" /pdbtype:sept
  # SUBTRACT LINK32 /pdb:none
  
--- 83,87 ----
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
! # ADD LINK32 user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ..\..\db-4.1.25\build_win32\Release_static\libdb41s.lib /nologo /base:"0x1e180000" /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"msvcrtd" /out:"./_bsddb_d.pyd" /pdbtype:sept
  # SUBTRACT LINK32 /pdb:none
  

Index: readme.txt
===================================================================
RCS file: /cvsroot/python/python/dist/src/PCbuild/readme.txt,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** readme.txt	30 Dec 2002 00:40:40 -0000	1.38
--- readme.txt	24 Jan 2003 15:31:31 -0000	1.39
***************
*** 164,191 ****
  
  _bsddb
!     XXX The Sleepycat release we use will probably change before
!     XXX 2.3a1.
!     Go to Sleepycat's patches page:
!         http://www.sleepycat.com/update/index.html
!     and download
!         4.0.14.zip
!     from the download page.  The file name is db-4.0.14.zip.  Unpack into
!         dist\db-4.0.14
  
!     Apply the patch file bsddb_patch.txt in this (PCbuild) directory
!     against the file
!         dist\db-4.0.14\db\db_reclaim.c
  
!     Go to
!         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 We're actually linking against Release_static\libdb40s.lib.
      XXX This yields the following warnings:
  """
--- 164,188 ----
  
  _bsddb
!     Go to Sleepycat's download page:
!         http://www.sleepycat.com/download/
  
!     and download version 4.1.25.  The file name is db-4.1.25.NC.zip.
!     XXX with or without strong cryptography?  I picked "without".
  
!     Unpack into
!         dist\db-4.1.25
  
!     [If using WinZip to unpack the db-4.1.25.NC distro, that requires
!      renaming the directory (to remove ".NC") after unpacking.
!     ]
! 
!     Open
!         dist\db-4.1.25\docs\index.html
! 
!     and follow the Windows instructions for building the Sleepycat
!     software.  Note that Berkeley_DB.dsw is in the build_win32 subdirectory.
!     Build the Release version ("build_all -- Win32 Release").
! 
!     XXX We're actually linking against Release_static\libdb41s.lib.
      XXX This yields the following warnings:
  """
***************
*** 201,204 ****
--- 198,226 ----
  """
      XXX This isn't encouraging, but I don't know what to do about it.
+ 
+     To run extensive tests, pass "-u bsddb" to regrtest.py.  test_bsddb3.py
+     is then enabled.  Running in verbose mode may be helpful.
+ 
+     XXX The test_bsddb3 tests don't always pass, on Windows (according to
+     XXX me) or on Linux (according to Barry).  I had much better luck
+     XXX on Win2K than on Win98SE.  The common failure mode across platforms
+     XXX is
+     XXX     DBAgainError: (11, 'Resource temporarily unavailable -- unable
+     XXX                         to join the environment')
+     XXX
+     XXX and it appears timing-dependent.  On Win2K I also saw this once:
+     XXX
+     XXX test02_SimpleLocks (bsddb.test.test_thread.HashSimpleThreaded) ...
+     XXX Exception in thread reader 1:
+     XXX Traceback (most recent call last):
+     XXX File "C:\Code\python\lib\threading.py", line 411, in __bootstrap
+     XXX    self.run()
+     XXX File "C:\Code\python\lib\threading.py", line 399, in run
+     XXX    apply(self.__target, self.__args, self.__kwargs)
+     XXX File "C:\Code\python\lib\bsddb\test\test_thread.py", line 268, in
+     XXX                  readerThread
+     XXX    rec = c.next()
+     XXX DBLockDeadlockError: (-30996, 'DB_LOCK_DEADLOCK: Locker killed
+     XXX                                to resolve a deadlock')
  
  

--- bsddb_patch.txt DELETED ---