diff options
| author | Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp> | 2009-01-09 04:14:13 (GMT) |
|---|---|---|
| committer | Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp> | 2009-01-09 04:14:13 (GMT) |
| commit | f8956b66dccda8c21284f43ba62ca74a72c05d3f (patch) | |
| tree | 371e260b504b937a346249717a2b08b1acd6569e /PC | |
| parent | 195ccc1d2c9425d9246c3282fdfa1abc7208e09b (diff) | |
| download | cpython-f8956b66dccda8c21284f43ba62ca74a72c05d3f.zip cpython-f8956b66dccda8c21284f43ba62ca74a72c05d3f.tar.gz cpython-f8956b66dccda8c21284f43ba62ca74a72c05d3f.tar.bz2 | |
Merged revisions 68439 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r68439 | hirokazu.yamamoto | 2009-01-09 13:10:40 +0900 | 1 line
Bump up bsddb version on VC6. (db-4.4.20 -> db-4.7.25)
........
Diffstat (limited to 'PC')
| -rw-r--r-- | PC/VC6/_bsddb.dsp | 8 | ||||
| -rw-r--r-- | PC/VC6/readme.txt | 14 |
2 files changed, 11 insertions, 11 deletions
diff --git a/PC/VC6/_bsddb.dsp b/PC/VC6/_bsddb.dsp index 662cd9b..1756fe7 100644 --- a/PC/VC6/_bsddb.dsp +++ b/PC/VC6/_bsddb.dsp @@ -44,7 +44,7 @@ RSC=rc.exe # PROP Target_Dir ""
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 ".." /I "..\..\..\db-4.4.20\build_win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "..\..\Include" /I ".." /I "..\..\..\db-4.7.25\build_windows" /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
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -54,7 +54,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
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.4.20\build_win32\Release\libdb44s.lib /nologo /base:"0x1e180000" /subsystem:windows /dll /debug /machine:I386 /out:"./_bsddb.pyd"
+# 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 ws2_32.lib ..\..\..\db-4.7.25\build_windows\Release\libdb47s.lib /nologo /base:"0x1e180000" /subsystem:windows /dll /debug /machine:I386 /out:"./_bsddb.pyd"
# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "_bsddb - Win32 Debug"
@@ -72,7 +72,7 @@ LINK32=link.exe # PROP Target_Dir ""
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 ".." /I "..\..\..\db-4.4.20\build_win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\Include" /I ".." /I "..\..\..\db-4.7.25\build_windows" /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
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -82,7 +82,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
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.4.20\build_win32\Release\libdb44s.lib /nologo /base:"0x1e180000" /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"msvcrtd" /out:"./_bsddb_d.pyd" /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 ws2_32.lib ..\..\..\db-4.7.25\build_windows\Release\libdb47s.lib /nologo /base:"0x1e180000" /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"msvcrtd" /out:"./_bsddb_d.pyd" /pdbtype:sept
# SUBTRACT LINK32 /pdb:none
!ENDIF
diff --git a/PC/VC6/readme.txt b/PC/VC6/readme.txt index 72afeb1..e5fb06f 100644 --- a/PC/VC6/readme.txt +++ b/PC/VC6/readme.txt @@ -128,23 +128,23 @@ _bsddb To use the version of bsddb that Python is built with by default, invoke (in the dist directory) - svn export http://svn.python.org/projects/external/db-4.4.20 + svn export http://svn.python.org/projects/external/db-4.7.25.0 db-4.7.25 - Then open db-4.4.20\build_win32\Berkeley_DB.dsw and build the "db_static" - project for "Release" mode. + Then open db-4.7.25\build_windows\Berkeley_DB.dsw and build the + "db_static" project for "Release" mode. Alternatively, if you want to start with the original sources, - go to Sleepycat's download page: - http://www.sleepycat.com/downloads/releasehistorybdb.html + go to Oracle's download page: + http://www.oracle.com/technology/software/products/berkeley-db/db/ - and download version 4.4.20. + and download version 4.7.25. 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 the sources; if you downloaded the non-crypto version, rename - the directory from db-4.4.20.NC to db-4.4.20. + the directory from db-4.7.25.NC to db-4.7.25. Now apply any patches that apply to your version. |