[Python-checkins] python/dist/src/PCbuild _bsddb.dsp,1.1,1.2 pcbuild.dsw,1.28,1.29 python20.wse,1.107,1.108 readme.txt,1.30,1.31
tim_one@users.sourceforge.net
tim_one@users.sourceforge.net
Sat, 23 Nov 2002 10:48:09 -0800
Update of /cvsroot/python/python/dist/src/PCbuild
In directory sc8-pr-cvs1:/tmp/cvs-serv887/python/PCbuild
Modified Files:
_bsddb.dsp pcbuild.dsw python20.wse readme.txt
Log Message:
Try linking the static Sleepycat lib into _bsddb.pyd. Hard to say
whether this is a correct thing to do:
+ There are linker warnings (see PCbuild\readme.txt).
+ test_bsddb passes, in both release and debug builds now.
+ test_bsddb3 has several failures, but it did before too.
Also made pythoncore a dependency of the _bsddb project, updated
build instructions, added database conversion XXX to NEWS, and fiddled
the Windows installer accordingly.
Index: _bsddb.dsp
===================================================================
RCS file: /cvsroot/python/python/dist/src/PCbuild/_bsddb.dsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** _bsddb.dsp 22 Nov 2002 20:00:33 -0000 1.1
--- _bsddb.dsp 23 Nov 2002 18:48:06 -0000 1.2
***************
*** 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\libdb40.lib /nologo /base:"0x1e180000" /subsystem:windows /dll /debug /machine:I386 /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.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
***************
*** 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\libdb40.lib /nologo /base:"0x1e180000" /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"MSVCRT" /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.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
Index: pcbuild.dsw
===================================================================
RCS file: /cvsroot/python/python/dist/src/PCbuild/pcbuild.dsw,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** pcbuild.dsw 22 Nov 2002 20:00:34 -0000 1.28
--- pcbuild.dsw 23 Nov 2002 18:48:06 -0000 1.29
***************
*** 12,15 ****
--- 12,18 ----
Package=<4>
{{{
+ Begin Project Dependency
+ Project_Dep_Name pythoncore
+ End Project Dependency
}}}
Index: python20.wse
===================================================================
RCS file: /cvsroot/python/python/dist/src/PCbuild/python20.wse,v
retrieving revision 1.107
retrieving revision 1.108
diff -C2 -d -r1.107 -r1.108
*** python20.wse 23 Nov 2002 03:49:08 -0000 1.107
--- python20.wse 23 Nov 2002 18:48:06 -0000 1.108
***************
*** 1854,1868 ****
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
--- 1854,1857 ----
Index: readme.txt
===================================================================
RCS file: /cvsroot/python/python/dist/src/PCbuild/readme.txt,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** readme.txt 23 Nov 2002 03:49:08 -0000 1.30
--- readme.txt 23 Nov 2002 18:48:06 -0000 1.31
***************
*** 162,165 ****
--- 162,167 ----
_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
***************
*** 183,199 ****
and build db_buildall.exe.
! XXX You have to copy
! XXX dist\db-4.0.14\build_win32\Release\libdb40.dll
! XXX into PCbuild (or elsewhere on your path) before the tests
! XXX will run.
!
! XXX A debug-mode build blows up when running this, presumably because
! XXX I'm mixing debug-mode MS stuff with Sleepycat's release-mode
! XXX DLL. This gives me a headache. I would *like* to, as the old
! 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 Sleepycat release we use will probably change before
- XXX 2.3a1.
--- 185,203 ----
and build db_buildall.exe.
! XXX We're actually linking against Release_static\libdb40s.lib.
! XXX This yields the following warnings:
! """
! Compiling...
! _bsddb.c
! Linking...
! Creating library ./_bsddb.lib and object ./_bsddb.exp
! LINK : warning LNK4049: locally defined symbol "_malloc" imported
! LINK : warning LNK4049: locally defined symbol "_free" imported
! LINK : warning LNK4049: locally defined symbol "_fclose" imported
! LINK : warning LNK4049: locally defined symbol "_fopen" imported
! _bsddb.pyd - 0 error(s), 4 warning(s)
! """
! XXX This isn't encouraging, but I don't know what to do about it.