Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Update to bsddb 4.4.20.

This commit is contained in:
Martin v. Löwis 2006-03-13 13:48:05 +00:00
parent eadee9a744
commit f6f7925971
3 changed files with 39 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
PCbuild/_bsddb.vcproj
View File

@ -20,7 +20,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\Include;..\PC;&quot;..\..\db-4.2.52\build_win32&quot;"
AdditionalIncludeDirectories="..\Include;..\PC;&quot;..\..\db-4.4.20\build_win32&quot;"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
RuntimeLibrary="3"
UsePrecompiledHeader="2"
@ -32,11 +32,11 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="..\..\db-4.2.52\build_win32\Debug_static\libdb42sd.lib"
AdditionalDependencies="..\..\db-4.4.20\build_win32\Debug\libdb44sd.lib"
OutputFile="./_bsddb_d.pyd"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
IgnoreDefaultLibraryNames="msvcrtd"
IgnoreDefaultLibraryNames=""
GenerateDebugInformation="TRUE"
ProgramDatabaseFile=".\./_bsddb_d.pdb"
SubSystem="2"
@ -75,7 +75,7 @@
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\Include;..\PC;&quot;..\..\db-4.2.52\build_win32&quot;"
AdditionalIncludeDirectories="..\Include;..\PC;&quot;..\..\db-4.4.20\build_win32&quot;"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
StringPooling="TRUE"
RuntimeLibrary="2"
@ -89,11 +89,11 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="..\..\db-4.2.52\build_win32\Release_static\libdb42s.lib"
AdditionalDependencies="..\..\db-4.4.20\build_win32\Release\libdb44s.lib"
OutputFile="./_bsddb.pyd"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
IgnoreDefaultLibraryNames="msvcrt"
IgnoreDefaultLibraryNames=""
GenerateDebugInformation="TRUE"
ProgramDatabaseFile=".\./_bsddb.pdb"
SubSystem="2"
@ -133,7 +133,7 @@
AdditionalOptions=" /USECL:MS_ITANIUM"
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="{MSSDKPATH}\include\Win64\atl;{MSSDKPATH}\include\Win64\crt;{MSSDKPATH}\include\Win64\crt\sys;{MSSDKPATH}\include\Win64\mfc;..\Include;..\PC;&quot;..\..\db-4.2.52\build_win32&quot;"
AdditionalIncludeDirectories="{MSSDKPATH}\include\Win64\atl;{MSSDKPATH}\include\Win64\crt;{MSSDKPATH}\include\Win64\crt\sys;{MSSDKPATH}\include\Win64\mfc;..\Include;..\PC;&quot;..\..\db-4.4.20\build_win32&quot;"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
StringPooling="TRUE"
BasicRuntimeChecks="0"
@ -151,11 +151,11 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions=" /MACHINE:IA64 /USELINK:MS_SDK"
AdditionalDependencies="..\..\db-4.2.52\build_win32\Release_static\libdb42s.lib"
AdditionalDependencies="..\..\db-4.4.20\build_win32\Release\libdb44s.lib"
OutputFile="./_bsddb.pyd"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
IgnoreDefaultLibraryNames="msvcrt"
IgnoreDefaultLibraryNames=""
GenerateDebugInformation="TRUE"
ProgramDatabaseFile=".\./_bsddb.pdb"
SubSystem="2"
@ -195,7 +195,7 @@
AdditionalOptions=" /USECL:MS_OPTERON"
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="{MSSDKPATH}\include\Win64\atl\amd64;{MSSDKPATH}\include\Win64\crt\amd64;{MSSDKPATH}\include\Win64\crt\amd64\sys;{MSSDKPATH}\include\Win64\mfc\amd64;..\Include;..\PC;&quot;..\..\db-4.2.52\build_win32&quot;"
AdditionalIncludeDirectories="{MSSDKPATH}\include\Win64\atl\amd64;{MSSDKPATH}\include\Win64\crt\amd64;{MSSDKPATH}\include\Win64\crt\amd64\sys;{MSSDKPATH}\include\Win64\mfc\amd64;..\Include;..\PC;&quot;..\..\db-4.4.20\build_win32&quot;"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
StringPooling="TRUE"
BasicRuntimeChecks="0"
@ -213,11 +213,11 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions=" /MACHINE:AMD64 /USELINK:MS_SDK"
AdditionalDependencies="..\..\db-4.2.52\build_win32\Release_static\libdb42s.lib"
AdditionalDependencies="..\..\db-4.4.20\build_win32\Release\libdb44s.lib"
OutputFile="./_bsddb.pyd"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
IgnoreDefaultLibraryNames="msvcrt"
IgnoreDefaultLibraryNames=""
GenerateDebugInformation="TRUE"
ProgramDatabaseFile=".\./_bsddb.pdb"
SubSystem="2"

