mirror of
https://github.com/python/cpython.git
synced 2025-07-23 19:25:40 +00:00

svn+ssh://pythondev@svn.python.org/python/trunk ........ r53454 | brett.cannon | 2007-01-15 20:12:08 +0100 (Mon, 15 Jan 2007) | 3 lines Add a note for strptime that just because strftime supports some extra directive that is not documented that strptime will as well. ........ r53458 | vinay.sajip | 2007-01-16 10:50:07 +0100 (Tue, 16 Jan 2007) | 1 line Updated rotating file handlers to use _open(). ........ r53459 | marc-andre.lemburg | 2007-01-16 14:03:06 +0100 (Tue, 16 Jan 2007) | 2 lines Add news items for the recent pybench and platform changes. ........ r53460 | sjoerd.mullender | 2007-01-16 17:42:38 +0100 (Tue, 16 Jan 2007) | 4 lines Fixed ntpath.expandvars to not replace references to non-existing variables with nothing. Also added tests. This fixes bug #494589. ........ r53464 | neal.norwitz | 2007-01-17 07:23:51 +0100 (Wed, 17 Jan 2007) | 1 line Give Calvin Spealman access for python-dev summaries. ........ r53465 | neal.norwitz | 2007-01-17 09:37:26 +0100 (Wed, 17 Jan 2007) | 1 line Remove Calvin since he only has access to the website currently. ........ r53466 | thomas.heller | 2007-01-17 10:40:34 +0100 (Wed, 17 Jan 2007) | 2 lines Replace C++ comments with C comments. ........ r53472 | andrew.kuchling | 2007-01-17 20:55:06 +0100 (Wed, 17 Jan 2007) | 1 line [Part of bug #1599254] Add suggestion to Mailbox docs to use Maildir, and warn user to lock/unlock mailboxes when modifying them ........ r53475 | georg.brandl | 2007-01-17 22:09:04 +0100 (Wed, 17 Jan 2007) | 2 lines Bug #1637967: missing //= operator in list. ........ r53477 | georg.brandl | 2007-01-17 22:19:58 +0100 (Wed, 17 Jan 2007) | 2 lines Bug #1629125: fix wrong data type (int -> Py_ssize_t) in PyDict_Next docs. ........ r53481 | neal.norwitz | 2007-01-18 06:40:58 +0100 (Thu, 18 Jan 2007) | 1 line Try reverting part of r53145 that seems to cause the Windows buildbots to fail in test_uu.UUFileTest.test_encode ........ r53482 | fred.drake | 2007-01-18 06:42:30 +0100 (Thu, 18 Jan 2007) | 1 line add missing version entry ........ r53483 | neal.norwitz | 2007-01-18 07:20:55 +0100 (Thu, 18 Jan 2007) | 7 lines This test doesn't pass on Windows. The cause seems to be that chmod doesn't support the same funcationality as on Unix. I'm not sure if this fix is the best (or if it will even work)--it's a test to see if the buildbots start passing again. It might be better to not even run this test if it's windows (or non-posix). ........ r53488 | neal.norwitz | 2007-01-19 06:53:33 +0100 (Fri, 19 Jan 2007) | 1 line SF #1635217, Fix unbalanced paren ........ r53489 | martin.v.loewis | 2007-01-19 07:42:22 +0100 (Fri, 19 Jan 2007) | 3 lines Prefix AST symbols with _Py_. Fixes #1637022. Will backport. ........ r53497 | martin.v.loewis | 2007-01-19 19:01:38 +0100 (Fri, 19 Jan 2007) | 2 lines Add UUIDs for 2.5.1 and 2.5.2 ........ r53499 | raymond.hettinger | 2007-01-19 19:07:18 +0100 (Fri, 19 Jan 2007) | 1 line SF# 1635892: Fix docs for betavariate's input parameters . ........ r53503 | martin.v.loewis | 2007-01-20 15:05:39 +0100 (Sat, 20 Jan 2007) | 2 lines Merge 53501 and 53502 from 25 branch: Add /GS- for AMD64 and Itanium builds where missing. ........ r53504 | walter.doerwald | 2007-01-20 18:28:31 +0100 (Sat, 20 Jan 2007) | 2 lines Port test_resource.py to unittest. ........ r53505 | walter.doerwald | 2007-01-20 19:19:33 +0100 (Sat, 20 Jan 2007) | 2 lines Add argument tests an calls of resource.getrusage(). ........ r53506 | walter.doerwald | 2007-01-20 20:03:17 +0100 (Sat, 20 Jan 2007) | 2 lines resource.RUSAGE_BOTH might not exist. ........ r53507 | walter.doerwald | 2007-01-21 00:07:28 +0100 (Sun, 21 Jan 2007) | 2 lines Port test_new.py to unittest. ........ r53508 | martin.v.loewis | 2007-01-21 10:33:07 +0100 (Sun, 21 Jan 2007) | 2 lines Patch #1610575: Add support for _Bool to struct. ........ r53509 | georg.brandl | 2007-01-21 11:28:43 +0100 (Sun, 21 Jan 2007) | 3 lines Bug #1486663: don't reject keyword arguments for subclasses of builtin types. ........ r53511 | georg.brandl | 2007-01-21 11:35:10 +0100 (Sun, 21 Jan 2007) | 2 lines Patch #1627441: close sockets properly in urllib2. ........ r53517 | georg.brandl | 2007-01-22 20:40:21 +0100 (Mon, 22 Jan 2007) | 3 lines Use new email module names (#1637162, #1637159, #1637157). ........ r53518 | andrew.kuchling | 2007-01-22 21:26:40 +0100 (Mon, 22 Jan 2007) | 1 line Improve pattern used for mbox 'From' lines; add a simple test ........ r53519 | andrew.kuchling | 2007-01-22 21:27:50 +0100 (Mon, 22 Jan 2007) | 1 line Make comment match the code ........ r53522 | georg.brandl | 2007-01-22 22:10:33 +0100 (Mon, 22 Jan 2007) | 2 lines Bug #1249573: fix rfc822.parsedate not accepting a certain date format ........ r53524 | georg.brandl | 2007-01-22 22:23:41 +0100 (Mon, 22 Jan 2007) | 2 lines Bug #1627316: handle error in condition/ignore pdb commands more gracefully. ........ r53526 | lars.gustaebel | 2007-01-23 12:17:33 +0100 (Tue, 23 Jan 2007) | 4 lines Patch #1507247: tarfile.py: use current umask for intermediate directories. ........ r53527 | thomas.wouters | 2007-01-23 14:42:00 +0100 (Tue, 23 Jan 2007) | 13 lines SF patch #1630975: Fix crash when replacing sys.stdout in sitecustomize When running the interpreter in an environment that would cause it to set stdout/stderr/stdin's encoding, having a sitecustomize that would replace them with something other than PyFile objects would crash the interpreter. Fix it by simply ignoring the encoding-setting for non-files. This could do with a test, but I can think of no maintainable and portable way to test this bug, short of adding a sitecustomize.py to the buildsystem and have it always run with it (hmmm....) ........ r53528 | thomas.wouters | 2007-01-23 14:50:49 +0100 (Tue, 23 Jan 2007) | 4 lines Add news entry about last checkin (oops.) ........ r53531 | martin.v.loewis | 2007-01-23 22:11:47 +0100 (Tue, 23 Jan 2007) | 4 lines Make PyTraceBack_Here use the current thread, not the frame's thread state. Fixes #1579370. Will backport. ........ r53535 | brett.cannon | 2007-01-24 00:21:22 +0100 (Wed, 24 Jan 2007) | 5 lines Fix crasher for when an object's __del__ creates a new weakref to itself. Patch only fixes new-style classes; classic classes still buggy. Closes bug #1377858. Already backported. ........ r53536 | walter.doerwald | 2007-01-24 01:42:19 +0100 (Wed, 24 Jan 2007) | 2 lines Port test_popen.py to unittest. ........
181 lines
6.4 KiB
Python
181 lines
6.4 KiB
Python
# Script for building the _ssl and _hashlib modules for Windows.
|
|
# Uses Perl to setup the OpenSSL environment correctly
|
|
# and build OpenSSL, then invokes a simple nmake session
|
|
# for the actual _ssl.pyd and _hashlib.pyd DLLs.
|
|
|
|
# THEORETICALLY, you can:
|
|
# * Unpack the latest SSL release one level above your main Python source
|
|
# directory. It is likely you will already find the zlib library and
|
|
# any other external packages there.
|
|
# * Install ActivePerl and ensure it is somewhere on your path.
|
|
# * Run this script from the PCBuild directory.
|
|
#
|
|
# it should configure and build SSL, then build the _ssl and _hashlib
|
|
# Python extensions without intervention.
|
|
|
|
import os, sys, re
|
|
|
|
# Find all "foo.exe" files on the PATH.
|
|
def find_all_on_path(filename, extras = None):
|
|
entries = os.environ["PATH"].split(os.pathsep)
|
|
ret = []
|
|
for p in entries:
|
|
fname = os.path.abspath(os.path.join(p, filename))
|
|
if os.path.isfile(fname) and fname not in ret:
|
|
ret.append(fname)
|
|
if extras:
|
|
for p in extras:
|
|
fname = os.path.abspath(os.path.join(p, filename))
|
|
if os.path.isfile(fname) and fname not in ret:
|
|
ret.append(fname)
|
|
return ret
|
|
|
|
# Find a suitable Perl installation for OpenSSL.
|
|
# cygwin perl does *not* work. ActivePerl does.
|
|
# Being a Perl dummy, the simplest way I can check is if the "Win32" package
|
|
# is available.
|
|
def find_working_perl(perls):
|
|
for perl in perls:
|
|
fh = os.popen(perl + ' -e "use Win32;"')
|
|
fh.read()
|
|
rc = fh.close()
|
|
if rc:
|
|
continue
|
|
return perl
|
|
print "Can not find a suitable PERL:"
|
|
if perls:
|
|
print " the following perl interpreters were found:"
|
|
for p in perls:
|
|
print " ", p
|
|
print " None of these versions appear suitable for building OpenSSL"
|
|
else:
|
|
print " NO perl interpreters were found on this machine at all!"
|
|
print " Please install ActivePerl and ensure it appears on your path"
|
|
print "The Python SSL module was not built"
|
|
return None
|
|
|
|
# Locate the best SSL directory given a few roots to look into.
|
|
def find_best_ssl_dir(sources):
|
|
candidates = []
|
|
for s in sources:
|
|
try:
|
|
# note: do not abspath s; the build will fail if any
|
|
# higher up directory name has spaces in it.
|
|
fnames = os.listdir(s)
|
|
except os.error:
|
|
fnames = []
|
|
for fname in fnames:
|
|
fqn = os.path.join(s, fname)
|
|
if os.path.isdir(fqn) and fname.startswith("openssl-"):
|
|
candidates.append(fqn)
|
|
# Now we have all the candidates, locate the best.
|
|
best_parts = []
|
|
best_name = None
|
|
for c in candidates:
|
|
parts = re.split("[.-]", os.path.basename(c))[1:]
|
|
# eg - openssl-0.9.7-beta1 - ignore all "beta" or any other qualifiers
|
|
if len(parts) >= 4:
|
|
continue
|
|
if parts > best_parts:
|
|
best_parts = parts
|
|
best_name = c
|
|
if best_name is not None:
|
|
print "Found an SSL directory at '%s'" % (best_name,)
|
|
else:
|
|
print "Could not find an SSL directory in '%s'" % (sources,)
|
|
sys.stdout.flush()
|
|
return best_name
|
|
|
|
def run_configure(configure, do_script):
|
|
os.system("perl Configure "+configure)
|
|
os.system(do_script)
|
|
|
|
def main():
|
|
build_all = "-a" in sys.argv
|
|
if sys.argv[1] == "Release":
|
|
arch = "x86"
|
|
debug = False
|
|
configure = "VC-WIN32"
|
|
do_script = "ms\\do_masm"
|
|
makefile = "ms\\nt.mak"
|
|
elif sys.argv[1] == "Debug":
|
|
arch = "x86"
|
|
debug = True
|
|
configure = "VC-WIN32"
|
|
do_script = "ms\\do_masm"
|
|
makefile="ms\\d32.mak"
|
|
elif sys.argv[1] == "ReleaseItanium":
|
|
arch = "ia64"
|
|
debug = False
|
|
configure = "VC-WIN64I"
|
|
do_script = "ms\\do_win64i"
|
|
makefile = "ms\\nt.mak"
|
|
os.environ["VSEXTCOMP_USECL"] = "MS_ITANIUM"
|
|
elif sys.argv[1] == "ReleaseAMD64":
|
|
arch="amd64"
|
|
debug=False
|
|
configure = "VC-WIN64A"
|
|
do_script = "ms\\do_win64a"
|
|
makefile = "ms\\nt.mak"
|
|
os.environ["VSEXTCOMP_USECL"] = "MS_OPTERON"
|
|
make_flags = ""
|
|
if build_all:
|
|
make_flags = "-a"
|
|
# perl should be on the path, but we also look in "\perl" and "c:\\perl"
|
|
# as "well known" locations
|
|
perls = find_all_on_path("perl.exe", ["\\perl\\bin", "C:\\perl\\bin"])
|
|
perl = find_working_perl(perls)
|
|
if perl is None:
|
|
sys.exit(1)
|
|
|
|
print "Found a working perl at '%s'" % (perl,)
|
|
sys.stdout.flush()
|
|
# Look for SSL 2 levels up from pcbuild - ie, same place zlib etc all live.
|
|
ssl_dir = find_best_ssl_dir(("..\\..",))
|
|
if ssl_dir is None:
|
|
sys.exit(1)
|
|
|
|
old_cd = os.getcwd()
|
|
try:
|
|
os.chdir(ssl_dir)
|
|
# If the ssl makefiles do not exist, we invoke Perl to generate them.
|
|
# Due to a bug in this script, the makefile sometimes ended up empty
|
|
# Force a regeneration if it is.
|
|
if not os.path.isfile(makefile) or os.path.getsize(makefile)==0:
|
|
print "Creating the makefiles..."
|
|
sys.stdout.flush()
|
|
# Put our working Perl at the front of our path
|
|
os.environ["PATH"] = os.path.dirname(perl) + \
|
|
os.pathsep + \
|
|
os.environ["PATH"]
|
|
run_configure(configure, do_script)
|
|
if arch=="x86" and debug:
|
|
# the do_masm script in openssl doesn't generate a debug
|
|
# build makefile so we generate it here:
|
|
os.system("perl util\mk1mf.pl debug "+configure+" >"+makefile)
|
|
|
|
# Now run make.
|
|
makeCommand = "nmake /nologo PERL=\"%s\" -f \"%s\"" %(perl, makefile)
|
|
print "Executing ssl makefiles:", makeCommand
|
|
sys.stdout.flush()
|
|
rc = os.system(makeCommand)
|
|
if rc:
|
|
print "Executing "+makefile+" failed"
|
|
print rc
|
|
sys.exit(rc)
|
|
finally:
|
|
os.chdir(old_cd)
|
|
# And finally, we can build the _ssl module itself for Python.
|
|
defs = "SSL_DIR=\"%s\"" % (ssl_dir,)
|
|
if debug:
|
|
defs = defs + " " + "DEBUG=1"
|
|
if arch in ('amd64', 'ia64'):
|
|
defs = defs + " EXTRA_CFLAGS=/GS-"
|
|
makeCommand = 'nmake /nologo -f _ssl.mak ' + defs + " " + make_flags
|
|
print "Executing:", makeCommand
|
|
sys.stdout.flush()
|
|
rc = os.system(makeCommand)
|
|
sys.exit(rc)
|
|
|
|
if __name__=='__main__':
|
|
main()
|