diff options
| author | Georg Brandl <georg@python.org> | 2009-06-04 09:30:30 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2009-06-04 09:30:30 (GMT) |
| commit | 1158a33fab14fe0522dd5ebc753c573369652eff (patch) | |
| tree | 4e163616865a7559e94587f62f8976673c678d02 /PCbuild | |
| parent | b54d801280e3f510782e2855504710947d10f053 (diff) | |
| download | cpython-1158a33fab14fe0522dd5ebc753c573369652eff.zip cpython-1158a33fab14fe0522dd5ebc753c573369652eff.tar.gz cpython-1158a33fab14fe0522dd5ebc753c573369652eff.tar.bz2 | |
#3791: remove last traces of bsddb.
Diffstat (limited to 'PCbuild')
| -rw-r--r-- | PCbuild/pyproject.vsprops | 24 | ||||
| -rw-r--r-- | PCbuild/readme.txt | 9 | ||||
| -rw-r--r-- | PCbuild/vs9to8.py | 2 |
3 files changed, 3 insertions, 32 deletions
diff --git a/PCbuild/pyproject.vsprops b/PCbuild/pyproject.vsprops index 703c2f4..59163e6 100644 --- a/PCbuild/pyproject.vsprops +++ b/PCbuild/pyproject.vsprops @@ -49,30 +49,6 @@ Value="..\.." /> <UserMacro - Name="bsddbDir" - Value="$(bsddb44Dir)" - /> - <UserMacro - Name="bsddbDepLibs" - Value="$(bsddb44DepLibs)" - /> - <UserMacro - Name="bsddb44Dir" - Value="$(externalsDir)\db-4.4.20\build_win32" - /> - <UserMacro - Name="bsddb44DepLibs" - Value="" - /> - <UserMacro - Name="bsddb45Dir" - Value="$(externalsDir)\db-4.5.20.x\build_windows" - /> - <UserMacro - Name="bsddb45DepLibs" - Value="ws2_32.lib" - /> - <UserMacro Name="sqlite3Dir" Value="$(externalsDir)\sqlite-3.5.9" /> diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt index 8e4ce89..918a1d3 100644 --- a/PCbuild/readme.txt +++ b/PCbuild/readme.txt @@ -103,13 +103,10 @@ winsound play sounds (typically .wav files) under Windows Python-controlled subprojects that wrap external projects: -_bsddb - Wraps Berkeley DB 4.7.25, which is currently built by _bsddb.vcproj. - project (see below). _sqlite3 Wraps SQLite 3.5.9, which is currently built by sqlite3.vcproj (see below). _tkinter - Wraps the Tk windowing system. Unlike _bsddb and _sqlite3, there's no + Wraps the Tk windowing system. Unlike _sqlite3, there's no corresponding tcltk.vcproj-type project that builds Tcl/Tk from vcproj's within our pcbuild.sln, which means this module expects to find a pre-built Tcl/Tk in either ..\..\tcltk for 32-bit or ..\..\tcltk64 for @@ -213,8 +210,8 @@ So for a release build, you'd call it as: This will be cleaned up in the future; ideally Tcl/Tk will be brought into our pcbuild.sln as custom .vcproj files, just as we've recently done with the -_bsddb.vcproj and sqlite3.vcproj files, which will remove the need for -Tcl/Tk to be built separately via a batch file. +sqlite3.vcproj file, which will remove the need for Tcl/Tk to be built +separately via a batch file. XXX trent.nelson 02-Apr-08: Having the external subprojects in ..\.. relative to this directory is a diff --git a/PCbuild/vs9to8.py b/PCbuild/vs9to8.py index 0a341fb..bab3b6e 100644 --- a/PCbuild/vs9to8.py +++ b/PCbuild/vs9to8.py @@ -25,8 +25,6 @@ def vs9to8(src, dest): # Bah. VS8.0 does not expand macros in file names. # Replace them here. lines = lines.replace('$(sqlite3Dir)', '..\\..\\..\\sqlite-3.5.9') - lines = lines.replace('$(bsddbDir)\\..\\..', '..\\..\\..\\db-4.4.20\\build_win32\\..') - lines = lines.replace('$(bsddbDir)', '..\\..\\..\\db-4.4.20\\build_win32') with open(destname, 'wb') as fout: lines = lines.replace("\n", "\r\n").encode() |