[Python-checkins] r73208 - in python/branches/py3k: Doc/library/shelve.rst Doc/library/weakref.rst Lib/test/regrtest.py Makefile.pre.in Misc/RPM/python-3.1.spec Misc/valgrind-python.supp Modules/Setup.dist PC/VS7.1/python.build PC/VS7.1/python.iss PC/VS7.1/python20.wse PC/VS7.1/readme.txt PC/VS8.0/pyproject.vsprops PC/os2emx/README.os2emx PC/os2vacpp/makefile PC/os2vacpp/makefile.omk PCbuild/pyproject.vsprops PCbuild/readme.txt PCbuild/vs9to8.py
georg.brandl
python-checkins at python.org
Thu Jun 4 11:30:31 CEST 2009
Author: georg.brandl
Date: Thu Jun 4 11:30:30 2009
New Revision: 73208
Log:
#3791: remove last traces of bsddb.
Modified:
python/branches/py3k/Doc/library/shelve.rst
python/branches/py3k/Doc/library/weakref.rst
python/branches/py3k/Lib/test/regrtest.py
python/branches/py3k/Makefile.pre.in
python/branches/py3k/Misc/RPM/python-3.1.spec
python/branches/py3k/Misc/valgrind-python.supp
python/branches/py3k/Modules/Setup.dist
python/branches/py3k/PC/VS7.1/python.build
python/branches/py3k/PC/VS7.1/python.iss
python/branches/py3k/PC/VS7.1/python20.wse
python/branches/py3k/PC/VS7.1/readme.txt
python/branches/py3k/PC/VS8.0/pyproject.vsprops
python/branches/py3k/PC/os2emx/README.os2emx
python/branches/py3k/PC/os2vacpp/makefile
python/branches/py3k/PC/os2vacpp/makefile.omk
python/branches/py3k/PCbuild/pyproject.vsprops
python/branches/py3k/PCbuild/readme.txt
python/branches/py3k/PCbuild/vs9to8.py
Modified: python/branches/py3k/Doc/library/shelve.rst
==============================================================================
--- python/branches/py3k/Doc/library/shelve.rst (original)
+++ python/branches/py3k/Doc/library/shelve.rst Thu Jun 4 11:30:30 2009
@@ -102,12 +102,14 @@
.. class:: BsdDbShelf(dict[, protocol=None[, writeback=False]])
A subclass of :class:`Shelf` which exposes :meth:`first`, :meth:`next`,
- :meth:`previous`, :meth:`last` and :meth:`set_location` which are available in
- the :mod:`bsddb` module but not in other database modules. The *dict* object
- passed to the constructor must support those methods. This is generally
- accomplished by calling one of :func:`bsddb.hashopen`, :func:`bsddb.btopen` or
- :func:`bsddb.rnopen`. The optional *protocol* and *writeback* parameters have
- the same interpretation as for the :class:`Shelf` class.
+ :meth:`previous`, :meth:`last` and :meth:`set_location` which are available
+ in the third-party :mod:`bsddb` module from `pybsddb
+ <http://www.jcea.es/programacion/pybsddb.htm>`_ but not in other database
+ modules. The *dict* object passed to the constructor must support those
+ methods. This is generally accomplished by calling one of
+ :func:`bsddb.hashopen`, :func:`bsddb.btopen` or :func:`bsddb.rnopen`. The
+ optional *protocol* and *writeback* parameters have the same interpretation
+ as for the :class:`Shelf` class.
.. class:: DbfilenameShelf(filename[, flag='c'[, protocol=None[, writeback=False]]])
Modified: python/branches/py3k/Doc/library/weakref.rst
==============================================================================
--- python/branches/py3k/Doc/library/weakref.rst (original)
+++ python/branches/py3k/Doc/library/weakref.rst Thu Jun 4 11:30:30 2009
@@ -59,9 +59,8 @@
Not all objects can be weakly referenced; those objects which can include class
instances, functions written in Python (but not in C), instance methods, sets,
-frozensets, file objects, :term:`generator`\s, type objects, :class:`DBcursor`
-objects from the :mod:`bsddb` module, sockets, arrays, deques, and regular
-expression pattern objects.
+frozensets, file objects, :term:`generator`\s, type objects, sockets, arrays,
+deques, and regular expression pattern objects.
Several builtin types such as :class:`list` and :class:`dict` do not directly
support weak references but can add support through subclassing::
Modified: python/branches/py3k/Lib/test/regrtest.py
==============================================================================
--- python/branches/py3k/Lib/test/regrtest.py (original)
+++ python/branches/py3k/Lib/test/regrtest.py Thu Jun 4 11:30:30 2009
@@ -114,9 +114,6 @@
network - It is okay to run tests that use external network
resource, e.g. testing SSL support for sockets.
- bsddb - It is okay to run the bsddb testsuite, which takes
- a long time to complete.
-
decimal - Test the decimal module against a large suite that
verifies compliance with standards.
@@ -130,8 +127,8 @@
gui - Run tests that require a running GUI.
To enable all resources except one, use '-uall,-<resource>'. For
-example, to run all the tests except for the bsddb tests, give the
-option '-uall,-bsddb'.
+example, to run all the tests except for the gui tests, give the
+option '-uall,-gui'.
"""
import getopt
@@ -182,7 +179,7 @@
from test import support
-RESOURCE_NAMES = ('audio', 'curses', 'largefile', 'network', 'bsddb',
+RESOURCE_NAMES = ('audio', 'curses', 'largefile', 'network',
'decimal', 'compiler', 'subprocess', 'urlfetch', 'gui')
@@ -900,7 +897,6 @@
'win32':
"""
test__locale
- test_bsddb3
test_crypt
test_curses
test_dbm
@@ -937,8 +933,6 @@
'mac':
"""
test_atexit
- test_bsddb
- test_bsddb3
test_bz2
test_crypt
test_curses
@@ -966,7 +960,6 @@
""",
'unixware7':
"""
- test_bsddb
test_epoll
test_largefile
test_kqueue
@@ -978,7 +971,6 @@
""",
'openunix8':
"""
- test_bsddb
test_epoll
test_largefile
test_kqueue
@@ -991,7 +983,6 @@
'sco_sv3':
"""
test_asynchat
- test_bsddb
test_fork1
test_epoll
test_gettext
@@ -1012,8 +1003,6 @@
'darwin':
"""
test__locale
- test_bsddb
- test_bsddb3
test_curses
test_epoll
test_dbm_gnu
@@ -1025,7 +1014,6 @@
""",
'sunos5':
"""
- test_bsddb
test_curses
test_dbm
test_epoll
@@ -1038,7 +1026,6 @@
""",
'hp-ux11':
"""
- test_bsddb
test_curses
test_epoll
test_dbm_gnu
@@ -1068,7 +1055,6 @@
""",
'cygwin':
"""
- test_bsddb3
test_curses
test_dbm
test_epoll
@@ -1082,7 +1068,6 @@
'os2emx':
"""
test_audioop
- test_bsddb3
test_curses
test_epoll
test_kqueue
@@ -1096,8 +1081,6 @@
""",
'freebsd4':
"""
- test_bsddb
- test_bsddb3
test_epoll
test_dbm_gnu
test_locale
@@ -1115,8 +1098,6 @@
""",
'aix5':
"""
- test_bsddb
- test_bsddb3
test_bz2
test_epoll
test_dbm_gnu
@@ -1132,8 +1113,6 @@
""",
'openbsd3':
"""
- test_bsddb
- test_bsddb3
test_ctypes
test_epoll
test_dbm_gnu
@@ -1149,8 +1128,6 @@
""",
'netbsd3':
"""
- test_bsddb
- test_bsddb3
test_ctypes
test_curses
test_epoll
Modified: python/branches/py3k/Makefile.pre.in
==============================================================================
--- python/branches/py3k/Makefile.pre.in (original)
+++ python/branches/py3k/Makefile.pre.in Thu Jun 4 11:30:30 2009
@@ -840,7 +840,7 @@
email email/mime email/test email/test/data \
html json json/tests http dbm xmlrpc \
sqlite3 sqlite3/test \
- logging bsddb bsddb/test csv wsgiref urllib \
+ logging csv wsgiref urllib \
lib2to3 lib2to3/fixes lib2to3/pgen2 lib2to3/tests \
lib2to3/tests/data lib2to3/tests/data/fixers lib2to3/tests/data/fixers/myfixes \
ctypes ctypes/test ctypes/macholib idlelib idlelib/Icons \
Modified: python/branches/py3k/Misc/RPM/python-3.1.spec
==============================================================================
--- python/branches/py3k/Misc/RPM/python-3.1.spec (original)
+++ python/branches/py3k/Misc/RPM/python-3.1.spec Thu Jun 4 11:30:30 2009
@@ -360,7 +360,6 @@
%{__prefix}/%{libdirname}/python%{libvers}/email/mime
%{__prefix}/%{libdirname}/python%{libvers}/sqlite3
%{__prefix}/%{libdirname}/python%{libvers}/compiler
-%{__prefix}/%{libdirname}/python%{libvers}/bsddb
%{__prefix}/%{libdirname}/python%{libvers}/hotshot
%{__prefix}/%{libdirname}/python%{libvers}/logging
%{__prefix}/%{libdirname}/python%{libvers}/lib-old
Modified: python/branches/py3k/Misc/valgrind-python.supp
==============================================================================
--- python/branches/py3k/Misc/valgrind-python.supp (original)
+++ python/branches/py3k/Misc/valgrind-python.supp Thu Jun 4 11:30:30 2009
@@ -5,7 +5,7 @@
#
# cd python/dist/src
# valgrind --tool=memcheck --suppressions=Misc/valgrind-python.supp \
-# ./python -E ./Lib/test/regrtest.py -u bsddb,network
+# ./python -E ./Lib/test/regrtest.py -u gui,network
#
# You must edit Objects/obmalloc.c and uncomment Py_USING_MEMORY_DEBUGGER
# to use the preferred suppressions with Py_ADDRESS_IN_RANGE.
Modified: python/branches/py3k/Modules/Setup.dist
==============================================================================
--- python/branches/py3k/Modules/Setup.dist (original)
+++ python/branches/py3k/Modules/Setup.dist Thu Jun 4 11:30:30 2009
@@ -324,25 +324,6 @@
#_gdbm _gdbmmodule.c -I/usr/local/include -L/usr/local/lib -lgdbm
-# Sleepycat Berkeley DB interface.
-#
-# This requires the Sleepycat DB code, see http://www.sleepycat.com/
-# The earliest supported version of that library is 3.0, the latest
-# supported version is 4.0 (4.1 is specifically not supported, as that
-# changes the semantics of transactional databases). A list of available
-# releases can be found at
-#
-# http://www.sleepycat.com/update/index.html
-#
-# Edit the variables DB and DBLIBVERto point to the db top directory
-# and the subdirectory of PORT where you built it.
-#DB=/usr/local/BerkeleyDB.4.0
-#DBLIBVER=4.0
-#DBINC=$(DB)/include
-#DBLIB=$(DB)/lib
-#_bsddb _bsddb.c -I$(DBINC) -L$(DBLIB) -ldb-$(DBLIBVER)
-
-
# Helper module for various ascii-encoders
#binascii binascii.c
Modified: python/branches/py3k/PC/VS7.1/python.build
==============================================================================
--- python/branches/py3k/PC/VS7.1/python.build (original)
+++ python/branches/py3k/PC/VS7.1/python.build Thu Jun 4 11:30:30 2009
@@ -12,7 +12,6 @@
<excludeprojects>
<include name="_tkinter.vcproj" />
<include name="bz2.vcproj" />
- <include name="_bsddb.vcproj" />
<include name="_sqlite3.vcproj" />
<include name="_ssl.vcproj" />
</excludeprojects>
Modified: python/branches/py3k/PC/VS7.1/python.iss
==============================================================================
--- python/branches/py3k/PC/VS7.1/python.iss (original)
+++ python/branches/py3k/PC/VS7.1/python.iss Thu Jun 4 11:30:30 2009
@@ -137,9 +137,6 @@
Source: DLLs\_tkinter.pyd; DestDir: {app}\DLLs; CopyMode: alwaysoverwrite; Components: tk
Source: libs\_tkinter.lib; DestDir: {app}\libs; CopyMode: alwaysoverwrite; Components: tk
-Source: DLLs\bsddb.pyd; DestDir: {app}\DLLs; CopyMode: alwaysoverwrite; Components: main
-Source: libs\bsddb.lib; DestDir: {app}\libs; CopyMode: alwaysoverwrite; Components: main
-
Source: DLLs\mmap.pyd; DestDir: {app}\DLLs; CopyMode: alwaysoverwrite; Components: main
Source: libs\mmap.lib; DestDir: {app}\libs; CopyMode: alwaysoverwrite; Components: main
Modified: python/branches/py3k/PC/VS7.1/python20.wse
==============================================================================
--- python/branches/py3k/PC/VS7.1/python20.wse (original)
+++ python/branches/py3k/PC/VS7.1/python20.wse Thu Jun 4 11:30:30 2009
@@ -1754,11 +1754,6 @@
Flags=0000000000000010
end
item: Install File
- Source=.\_bsddb.pyd
- Destination=%MAINDIR%\DLLs\_bsddb.pyd
- Flags=0000000000000010
-end
-item: Install File
Source=.\bz2.pyd
Destination=%MAINDIR%\DLLs\bz2.pyd
Flags=0000000000000010
@@ -1851,11 +1846,6 @@
Flags=0000000000000010
end
item: Install File
- Source=.\_bsddb.lib
- Destination=%MAINDIR%\libs\_bsddb.lib
- Flags=0000000000000010
-end
-item: Install File
Source=.\bz2.lib
Destination=%MAINDIR%\libs\bz2.lib
Flags=0000000000000010
@@ -1940,14 +1930,6 @@
item: Remark
end
item: Install File
- Source=..\lib\bsddb\*.py
- Destination=%MAINDIR%\Lib\bsddb
- Description=Berkeley database package
- Flags=0000000100000010
-end
-item: Remark
-end
-item: Install File
Source=..\lib\compiler\*.py
Destination=%MAINDIR%\Lib\compiler
Description=Python compiler written in Python
Modified: python/branches/py3k/PC/VS7.1/readme.txt
==============================================================================
--- python/branches/py3k/PC/VS7.1/readme.txt (original)
+++ python/branches/py3k/PC/VS7.1/readme.txt Thu Jun 4 11:30:30 2009
@@ -138,82 +138,6 @@
All of this managed to build bzip2-1.0.3\libbz2.lib, which the Python
project links in.
-
-_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
-
-
- Then open a VS.NET 2003 shell, and invoke:
-
- devenv db-4.4.20\build_win32\Berkeley_DB.sln /build Release /project db_static
-
- and do that a second time for a Debug build too:
-
- devenv db-4.4.20\build_win32\Berkeley_DB.sln /build Debug /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 the sources; if you downloaded the non-crypto version, rename
- the directory from db-4.4.20.NC to db-4.4.20.
-
- Now apply any patches that apply to your version.
-
- Open
- 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 "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.
-
- 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')
- XXX
- XXX I'm told that DBLockDeadlockError is expected at times. It
- XXX doesn't cause a test to fail when it happens (exceptions in
- XXX threads are invisible to unittest).
-
- Building for Win64:
- - open a VS.NET 2003 command prompt
- - run the SDK setenv.cmd script, passing /RETAIL and the target
- architecture (/SRV64 for Itanium, /X64 for AMD64)
- - build BerkeleyDB with the solution configuration matching the
- target ("Release IA64" for Itanium, "Release AMD64" for AMD64), e.g.
- devenv db-4.4.20\build_win32\Berkeley_DB.sln /build "Release AMD64" /project db_static /useenv
-
_sqlite3
Python wrapper for SQLite library.
@@ -363,7 +287,7 @@
Extension modules
To build those extension modules which require external libraries
- (_tkinter, bz2, _bsddb, _sqlite3, _ssl) you can follow the instructions
+ (_tkinter, bz2, _sqlite3, _ssl) you can follow the instructions
for the Visual Studio build above, with a few minor modifications. These
instructions have only been tested using the sources in the Python
subversion repository - building from original sources should work, but
@@ -386,19 +310,6 @@
bz2
No changes are needed
- _bsddb
- The file db.build should be copied from the Python PCBuild directory
- to the directory db-4.4.20\build_win32.
-
- The file db_static.vcproj in db-4.4.20\build_win32 should be edited to
- remove the string "$(SolutionDir)" - this occurs in 2 places, only
- relevant for 64-bit builds. (The edit is required as otherwise, nant
- wants to read the solution file, which is not in a suitable form).
-
- The bsddb library can then be build with the command
- nant -buildfile:db.build all
- run from the db-4.4.20\build_win32 directory.
-
_sqlite3
No changes are needed. However, in order for the tests to succeed, a
copy of sqlite3.dll must be downloaded, and placed alongside
Modified: python/branches/py3k/PC/VS8.0/pyproject.vsprops
==============================================================================
--- python/branches/py3k/PC/VS8.0/pyproject.vsprops (original)
+++ python/branches/py3k/PC/VS8.0/pyproject.vsprops Thu Jun 4 11:30:30 2009
@@ -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"
/>
Modified: python/branches/py3k/PC/os2emx/README.os2emx
==============================================================================
--- python/branches/py3k/PC/os2emx/README.os2emx (original)
+++ python/branches/py3k/PC/os2emx/README.os2emx Thu Jun 4 11:30:30 2009
@@ -123,7 +123,7 @@
Where I've been able to locate the required 3rd party packages already
ported to OS/2, I've built and included them.
-These include ncurses (_curses, _curses_panel), BSD DB (bsddb185),
+These include ncurses (_curses, _curses_panel),
GNU GDBM (gdbm, dbm), zlib (zlib), GNU Readline (readline), and GNU UFC
(crypt).
@@ -150,10 +150,6 @@
No updates to the Python 2.6 release have become available.
-Eberhard Mattes' EMXFIX04 update to his EMX 0.9d tools suite includes
-bug fixes for the BSD DB library. The bsddb module included in this
-port incorporates these fixes.
-
Library and other distributed Python code:
The Python standard library lives in the Lib directory. All the standard
@@ -326,7 +322,6 @@
GNU UltraFast Crypt HAVE_UFC
Tcl/Tk HAVE_TCLTK (not known to work)
GNU Readline HAVE_GREADLINE
- BSD DB (v1.85) HAVE_BSDDB
ncurses HAVE_NCURSES
GNU gdbm HAVE_GDBM
libbz2 HAVE_BZ2
@@ -388,52 +383,23 @@
Because of other side-effects I have modified the test_fcntl.py test
script to deactivate the exercising of the missing functionality.
-4. the PyBSDDB3 module has been imported into the Python standard
-library, with the intent of superceding the BSDDB 1.85 module (bsddb).
-As I don't yet have a satisfactory port of Sleepcat's more recent DB
-library (3.3.x/4.0.x/4.1.x), I haven't included a binary of this
-module. I have left the Python part of the PyBSDDB package in this
-distribution for completeness.
-
-5. As a consequence of the PyBSDDB3 module being imported, the former
-BSD DB (bsddb) module, linked against the DB v1.85 library from EMX,
-has been renamed bsddb185. The bsddb185 module will not be built by
-default on most platforms, but in the absence of a PyBSDDB3 module I
-have retained it in the EMX port.
-
-Version 1.85 of the DB library is widely known to have bugs, although
-some patches have become available (and are incorporated into the
-included bsddb185 module). Unless you have problems with software
-licenses which would rule out GDBM (and the dbm module because it is
-linked against the GDBM library) or need it for file format compatibility,
-you may be better off deleting it and relying on GDBM.
-
-Any code you have which uses the v1.85 bsddb module can be modified to
-use the renamed module by changing
-
- import bsddb
-
-to
-
- import bsddb185 as bsddb
-
-6. The readline module has been linked against ncurses rather than the
+4. The readline module has been linked against ncurses rather than the
termcap library supplied with EMX.
-7. I have configured this port to use "/" as the preferred path separator
+5. I have configured this port to use "/" as the preferred path separator
character, rather than "\" ('\\'), in line with the convention supported
by EMX. Backslashes are still supported of course, and still appear in
unexpected places due to outside sources that don't get normalised.
-8. While the DistUtils components are now functional, other
+6. While the DistUtils components are now functional, other
packaging/binary handling tools and utilities such as those included in
the Demo and Tools directories - freeze in particular - are unlikely to
work. If you do get them going, I'd like to know about your success.
-9. I haven't set out to support the [BEGIN|END]LIBPATH functionality
+7. I haven't set out to support the [BEGIN|END]LIBPATH functionality
supported by one of the earlier ports (Rush's??). If it works let me know.
-10. As a result of the limitations imposed by EMX's library routines, the
+8. As a result of the limitations imposed by EMX's library routines, the
standard extension module pwd only synthesises a simple passwd database,
and the grp module cannot be supported at all.
@@ -511,11 +477,7 @@
ready yet.
16. I have successfully built this port with Andy Zabolotny's ports of
-pgcc 2.95 and gcc 3.2.1, in addition to EM's gcc 2.8.1. To use the
-bsddb185 module with the gcc 3.2.1 build, I had to recompile the DB library
-with gcc 3.2.1 - I don't know why, but trying to import the module built
-against a DB library compiled with gcc 2.8.1 would result in a SYS3175
-error.
+pgcc 2.95 and gcc 3.2.1, in addition to EM's gcc 2.8.1.
I have not attempted to compile Python with any version of gcc prior to
v2.8.1.
Modified: python/branches/py3k/PC/os2vacpp/makefile
==============================================================================
--- python/branches/py3k/PC/os2vacpp/makefile (original)
+++ python/branches/py3k/PC/os2vacpp/makefile Thu Jun 4 11:30:30 2009
@@ -408,20 +408,6 @@
$(PY_INCLUDE)\sliceobject.h $(PY_INCLUDE)\stringobject.h \
$(PY_INCLUDE)\sysmodule.h $(PY_INCLUDE)\traceback.h $(PY_INCLUDE)\tupleobject.h
-bsddbmodule.obj: $(PY_INCLUDE)\abstract.h $(PY_INCLUDE)\ceval.h \
- $(PY_INCLUDE)\classobject.h $(PY_INCLUDE)\cobject.h $(PY_INCLUDE)\complexobject.h \
- pyconfig.h $(PY_INCLUDE)\dictobject.h $(PY_INCLUDE)\fileobject.h \
- $(PY_INCLUDE)\floatobject.h $(PY_INCLUDE)\funcobject.h $(PY_INCLUDE)\import.h \
- $(PY_INCLUDE)\intobject.h $(PY_INCLUDE)\intrcheck.h $(PY_INCLUDE)\listobject.h \
- $(PY_INCLUDE)\longobject.h $(PY_INCLUDE)\methodobject.h \
- $(PY_INCLUDE)\modsupport.h $(PY_INCLUDE)\moduleobject.h $(PY_INCLUDE)\mymalloc.h \
- $(PY_INCLUDE)\myproto.h $(PY_INCLUDE)\object.h $(PY_INCLUDE)\objimpl.h \
- $(PY_INCLUDE)\pydebug.h $(PY_INCLUDE)\pyerrors.h $(PY_INCLUDE)\pyfpe.h \
- $(PY_INCLUDE)\pystate.h $(PY_INCLUDE)\python.h $(PY_INCLUDE)\pythonrun.h \
- $(PY_INCLUDE)\rangeobject.h $(PY_INCLUDE)\sliceobject.h \
- $(PY_INCLUDE)\stringobject.h $(PY_INCLUDE)\sysmodule.h $(PY_INCLUDE)\traceback.h \
- $(PY_INCLUDE)\tupleobject.h
-
cmathmodule.obj: $(PY_INCLUDE)\abstract.h $(PY_INCLUDE)\ceval.h \
$(PY_INCLUDE)\classobject.h $(PY_INCLUDE)\cobject.h $(PY_INCLUDE)\complexobject.h \
pyconfig.h $(PY_INCLUDE)\dictobject.h $(PY_INCLUDE)\fileobject.h \
Modified: python/branches/py3k/PC/os2vacpp/makefile.omk
==============================================================================
--- python/branches/py3k/PC/os2vacpp/makefile.omk (original)
+++ python/branches/py3k/PC/os2vacpp/makefile.omk Thu Jun 4 11:30:30 2009
@@ -360,14 +360,6 @@
pythonrun.h rangeobject.h sliceobject.h stringobject.h sysmodule.h \
traceback.h tupleobject.h
-bsddbmodule.obj: abstract.h ceval.h classobject.h cobject.h complexobject.h \
- pyconfig.h dictobject.h fileobject.h floatobject.h funcobject.h \
- import.h intobject.h intrcheck.h listobject.h longobject.h \
- methodobject.h modsupport.h moduleobject.h mymalloc.h myproto.h \
- object.h objimpl.h pydebug.h pyerrors.h pyfpe.h pystate.h python.h \
- pythonrun.h rangeobject.h sliceobject.h stringobject.h sysmodule.h \
- traceback.h tupleobject.h
-
cmathmodule.obj: abstract.h ceval.h classobject.h cobject.h complexobject.h \
pyconfig.h dictobject.h fileobject.h floatobject.h funcobject.h \
import.h intobject.h intrcheck.h listobject.h longobject.h \
Modified: python/branches/py3k/PCbuild/pyproject.vsprops
==============================================================================
--- python/branches/py3k/PCbuild/pyproject.vsprops (original)
+++ python/branches/py3k/PCbuild/pyproject.vsprops Thu Jun 4 11:30:30 2009
@@ -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"
/>
Modified: python/branches/py3k/PCbuild/readme.txt
==============================================================================
--- python/branches/py3k/PCbuild/readme.txt (original)
+++ python/branches/py3k/PCbuild/readme.txt Thu Jun 4 11:30:30 2009
@@ -103,13 +103,10 @@
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 @@
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
Modified: python/branches/py3k/PCbuild/vs9to8.py
==============================================================================
--- python/branches/py3k/PCbuild/vs9to8.py (original)
+++ python/branches/py3k/PCbuild/vs9to8.py Thu Jun 4 11:30:30 2009
@@ -25,8 +25,6 @@
# 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()
More information about the Python-checkins
mailing list