56
PCbuild/readme.txt
View File

@ -127,7 +127,9 @@ _tkinter
bz2
Python wrapper for the libbz2 compression library. Homepage
http://sources.redhat.com/bzip2/
Download the source from the python.org copy:
Download the source from the python.org copy into the dist
directory:
svn export http://svn.python.org/projects/external/bzip2-1.0.3
A custom pre-link step in the bz2 project settings should manage to
@ -148,52 +150,38 @@ bz2
_bsddb
Go to Sleepycat's download page:
http://www.sleepycat.com/download/
To use the version of bsddb that Python is built with by default is, invoke
(in the dist directory)
and download version 4.2.52.
svn export http://svn.python.org/projects/external/db-4.4.20
Then open a VS.NET 2003 shell, and invoke
devenv db-4.4.20\build_win32\Berkeley_DB.sln /build Release /project db_static
Alternatively, if you want to start with the original sources,
go to Sleepycat's download page:
http://www.sleepycat.com/downloads/releasehistorybdb.html
and download version 4.4.20.
With or without strong cryptography? You can choose either with or
without strong cryptography, as per the instructions below. By
default, Python is built and distributed WITHOUT strong crypto.
Unpack into the dist\. directory, ensuring you expand with folder names.
Unpack the sources; if you downloaded the non-crypto version, rename
the directory from db-4.4.20.NC to db-4.4.20.
If you downloaded with strong crypto, this will create a dist\db-4.2.52
directory, and is ready to use.
If you downloaded WITHOUT strong crypto, this will create a
dist\db-4.2.52.NC directory - this directory should be renamed to
dist\db-4.2.52 before use.
As of 11-Apr-2004, you also need to download and manually apply two
patches before proceeding (and the sleepycat download page tells you
about this). Cygwin patch worked for me. cd to dist\db-4.2.52 and
use "patch -p0 < patchfile" once for each downloaded patchfile.
Now apply any patches that apply to your version.
Open
dist\db-4.2.52\docs\index.html
dist\db-4.4.20\docs\index.html
and follow the "Windows->Building Berkeley DB with Visual C++ .NET"
instructions for building the Sleepycat
software. Note that Berkeley_DB.dsw is in the build_win32 subdirectory.
Build the "Release Static" version.
XXX We're linking against Release_static\libdb42s.lib.
XXX This yields the following warnings:
"""
Compiling...
_bsddb.c
Linking...
Creating library ./_bsddb.lib and object ./_bsddb.exp
_bsddb.obj : warning LNK4217: locally defined symbol _malloc imported in function __db_associateCallback
_bsddb.obj : warning LNK4217: locally defined symbol _free imported in function __DB_consume
_bsddb.obj : warning LNK4217: locally defined symbol _fclose imported in function _DB_verify
_bsddb.obj : warning LNK4217: locally defined symbol _fopen imported in function _DB_verify
_bsddb.obj : warning LNK4217: locally defined symbol _strncpy imported in function _init_pybsddb
__bsddb - 0 error(s), 5 warning(s)
"""
XXX This isn't encouraging, but I don't know what to do about it.
Build the "db_static" project, for "Release" mode.
To run extensive tests, pass "-u bsddb" to regrtest.py. test_bsddb3.py
is then enabled. Running in verbose mode may be helpful.

5
Tools/buildbot/external.bat
View File

@ -6,3 +6,8 @@ cd ..
@rem bzip
if not exist bzip2-1.0.3 svn export http://svn.python.org/projects/external/bzip2-1.0.3
@rem Sleepycat db
if not exist db-4.4.20 svn export http://svn.python.org/projects/external/db-4.4.20
if not exist db-4.4.20\build_win32\debug\libdb44sd.lib (
devenv db-4.4.20\build_win32\Berkeley_DB.sln /build Debug /project db_static
)