Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn
merge in bad ways, so I'll have to merge that extra-carefully (probably manually.)
Merged revisions 46495-46605 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r46495 | tim.peters | 2006-05-28 03:52:38 +0200 (Sun, 28 May 2006) | 2 lines
Added missing svn:eol-style property to text files.
........
r46497 | tim.peters | 2006-05-28 12:41:29 +0200 (Sun, 28 May 2006) | 3 lines
PyErr_Display(), PyErr_WriteUnraisable(): Coverity found a cut-and-paste
bug in both: `className` was referenced before being checked for NULL.
........
r46499 | fredrik.lundh | 2006-05-28 14:06:46 +0200 (Sun, 28 May 2006) | 5 lines
needforspeed: added Py_MEMCPY macro (currently tuned for Visual C only),
and use it for string copy operations. this gives a 20% speedup on some
string benchmarks.
........
r46501 | michael.hudson | 2006-05-28 17:51:40 +0200 (Sun, 28 May 2006) | 26 lines
Quality control, meet exceptions.c.
Fix a number of problems with the need for speed code:
One is doing this sort of thing:
Py_DECREF(self->field);
self->field = newval;
Py_INCREF(self->field);
without being very sure that self->field doesn't start with a
value that has a __del__, because that almost certainly can lead
to segfaults.
As self->args is constrained to be an exact tuple we may as well
exploit this fact consistently. This leads to quite a lot of
simplification (and, hey, probably better performance).
Add some error checking in places lacking it.
Fix some rather strange indentation in the Unicode code.
Delete some trailing whitespace.
More to come, I haven't fixed all the reference leaks yet...
........
r46502 | george.yoshida | 2006-05-28 18:39:09 +0200 (Sun, 28 May 2006) | 3 lines
Patch #1080727: add "encoding" parameter to doctest.DocFileSuite
Contributed by Bjorn Tillenius.
........
r46503 | martin.v.loewis | 2006-05-28 18:57:38 +0200 (Sun, 28 May 2006) | 4 lines
Rest of patch #1490384: Commit icon source, remove
claim that Erik von Blokland is the author of the
installer picture.
........
r46504 | michael.hudson | 2006-05-28 19:40:29 +0200 (Sun, 28 May 2006) | 16 lines
Quality control, meet exceptions.c, round two.
Make some functions that should have been static static.
Fix a bunch of refleaks by fixing the definition of
MiddlingExtendsException.
Remove all the __new__ implementations apart from
BaseException_new. Rewrite most code that needs it to cope with
NULL fields (such code could get excercised anyway, the
__new__-removal just makes it more likely). This involved
editing the code for WindowsError, which I can't test.
This fixes all the refleaks in at least the start of a regrtest
-R :: run.
........
r46505 | marc-andre.lemburg | 2006-05-28 19:46:58 +0200 (Sun, 28 May 2006) | 10 lines
Initial version of systimes - a module to provide platform dependent
performance measurements.
The module is currently just a proof-of-concept implementation, but
will integrated into pybench once it is stable enough.
License: pybench license.
Author: Marc-Andre Lemburg.
........
r46507 | armin.rigo | 2006-05-28 21:13:17 +0200 (Sun, 28 May 2006) | 15 lines
("Forward-port" of r46506)
Remove various dependencies on dictionary order in the standard library
tests, and one (clearly an oversight, potentially critical) in the
standard library itself - base64.py.
Remaining open issues:
* test_extcall is an output test, messy to make robust
* tarfile.py has a potential bug here, but I'm not familiar
enough with this code. Filed in as SF bug #1496501.
* urllib2.HTTPPasswordMgr() returns a random result if there is more
than one matching root path. I'm asking python-dev for
clarification...
........
r46508 | georg.brandl | 2006-05-28 22:11:45 +0200 (Sun, 28 May 2006) | 4 lines
The empty string is a valid import path.
(fixes #1496539)
........
r46509 | georg.brandl | 2006-05-28 22:23:12 +0200 (Sun, 28 May 2006) | 3 lines
Patch #1496206: urllib2 PasswordMgr ./. default ports
........
r46510 | georg.brandl | 2006-05-28 22:57:09 +0200 (Sun, 28 May 2006) | 3 lines
Fix refleaks in UnicodeError get and set methods.
........
r46511 | michael.hudson | 2006-05-28 23:19:03 +0200 (Sun, 28 May 2006) | 3 lines
use the UnicodeError traversal and clearing functions in UnicodeError
subclasses.
........
r46512 | thomas.wouters | 2006-05-28 23:32:12 +0200 (Sun, 28 May 2006) | 4 lines
Make last patch valid C89 so Windows compilers can deal with it.
........
r46513 | georg.brandl | 2006-05-28 23:42:54 +0200 (Sun, 28 May 2006) | 3 lines
Fix ref-antileak in _struct.c which eventually lead to deallocating None.
........
r46514 | georg.brandl | 2006-05-28 23:57:35 +0200 (Sun, 28 May 2006) | 4 lines
Correct None refcount issue in Mac modules. (Are they
still used?)
........
r46515 | armin.rigo | 2006-05-29 00:07:08 +0200 (Mon, 29 May 2006) | 3 lines
A clearer error message when passing -R to regrtest.py with
release builds of Python.
........
r46516 | georg.brandl | 2006-05-29 00:14:04 +0200 (Mon, 29 May 2006) | 3 lines
Fix C function calling conventions in _sre module.
........
r46517 | georg.brandl | 2006-05-29 00:34:51 +0200 (Mon, 29 May 2006) | 3 lines
Convert audioop over to METH_VARARGS.
........
r46518 | georg.brandl | 2006-05-29 00:38:57 +0200 (Mon, 29 May 2006) | 3 lines
METH_NOARGS functions do get called with two args.
........
r46519 | georg.brandl | 2006-05-29 11:46:51 +0200 (Mon, 29 May 2006) | 4 lines
Fix refleak in socketmodule. Replace bogus Py_BuildValue calls.
Fix refleak in exceptions.
........
r46520 | nick.coghlan | 2006-05-29 14:43:05 +0200 (Mon, 29 May 2006) | 7 lines
Apply modified version of Collin Winter's patch #1478788
Renames functional extension module to _functools and adds a Python
functools module so that utility functions like update_wrapper can be
added easily.
........
r46522 | georg.brandl | 2006-05-29 15:53:16 +0200 (Mon, 29 May 2006) | 3 lines
Convert fmmodule to METH_VARARGS.
........
r46523 | georg.brandl | 2006-05-29 16:13:21 +0200 (Mon, 29 May 2006) | 3 lines
Fix #1494605.
........
r46524 | georg.brandl | 2006-05-29 16:28:05 +0200 (Mon, 29 May 2006) | 3 lines
Handle PyMem_Malloc failure in pystrtod.c. Closes #1494671.
........
r46525 | georg.brandl | 2006-05-29 16:33:55 +0200 (Mon, 29 May 2006) | 3 lines
Fix compiler warning.
........
r46526 | georg.brandl | 2006-05-29 16:39:00 +0200 (Mon, 29 May 2006) | 3 lines
Fix #1494787 (pyclbr counts whitespace as superclass name)
........
r46527 | bob.ippolito | 2006-05-29 17:47:29 +0200 (Mon, 29 May 2006) | 1 line
simplify the struct code a bit (no functional changes)
........
r46528 | armin.rigo | 2006-05-29 19:59:47 +0200 (Mon, 29 May 2006) | 2 lines
Silence a warning.
........
r46529 | georg.brandl | 2006-05-29 21:39:45 +0200 (Mon, 29 May 2006) | 3 lines
Correct some value converting strangenesses.
........
r46530 | nick.coghlan | 2006-05-29 22:27:44 +0200 (Mon, 29 May 2006) | 1 line
When adding a module like functools, it helps to let SVN know about the file.
........
r46531 | georg.brandl | 2006-05-29 22:52:54 +0200 (Mon, 29 May 2006) | 4 lines
Patches #1497027 and #972322: try HTTP digest auth first,
and watch out for handler name collisions.
........
r46532 | georg.brandl | 2006-05-29 22:57:01 +0200 (Mon, 29 May 2006) | 3 lines
Add News entry for last commit.
........
r46533 | georg.brandl | 2006-05-29 23:04:52 +0200 (Mon, 29 May 2006) | 4 lines
Make use of METH_O and METH_NOARGS where possible.
Use Py_UnpackTuple instead of PyArg_ParseTuple where possible.
........
r46534 | georg.brandl | 2006-05-29 23:58:42 +0200 (Mon, 29 May 2006) | 3 lines
Convert more modules to METH_VARARGS.
........
r46535 | georg.brandl | 2006-05-30 00:00:30 +0200 (Tue, 30 May 2006) | 3 lines
Whoops.
........
r46536 | fredrik.lundh | 2006-05-30 00:42:07 +0200 (Tue, 30 May 2006) | 4 lines
fixed "abc".count("", 100) == -96 error (hopefully, nobody's relying on
the current behaviour ;-)
........
r46537 | bob.ippolito | 2006-05-30 00:55:48 +0200 (Tue, 30 May 2006) | 1 line
struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly)
........
r46539 | bob.ippolito | 2006-05-30 02:26:01 +0200 (Tue, 30 May 2006) | 1 line
Add a length check to aifc to ensure it doesn't write a bogus file
........
r46540 | tim.peters | 2006-05-30 04:25:25 +0200 (Tue, 30 May 2006) | 10 lines
deprecated_err(): Stop bizarre warning messages when the tests
are run in the order:
test_genexps (or any other doctest-based test)
test_struct
test_doctest
The `warnings` module needs an advertised way to save/restore
its internal filter list.
........
r46541 | tim.peters | 2006-05-30 04:26:46 +0200 (Tue, 30 May 2006) | 2 lines
Whitespace normalization.
........
r46542 | tim.peters | 2006-05-30 04:30:30 +0200 (Tue, 30 May 2006) | 2 lines
Set a binary svn:mime-type property on this UTF-8 encoded file.
........
r46543 | neal.norwitz | 2006-05-30 05:18:50 +0200 (Tue, 30 May 2006) | 1 line
Simplify further by using AddStringConstant
........
r46544 | tim.peters | 2006-05-30 06:16:25 +0200 (Tue, 30 May 2006) | 6 lines
Convert relevant dict internals to Py_ssize_t.
I don't have a box with nearly enough RAM, or an OS,
that could get close to tickling this, though (requires
a dict w/ at least 2**31 entries).
........
r46545 | neal.norwitz | 2006-05-30 06:19:21 +0200 (Tue, 30 May 2006) | 1 line
Remove stray | in comment
........
r46546 | neal.norwitz | 2006-05-30 06:25:05 +0200 (Tue, 30 May 2006) | 1 line
Use Py_SAFE_DOWNCAST for safety. Fix format strings. Remove 2 more stray | in comment
........
r46547 | neal.norwitz | 2006-05-30 06:43:23 +0200 (Tue, 30 May 2006) | 1 line
No DOWNCAST is required since sizeof(Py_ssize_t) >= sizeof(int) and Py_ReprEntr returns an int
........
r46548 | tim.peters | 2006-05-30 07:04:59 +0200 (Tue, 30 May 2006) | 3 lines
dict_print(): Explicitly narrow the return value
from a (possibly) wider variable.
........
r46549 | tim.peters | 2006-05-30 07:23:59 +0200 (Tue, 30 May 2006) | 5 lines
dict_print(): So that Neal & I don't spend the rest of
our lives taking turns rewriting code that works ;-),
get rid of casting illusions by declaring a new variable
with the obvious type.
........
r46550 | georg.brandl | 2006-05-30 09:04:55 +0200 (Tue, 30 May 2006) | 3 lines
Restore exception pickle support. #1497319.
........
r46551 | georg.brandl | 2006-05-30 09:13:29 +0200 (Tue, 30 May 2006) | 3 lines
Add a test case for exception pickling. args is never NULL.
........
r46552 | neal.norwitz | 2006-05-30 09:21:10 +0200 (Tue, 30 May 2006) | 1 line
Don't fail if the (sub)pkgname already exist.
........
r46553 | georg.brandl | 2006-05-30 09:34:45 +0200 (Tue, 30 May 2006) | 3 lines
Disallow keyword args for exceptions.
........
r46554 | neal.norwitz | 2006-05-30 09:36:54 +0200 (Tue, 30 May 2006) | 5 lines
I'm impatient. I think this will fix a few more problems with the buildbots.
I'm not sure this is the best approach, but I can't think of anything better.
If this creates problems, feel free to revert, but I think it's safe and
should make things a little better.
........
r46555 | georg.brandl | 2006-05-30 10:17:00 +0200 (Tue, 30 May 2006) | 4 lines
Do the check for no keyword arguments in __init__ so that
subclasses of Exception can be supplied keyword args
........
r46556 | georg.brandl | 2006-05-30 10:47:19 +0200 (Tue, 30 May 2006) | 3 lines
Convert test_exceptions to unittest.
........
r46557 | andrew.kuchling | 2006-05-30 14:52:01 +0200 (Tue, 30 May 2006) | 1 line
Add SoC name, and reorganize this section a bit
........
r46559 | tim.peters | 2006-05-30 17:53:34 +0200 (Tue, 30 May 2006) | 11 lines
PyLong_FromString(): Continued fraction analysis (explained in
a new comment) suggests there are almost certainly large input
integers in all non-binary input bases for which one Python digit
too few is initally allocated to hold the final result. Instead
of assert-failing when that happens, allocate more space. Alas,
I estimate it would take a few days to find a specific such case,
so this isn't backed up by a new test (not to mention that such
a case may take hours to run, since conversion time is quadratic
in the number of digits, and preliminary attempts suggested that
the smallest such inputs contain at least a million digits).
........
r46560 | fredrik.lundh | 2006-05-30 19:11:48 +0200 (Tue, 30 May 2006) | 3 lines
changed find/rfind to return -1 for matches outside the source string
........
r46561 | bob.ippolito | 2006-05-30 19:37:54 +0200 (Tue, 30 May 2006) | 1 line
Change wrapping terminology to overflow masking
........
r46562 | fredrik.lundh | 2006-05-30 19:39:58 +0200 (Tue, 30 May 2006) | 3 lines
changed count to return 0 for slices outside the source string
........
r46568 | tim.peters | 2006-05-31 01:28:02 +0200 (Wed, 31 May 2006) | 2 lines
Whitespace normalization.
........
r46569 | brett.cannon | 2006-05-31 04:19:54 +0200 (Wed, 31 May 2006) | 5 lines
Clarify wording on default values for strptime(); defaults are used when better
values cannot be inferred.
Closes bug #1496315.
........
r46572 | neal.norwitz | 2006-05-31 09:43:27 +0200 (Wed, 31 May 2006) | 1 line
Calculate smallest properly (it was off by one) and use proper ssize_t types for Win64
........
r46573 | neal.norwitz | 2006-05-31 10:01:08 +0200 (Wed, 31 May 2006) | 1 line
Revert last checkin, it is better to do make distclean
........
r46574 | neal.norwitz | 2006-05-31 11:02:44 +0200 (Wed, 31 May 2006) | 3 lines
On 64-bit platforms running test_struct after test_tarfile would fail
since the deprecation warning wouldn't be raised.
........
r46575 | thomas.heller | 2006-05-31 13:37:58 +0200 (Wed, 31 May 2006) | 3 lines
PyTuple_Pack is not available in Python 2.3, but ctypes must stay
compatible with that.
........
r46576 | andrew.kuchling | 2006-05-31 15:18:56 +0200 (Wed, 31 May 2006) | 1 line
'functional' module was renamed to 'functools'
........
r46577 | kristjan.jonsson | 2006-05-31 15:35:41 +0200 (Wed, 31 May 2006) | 1 line
Fixup the PCBuild8 project directory. exceptions.c have moved to Objects, and the functionalmodule.c has been replaced with _functoolsmodule.c. Other minor changes to .vcproj files and .sln to fix compilation
........
r46578 | andrew.kuchling | 2006-05-31 16:08:48 +0200 (Wed, 31 May 2006) | 15 lines
[Bug #1473048]
SimpleXMLRPCServer and DocXMLRPCServer don't look at
the path of the HTTP request at all; you can POST or
GET from / or /RPC2 or /blahblahblah with the same results.
Security scanners that look for /cgi-bin/phf will therefore report
lots of vulnerabilities.
Fix: add a .rpc_paths attribute to the SimpleXMLRPCServer class,
and report a 404 error if the path isn't on the allowed list.
Possibly-controversial aspect of this change: the default makes only
'/' and '/RPC2' legal. Maybe this will break people's applications
(though I doubt it). We could just set the default to an empty tuple,
which would exactly match the current behaviour.
........
r46579 | andrew.kuchling | 2006-05-31 16:12:47 +0200 (Wed, 31 May 2006) | 1 line
Mention SimpleXMLRPCServer change
........
r46580 | tim.peters | 2006-05-31 16:28:07 +0200 (Wed, 31 May 2006) | 2 lines
Trimmed trailing whitespace.
........
r46581 | tim.peters | 2006-05-31 17:33:22 +0200 (Wed, 31 May 2006) | 4 lines
_range_error(): Speed and simplify (there's no real need for
loops here). Assert that size_t is actually big enough, and
that f->size is at least one. Wrap a long line.
........
r46582 | tim.peters | 2006-05-31 17:34:37 +0200 (Wed, 31 May 2006) | 2 lines
Repaired error in new comment.
........
r46584 | neal.norwitz | 2006-06-01 07:32:49 +0200 (Thu, 01 Jun 2006) | 4 lines
Remove ; at end of macro. There was a compiler recently that warned
about extra semi-colons. It may have been the HP C compiler.
This file will trigger a bunch of those warnings now.
........
r46585 | georg.brandl | 2006-06-01 08:39:19 +0200 (Thu, 01 Jun 2006) | 3 lines
Correctly unpickle 2.4 exceptions via __setstate__ (patch #1498571)
........
r46586 | georg.brandl | 2006-06-01 10:27:32 +0200 (Thu, 01 Jun 2006) | 3 lines
Correctly allocate complex types with tp_alloc. (bug #1498638)
........
r46587 | georg.brandl | 2006-06-01 14:30:46 +0200 (Thu, 01 Jun 2006) | 2 lines
Correctly dispatch Faults in loads (patch #1498627)
........
r46588 | georg.brandl | 2006-06-01 15:00:49 +0200 (Thu, 01 Jun 2006) | 3 lines
Some code style tweaks, and remove apply.
........
r46589 | armin.rigo | 2006-06-01 15:19:12 +0200 (Thu, 01 Jun 2006) | 5 lines
[ 1497053 ] Let dicts propagate the exceptions in user __eq__().
[ 1456209 ] dictresize() vulnerability ( <- backport candidate ).
........
r46590 | tim.peters | 2006-06-01 15:41:46 +0200 (Thu, 01 Jun 2006) | 2 lines
Whitespace normalization.
........
r46591 | tim.peters | 2006-06-01 15:49:23 +0200 (Thu, 01 Jun 2006) | 2 lines
Record bugs 1275608 and 1456209 as being fixed.
........
r46592 | tim.peters | 2006-06-01 15:56:26 +0200 (Thu, 01 Jun 2006) | 5 lines
Re-enable a new empty-string test added during the NFS sprint,
but disabled then because str and unicode strings gave different
results. The implementations were repaired later during the
sprint, but the new test remained disabled.
........
r46594 | tim.peters | 2006-06-01 17:50:44 +0200 (Thu, 01 Jun 2006) | 7 lines
Armin committed his patch while I was reviewing it (I'm sure
he didn't know this), so merged in some changes I made during
review. Nothing material apart from changing a new `mask` local
from int to Py_ssize_t. Mostly this is repairing comments that
were made incorrect, and adding new comments. Also a few
minor code rewrites for clarity or helpful succinctness.
........
r46599 | neal.norwitz | 2006-06-02 06:45:53 +0200 (Fri, 02 Jun 2006) | 1 line
Convert docstrings to comments so regrtest -v prints method names
........
r46600 | neal.norwitz | 2006-06-02 06:50:49 +0200 (Fri, 02 Jun 2006) | 2 lines
Fix memory leak found by valgrind.
........
r46601 | neal.norwitz | 2006-06-02 06:54:52 +0200 (Fri, 02 Jun 2006) | 1 line
More memory leaks from valgrind
........
r46602 | neal.norwitz | 2006-06-02 08:23:00 +0200 (Fri, 02 Jun 2006) | 11 lines
Patch #1357836:
Prevent an invalid memory read from test_coding in case the done flag is set.
In that case, the loop isn't entered. I wonder if rather than setting
the done flag in the cases before the loop, if they should just exit early.
This code looks like it should be refactored.
Backport candidate (also the early break above if decoding_fgets fails)
........
r46603 | martin.blais | 2006-06-02 15:03:43 +0200 (Fri, 02 Jun 2006) | 1 line
Fixed struct test to not use unittest.
........
r46605 | tim.peters | 2006-06-03 01:22:51 +0200 (Sat, 03 Jun 2006) | 10 lines
pprint functions used to sort a dict (by key) if and only if
the output required more than one line. "Small" dicts got
displayed in seemingly random order (the hash-induced order
produced by dict.__repr__). None of this was documented.
Now pprint functions always sort dicts by key, and the docs
promise it.
This was proposed and agreed to during the PyCon 2006 core
sprint -- I just didn't have time for it before now.
........
2006-06-08 11:42:34 -03:00
|
|
|
Building Python using VC++ 8.0
|
|
|
|
|
-------------------------------------
|
|
|
|
|
This directory is used to build Python for Win32 platforms, e.g. Windows
|
|
|
|
|
95, 98 and NT. It requires Microsoft Visual C++ 8.0
|
|
|
|
|
(a.k.a. Visual Studio 2005).
|
|
|
|
|
(For other Windows platforms and compilers, see ../PC/readme.txt.)
|
|
|
|
|
|
|
|
|
|
All you need to do is open the workspace "pcbuild.sln" in MSVC++, select
|
|
|
|
|
the Debug or Release setting (using "Solution Configuration" from
|
|
|
|
|
the "Standard" toolbar"), and build the projects.
|
|
|
|
|
|
|
|
|
|
The proper order to build subprojects:
|
|
|
|
|
|
|
|
|
|
1) pythoncore (this builds the main Python DLL and library files,
|
|
|
|
|
python25.{dll, lib} in Release mode)
|
|
|
|
|
NOTE: in previous releases, this subproject was
|
|
|
|
|
named after the release number, e.g. python20.
|
|
|
|
|
|
|
|
|
|
2) python (this builds the main Python executable,
|
|
|
|
|
python.exe in Release mode)
|
|
|
|
|
|
|
|
|
|
3) the other subprojects, as desired or needed (note: you probably don't
|
|
|
|
|
want to build most of the other subprojects, unless you're building an
|
|
|
|
|
entire Python distribution from scratch, or specifically making changes
|
|
|
|
|
to the subsystems they implement, or are running a Python core buildbot
|
|
|
|
|
test slave; see SUBPROJECTS below)
|
|
|
|
|
|
|
|
|
|
When using the Debug setting, the output files have a _d added to
|
|
|
|
|
their name: python25_d.dll, python_d.exe, parser_d.pyd, and so on.
|
|
|
|
|
|
|
|
|
|
SUBPROJECTS
|
|
|
|
|
-----------
|
|
|
|
|
These subprojects should build out of the box. Subprojects other than the
|
|
|
|
|
main ones (pythoncore, python, pythonw) generally build a DLL (renamed to
|
|
|
|
|
.pyd) from a specific module so that users don't have to load the code
|
|
|
|
|
supporting that module unless they import the module.
|
|
|
|
|
|
|
|
|
|
pythoncore
|
|
|
|
|
.dll and .lib
|
|
|
|
|
pythoncore_pgo
|
|
|
|
|
.dll and .lib, a variant of pythoncore that is optimized through a
|
|
|
|
|
Profile Guided Optimization (PGO), employing pybench as the profile
|
|
|
|
|
case to optimize for. The results are produced as a python25.{dll,lib}
|
|
|
|
|
in the subfolder 'pythoncore_pgo'. To use this instead of the
|
|
|
|
|
standard Python dll place this dll with the python.exe.
|
|
|
|
|
python
|
|
|
|
|
.exe
|
|
|
|
|
pythonw
|
|
|
|
|
pythonw.exe, a variant of python.exe that doesn't pop up a DOS box
|
|
|
|
|
_socket
|
|
|
|
|
socketmodule.c
|
|
|
|
|
_testcapi
|
|
|
|
|
tests of the Python C API, run via Lib/test/test_capi.py, and
|
|
|
|
|
implemented by module Modules/_testcapimodule.c
|
|
|
|
|
pyexpat
|
|
|
|
|
Python wrapper for accelerated XML parsing, which incorporates stable
|
|
|
|
|
code from the Expat project: http://sourceforge.net/projects/expat/
|
|
|
|
|
select
|
|
|
|
|
selectmodule.c
|
|
|
|
|
unicodedata
|
|
|
|
|
large tables of Unicode data
|
|
|
|
|
winsound
|
|
|
|
|
play sounds (typically .wav files) under Windows
|
|
|
|
|
|
|
|
|
|
The following subprojects will generally NOT build out of the box. They
|
|
|
|
|
wrap code Python doesn't control, and you'll need to download the base
|
|
|
|
|
packages first and unpack them into siblings of PCbuilds's parent
|
|
|
|
|
directory; for example, if your PCbuild is .......\dist\src\PCbuild\,
|
|
|
|
|
unpack into new subdirectories of dist\.
|
|
|
|
|
|
|
|
|
|
_tkinter
|
|
|
|
|
Python wrapper for the Tk windowing system. Requires building
|
|
|
|
|
Tcl/Tk first. Following are instructions for Tcl/Tk 8.4.12.
|
|
|
|
|
|
|
|
|
|
Get source
|
|
|
|
|
----------
|
|
|
|
|
In the dist directory, run
|
|
|
|
|
svn export http://svn.python.org/projects/external/tcl8.4.12
|
|
|
|
|
svn export http://svn.python.org/projects/external/tk8.4.12
|
|
|
|
|
svn export http://svn.python.org/projects/external/tix-8.4.0
|
|
|
|
|
|
|
|
|
|
Build Tcl first (done here w/ MSVC 7.1 on Windows XP)
|
|
|
|
|
---------------
|
|
|
|
|
Use "Start -> All Programs -> Microsoft Visual Studio .NET 2003
|
|
|
|
|
-> Visual Studio .NET Tools -> Visual Studio .NET 2003 Command Prompt"
|
|
|
|
|
to get a shell window with the correct environment settings
|
|
|
|
|
cd dist\tcl8.4.12\win
|
|
|
|
|
nmake -f makefile.vc
|
|
|
|
|
nmake -f makefile.vc INSTALLDIR=..\..\tcltk install
|
|
|
|
|
|
|
|
|
|
XXX Should we compile with OPTS=threads?
|
|
|
|
|
|
|
|
|
|
Optional: run tests, via
|
|
|
|
|
nmake -f makefile.vc test
|
|
|
|
|
|
|
|
|
|
On WinXP Pro, wholly up to date as of 30-Aug-2004:
|
|
|
|
|
all.tcl: Total 10678 Passed 9969 Skipped 709 Failed 0
|
|
|
|
|
Sourced 129 Test Files.
|
|
|
|
|
|
|
|
|
|
Build Tk
|
|
|
|
|
--------
|
|
|
|
|
cd dist\tk8.4.12\win
|
|
|
|
|
nmake -f makefile.vc TCLDIR=..\..\tcl8.4.12
|
|
|
|
|
nmake -f makefile.vc TCLDIR=..\..\tcl8.4.12 INSTALLDIR=..\..\tcltk install
|
|
|
|
|
|
|
|
|
|
XXX Should we compile with OPTS=threads?
|
|
|
|
|
|
|
|
|
|
XXX Our installer copies a lot of stuff out of the Tcl/Tk install
|
|
|
|
|
XXX directory. Is all of that really needed for Python use of Tcl/Tk?
|
|
|
|
|
|
|
|
|
|
Optional: run tests, via
|
|
|
|
|
nmake -f makefile.vc TCLDIR=..\..\tcl8.4.12 test
|
|
|
|
|
|
|
|
|
|
On WinXP Pro, wholly up to date as of 30-Aug-2004:
|
|
|
|
|
all.tcl: Total 8420 Passed 6826 Skipped 1581 Failed 13
|
|
|
|
|
Sourced 91 Test Files.
|
|
|
|
|
Files with failing tests: canvImg.test scrollbar.test textWind.test winWm.test
|
|
|
|
|
|
|
|
|
|
Built Tix
|
|
|
|
|
---------
|
|
|
|
|
cd dist\tix-8.4.0\win
|
|
|
|
|
nmake -f python.mak
|
|
|
|
|
nmake -f python.mak install
|
|
|
|
|
|
|
|
|
|
bz2
|
|
|
|
|
Python wrapper for the libbz2 compression library. Homepage
|
|
|
|
|
http://sources.redhat.com/bzip2/
|
|
|
|
|
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
|
|
|
|
|
build bzip2-1.0.3\libbz2.lib by magic before bz2.pyd (or bz2_d.pyd) is
|
|
|
|
|
linked in PCbuild\.
|
|
|
|
|
However, the bz2 project is not smart enough to remove anything under
|
|
|
|
|
bzip2-1.0.3\ when you do a clean, so if you want to rebuild bzip2.lib
|
|
|
|
|
you need to clean up bzip2-1.0.3\ by hand.
|
|
|
|
|
|
|
|
|
|
The build step shouldn't yield any warnings or errors, and should end
|
|
|
|
|
by displaying 6 blocks each terminated with
|
|
|
|
|
FC: no differences encountered
|
|
|
|
|
|
|
|
|
|
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.
|
|
|
|
|
|
|
|
|
|
Get the source code through
|
|
|
|
|
|
|
|
|
|
svn export http://svn.python.org/projects/external/sqlite-source-3.3.4
|
|
|
|
|
|
|
|
|
|
To use the extension module in a Python build tree, copy sqlite3.dll into
|
|
|
|
|
the PCbuild folder.
|
|
|
|
|
|
|
|
|
|
_ssl
|
|
|
|
|
Python wrapper for the secure sockets library.
|
|
|
|
|
|
|
|
|
|
Get the source code through
|
|
|
|
|
|
|
|
|
|
svn export http://svn.python.org/projects/external/openssl-0.9.8a
|
|
|
|
|
|
|
|
|
|
Alternatively, get the latest version from http://www.openssl.org.
|
|
|
|
|
You can (theoretically) use any version of OpenSSL you like - the
|
|
|
|
|
build process will automatically select the latest version.
|
|
|
|
|
|
|
|
|
|
You must also install ActivePerl from
|
|
|
|
|
http://www.activestate.com/Products/ActivePerl/
|
|
|
|
|
as this is used by the OpenSSL build process. Complain to them <wink>.
|
|
|
|
|
|
|
|
|
|
The MSVC project simply invokes PCBuild/build_ssl.py to perform
|
|
|
|
|
the build. This Python script locates and builds your OpenSSL
|
|
|
|
|
installation, then invokes a simple makefile to build the final .pyd.
|
|
|
|
|
|
|
|
|
|
build_ssl.py attempts to catch the most common errors (such as not
|
|
|
|
|
being able to find OpenSSL sources, or not being able to find a Perl
|
|
|
|
|
that works with OpenSSL) and give a reasonable error message.
|
|
|
|
|
If you have a problem that doesn't seem to be handled correctly
|
|
|
|
|
(eg, you know you have ActivePerl but we can't find it), please take
|
|
|
|
|
a peek at build_ssl.py and suggest patches. Note that build_ssl.py
|
|
|
|
|
should be able to be run directly from the command-line.
|
|
|
|
|
|
|
|
|
|
build_ssl.py/MSVC isn't clever enough to clean OpenSSL - you must do
|
|
|
|
|
this by hand.
|
|
|
|
|
|
|
|
|
|
Building for Itanium
|
|
|
|
|
--------------------
|
|
|
|
|
|
|
|
|
|
The project files support a ReleaseItanium configuration which creates
|
|
|
|
|
Win64/Itanium binaries. For this to work, you need to install the Platform
|
|
|
|
|
SDK, in particular the 64-bit support. This includes an Itanium compiler
|
|
|
|
|
(future releases of the SDK likely include an AMD64 compiler as well).
|
|
|
|
|
In addition, you need the Visual Studio plugin for external C compilers,
|
|
|
|
|
from http://sf.net/projects/vsextcomp. The plugin will wrap cl.exe, to
|
|
|
|
|
locate the proper target compiler, and convert compiler options
|
|
|
|
|
accordingly. The project files require atleast version 0.8.
|
|
|
|
|
|
|
|
|
|
Building for AMD64
|
|
|
|
|
------------------
|
|
|
|
|
|
|
|
|
|
The build process for the ReleaseAMD64 configuration is very similar
|
|
|
|
|
to the Itanium configuration; make sure you use the latest version of
|
|
|
|
|
vsextcomp.
|
|
|
|
|
|
|
|
|
|
Building Python Using the free MS Toolkit Compiler
|
|
|
|
|
--------------------------------------------------
|
|
|
|
|
|
|
|
|
|
The build process for Visual C++ can be used almost unchanged with the free MS
|
|
|
|
|
Toolkit Compiler. This provides a way of building Python using freely
|
|
|
|
|
available software.
|
|
|
|
|
|
|
|
|
|
Requirements
|
|
|
|
|
|
|
|
|
|
To build Python, the following tools are required:
|
|
|
|
|
|
|
|
|
|
* The Visual C++ Toolkit Compiler
|
|
|
|
|
from http://msdn.microsoft.com/visualc/vctoolkit2003/
|
|
|
|
|
* A recent Platform SDK
|
|
|
|
|
from http://www.microsoft.com/downloads/details.aspx?FamilyID=484269e2-3b89-47e3-8eb7-1f2be6d7123a
|
|
|
|
|
* The .NET 1.1 SDK
|
|
|
|
|
from http://www.microsoft.com/downloads/details.aspx?FamilyID=9b3a2ca6-3647-4070-9f41-a333c6b9181d
|
|
|
|
|
|
|
|
|
|
[Does anyone have better URLs for the last 2 of these?]
|
|
|
|
|
|
|
|
|
|
The toolkit compiler is needed as it is an optimising compiler (the
|
|
|
|
|
compiler supplied with the .NET SDK is a non-optimising version). The
|
|
|
|
|
platform SDK is needed to provide the Windows header files and libraries
|
|
|
|
|
(the Windows 2003 Server SP1 edition, typical install, is known to work -
|
|
|
|
|
other configurations or versions are probably fine as well). The .NET 1.1
|
|
|
|
|
SDK is needed because it contains a version of msvcrt.dll which links to
|
|
|
|
|
the msvcr71.dll CRT. Note that the .NET 2.0 SDK is NOT acceptable, as it
|
|
|
|
|
references msvcr80.dll.
|
|
|
|
|
|
|
|
|
|
All of the above items should be installed as normal.
|
|
|
|
|
|
|
|
|
|
If you intend to build the openssl (needed for the _ssl extension) you
|
|
|
|
|
will need the C runtime sources installed as part of the platform SDK.
|
|
|
|
|
|
|
|
|
|
In addition, you will need Nant, available from
|
|
|
|
|
http://nant.sourceforge.net. The 0.85 release candidate 3 version is known
|
|
|
|
|
to work. This is the latest released version at the time of writing. Later
|
|
|
|
|
"nightly build" versions are known NOT to work - it is not clear at
|
|
|
|
|
present whether future released versions will work.
|
|
|
|
|
|
|
|
|
|
Setting up the environment
|
|
|
|
|
|
|
|
|
|
Start a platform SDK "build environment window" from the start menu. The
|
|
|
|
|
"Windows XP 32-bit retail" version is known to work.
|
|
|
|
|
|
|
|
|
|
Add the following directories to your PATH:
|
|
|
|
|
* The toolkit compiler directory
|
|
|
|
|
* The SDK "Win64" binaries directory
|
|
|
|
|
* The Nant directory
|
|
|
|
|
Add to your INCLUDE environment variable:
|
|
|
|
|
* The toolkit compiler INCLUDE directory
|
|
|
|
|
Add to your LIB environment variable:
|
|
|
|
|
* The toolkit compiler LIB directory
|
|
|
|
|
* The .NET SDK Visual Studio 2003 VC7\lib directory
|
|
|
|
|
|
|
|
|
|
The following commands should set things up as you need them:
|
|
|
|
|
|
|
|
|
|
rem Set these values according to where you installed the software
|
|
|
|
|
set TOOLKIT=C:\Program Files\Microsoft Visual C++ Toolkit 2003
|
|
|
|
|
set SDK=C:\Program Files\Microsoft Platform SDK
|
|
|
|
|
set NET=C:\Program Files\Microsoft Visual Studio .NET 2003
|
|
|
|
|
set NANT=C:\Utils\Nant
|
|
|
|
|
|
|
|
|
|
set PATH=%TOOLKIT%\bin;%PATH%;%SDK%\Bin\win64;%NANT%\bin
|
|
|
|
|
set INCLUDE=%TOOLKIT%\include;%INCLUDE%
|
|
|
|
|
set LIB=%TOOLKIT%\lib;%NET%\VC7\lib;%LIB%
|
|
|
|
|
|
|
|
|
|
The "win64" directory from the SDK is added to supply executables such as
|
|
|
|
|
"cvtres" and "lib", which are not available elsewhere. The versions in the
|
|
|
|
|
"win64" directory are 32-bit programs, so they are fine to use here.
|
|
|
|
|
|
|
|
|
|
That's it. To build Python (the core only, no binary extensions which
|
|
|
|
|
depend on external libraries) you just need to issue the command
|
|
|
|
|
|
|
|
|
|
nant -buildfile:python.build all
|
|
|
|
|
|
|
|
|
|
from within the PCBuild directory.
|
|
|
|
|
|
|
|
|
|
Extension modules
|
|
|
|
|
|
|
|
|
|
To build those extension modules which require external libraries
|
|
|
|
|
(_tkinter, bz2, _bsddb, _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
|
|
|
|
|
has not been tested.
|
|
|
|
|
|
|
|
|
|
For each extension module you wish to build, you should remove the
|
|
|
|
|
associated include line from the excludeprojects section of pc.build.
|
|
|
|
|
|
|
|
|
|
The changes required are:
|
|
|
|
|
|
|
|
|
|
_tkinter
|
|
|
|
|
The tix makefile (tix-8.4.0\win\makefile.vc) must be modified to
|
|
|
|
|
remove references to TOOLS32. The relevant lines should be changed to
|
|
|
|
|
read:
|
|
|
|
|
cc32 = cl.exe
|
|
|
|
|
link32 = link.exe
|
|
|
|
|
include32 =
|
|
|
|
|
The remainder of the build instructions will work as given.
|
|
|
|
|
|
|
|
|
|
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
|
|
|
|
|
python.exe.
|
|
|
|
|
|
|
|
|
|
_ssl
|
|
|
|
|
The documented build process works as written. However, it needs a
|
|
|
|
|
copy of the file setargv.obj, which is not supplied in the platform
|
|
|
|
|
SDK. However, the sources are available (in the crt source code). To
|
|
|
|
|
build setargv.obj, proceed as follows:
|
|
|
|
|
|
|
|
|
|
Copy setargv.c, cruntime.h and internal.h from %SDK%\src\crt to a
|
|
|
|
|
temporary directory.
|
|
|
|
|
Compile using "cl /c /I. /MD /D_CRTBLD setargv.c"
|
|
|
|
|
Copy the resulting setargv.obj to somewhere on your LIB environment
|
|
|
|
|
(%SDK%\lib is a reasonable place).
|
|
|
|
|
|
|
|
|
|
With setargv.obj in place, the standard build process should work
|
|
|
|
|
fine.
|
|
|
|
|
|
|
|
|
|
YOUR OWN EXTENSION DLLs
|
|
|
|
|
-----------------------
|
|
|
|
|
If you want to create your own extension module DLL, there's an example
|
|
|
|
|
with easy-to-follow instructions in ../PC/example/; read the file
|
|
|
|
|
readme.txt there first.
|