diff options
| author | Christian Heimes <christian@cheimes.de> | 2008-02-03 16:51:08 (GMT) |
|---|---|---|
| committer | Christian Heimes <christian@cheimes.de> | 2008-02-03 16:51:08 (GMT) |
| commit | 292d351fc1a7dc9feccd412843832808680a631f (patch) | |
| tree | 918a0dea0d70345e0279b9b9649c6e427a076118 /PCbuild | |
| parent | ec17d204f963f37da02e6457f676c57fb66db406 (diff) | |
| download | cpython-292d351fc1a7dc9feccd412843832808680a631f.zip cpython-292d351fc1a7dc9feccd412843832808680a631f.tar.gz cpython-292d351fc1a7dc9feccd412843832808680a631f.tar.bz2 | |
Merged revisions 60481,60485,60489-60520,60523-60527,60530-60533,60535-60538,60540-60551 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
NOTE: I blocked the following revisions:
svnmerge.py block -r 60521,60522,60528,60529,60534,60539
The new tests must be merged with lots of manual work.
........
r60493 | georg.brandl | 2008-02-01 12:59:08 +0100 (Fri, 01 Feb 2008) | 2 lines
Update IPv6 RFC number.
........
r60497 | georg.brandl | 2008-02-01 16:50:15 +0100 (Fri, 01 Feb 2008) | 2 lines
Add link checker builder, written for GHOP by Thomas Lamb.
........
r60500 | georg.brandl | 2008-02-01 19:08:09 +0100 (Fri, 01 Feb 2008) | 2 lines
Rename batch file.
........
r60504 | christian.heimes | 2008-02-01 19:49:26 +0100 (Fri, 01 Feb 2008) | 1 line
More int -> pid_t.
........
r60507 | georg.brandl | 2008-02-01 20:24:01 +0100 (Fri, 01 Feb 2008) | 2 lines
Wording nit.
........
r60510 | georg.brandl | 2008-02-01 21:45:33 +0100 (Fri, 01 Feb 2008) | 2 lines
Update for latest sphinx latex writer.
........
r60511 | raymond.hettinger | 2008-02-01 22:30:23 +0100 (Fri, 01 Feb 2008) | 1 line
Issue #1996: float.as_integer_ratio() should return fraction in lowest terms.
........
r60512 | raymond.hettinger | 2008-02-01 23:15:52 +0100 (Fri, 01 Feb 2008) | 1 line
Integer ratio should return ints instead of longs whereever possible.
........
r60513 | raymond.hettinger | 2008-02-01 23:22:50 +0100 (Fri, 01 Feb 2008) | 1 line
labs() takes a long for an input.
........
r60514 | raymond.hettinger | 2008-02-01 23:42:59 +0100 (Fri, 01 Feb 2008) | 1 line
Test round-trip on float.as_integer_ratio() and float.__truediv__().
........
r60515 | marc-andre.lemburg | 2008-02-01 23:58:17 +0100 (Fri, 01 Feb 2008) | 3 lines
Bump distutils version number to match Python version.
........
r60516 | raymond.hettinger | 2008-02-02 00:12:19 +0100 (Sat, 02 Feb 2008) | 1 line
Fix int/long typecase. Add check for non-binary floating point.
........
r60517 | raymond.hettinger | 2008-02-02 00:45:44 +0100 (Sat, 02 Feb 2008) | 1 line
Add protection from weirdness while scaling the mantissa to an integer.
........
r60518 | raymond.hettinger | 2008-02-02 06:11:40 +0100 (Sat, 02 Feb 2008) | 1 line
Simpler solution to handling non-IEEE 754 environments.
........
r60519 | raymond.hettinger | 2008-02-02 06:24:44 +0100 (Sat, 02 Feb 2008) | 1 line
Neaten-up a bit.
........
r60520 | georg.brandl | 2008-02-02 10:56:20 +0100 (Sat, 02 Feb 2008) | 2 lines
Amendments to the urllib2 docs, written for GHOP by Thomas Lamb.
........
r60525 | georg.brandl | 2008-02-02 11:49:58 +0100 (Sat, 02 Feb 2008) | 3 lines
Add email example how to send a multipart message.
Written for GHOP by Martin Matejek.
........
r60526 | georg.brandl | 2008-02-02 12:05:00 +0100 (Sat, 02 Feb 2008) | 2 lines
Rewrite test_socketserver as unittest, written for GHOP by Benjamin Petersen.
........
r60527 | georg.brandl | 2008-02-02 12:05:34 +0100 (Sat, 02 Feb 2008) | 2 lines
Add GHOP contributor.
........
r60530 | mark.dickinson | 2008-02-02 18:16:13 +0100 (Sat, 02 Feb 2008) | 2 lines
Make the Rational constructor accept '3.' and '.2' as well as '3.2'.
........
r60531 | neal.norwitz | 2008-02-02 19:52:51 +0100 (Sat, 02 Feb 2008) | 1 line
Update the leaky tests (ie, ignore these tests if they report leaks). This version has been running for a while.
........
r60533 | skip.montanaro | 2008-02-02 20:11:57 +0100 (Sat, 02 Feb 2008) | 7 lines
Split the refleak mail body into two parts, the first being those failing
tests which are deemed more important issues, the second those which are
known to have difficult to solve problems and are generally expected to
leak. Hopefully this doesn't break the script...
........
r60535 | georg.brandl | 2008-02-03 01:04:50 +0100 (Sun, 03 Feb 2008) | 3 lines
Wait for a delay before reaping children -- this should fix the
test_socketserver failures on several platforms.
........
r60536 | brett.cannon | 2008-02-03 03:07:55 +0100 (Sun, 03 Feb 2008) | 2 lines
Fix a minor typo.
........
r60537 | brett.cannon | 2008-02-03 03:08:45 +0100 (Sun, 03 Feb 2008) | 3 lines
Directories from CPPFLAGS and LDFLAGS were being added in the reverse order for
searches as to how they were listed in the environment variable.
........
r60538 | brett.cannon | 2008-02-03 03:34:14 +0100 (Sun, 03 Feb 2008) | 2 lines
Remove extra tick marks and add a missing closing parenthesis.
........
r60540 | andrew.macintyre | 2008-02-03 07:58:06 +0100 (Sun, 03 Feb 2008) | 2 lines
Update OS/2 EMX build bits for 2.6.
........
r60541 | andrew.macintyre | 2008-02-03 08:01:11 +0100 (Sun, 03 Feb 2008) | 2 lines
Rename module definition file to reflect v2.6.
........
r60542 | andrew.macintyre | 2008-02-03 08:07:31 +0100 (Sun, 03 Feb 2008) | 6 lines
The wrapper function is supposed to be for spawnvpe() so that's
what we should call [this wrapper only available on OS/2].
Backport candidate to 2.5.
........
r60544 | gregory.p.smith | 2008-02-03 08:20:53 +0100 (Sun, 03 Feb 2008) | 6 lines
Merge this fix from the pybsddb tree:
r293 | jcea | 2008-01-31 01:08:19 -0800 (Thu, 31 Jan 2008) | 4 lines
Solved memory leak when using cursors with
databases without environment.
........
r60546 | gregory.p.smith | 2008-02-03 09:01:46 +0100 (Sun, 03 Feb 2008) | 2 lines
remove a repeated occurance of a hardcoded berkeleydb library version number
........
r60549 | brett.cannon | 2008-02-03 10:59:21 +0100 (Sun, 03 Feb 2008) | 2 lines
Add an entry for r60537.
........
r60550 | georg.brandl | 2008-02-03 13:29:00 +0100 (Sun, 03 Feb 2008) | 2 lines
#2003: fix sentence.
........
r60551 | christian.heimes | 2008-02-03 15:34:18 +0100 (Sun, 03 Feb 2008) | 2 lines
Fixed paths to Windows build directories in build_ext.py
Use vsbuild instead of devenv in build.bat and _bsddb.vcproj
........
Diffstat (limited to 'PCbuild')
| -rw-r--r-- | PCbuild/_bsddb.vcproj | 16 | ||||
| -rw-r--r-- | PCbuild/build.bat | 2 | ||||
| -rw-r--r-- | PCbuild/readme.txt | 10 |
3 files changed, 14 insertions, 14 deletions
diff --git a/PCbuild/_bsddb.vcproj b/PCbuild/_bsddb.vcproj index 205a178..a59c703 100644 --- a/PCbuild/_bsddb.vcproj +++ b/PCbuild/_bsddb.vcproj @@ -52,7 +52,7 @@ /> <Tool Name="VCPreLinkEventTool" - CommandLine="cd $(bsddbDir)
if exist Debug\libdb44sd.lib exit 0
devenv Berkeley_DB.sln /build Debug /project db_static
" + CommandLine="cd $(bsddbDir)
if exist Debug\libdb44sd.lib exit 0
vcbuild /useenv db_static.vcproj "Debug|Win32"
" /> <Tool Name="VCLinkerTool" @@ -115,7 +115,7 @@ /> <Tool Name="VCPreLinkEventTool" - CommandLine="cd $(bsddbDir)
if exist Debug_AMD64\libdb44sd.lib exit 0
devenv Berkeley_DB.sln /build "Debug AMD64" /project db_static /useenv
" + CommandLine="cd $(bsddbDir)
if exist Debug_AMD64\libdb44sd.lib exit 0
vcbuild /useenv db_static.vcproj "Debug AMD64|Win32"
" /> <Tool Name="VCLinkerTool" @@ -178,7 +178,7 @@ /> <Tool Name="VCPreLinkEventTool" - CommandLine="cd $(bsddbDir)
if exist Release\libdb44s.lib exit 0
devenv Berkeley_DB.sln /build Release /project db_static
" + CommandLine="cd $(bsddbDir)
if exist Release\libdb44s.lib exit 0
vcbuild /useenv db_static.vcproj "Release|Win32"
" /> <Tool Name="VCLinkerTool" @@ -242,7 +242,7 @@ /> <Tool Name="VCPreLinkEventTool" - CommandLine="cd $(bsddbDir)
if exist Release_AMD64\libdb44s.lib exit 0
devenv Berkeley_DB.sln /build "Release AMD64" /project db_static /useenv
" + CommandLine="cd $(bsddbDir)
if exist Release_AMD64\libdb44s.lib exit 0
vcbuild /useenv db_static.vcproj "Release AMD64|Win32"
" /> <Tool Name="VCLinkerTool" @@ -305,7 +305,7 @@ /> <Tool Name="VCPreLinkEventTool" - CommandLine="cd $(bsddbDir)
if exist Release\libdb44s.lib exit 0
devenv Berkeley_DB.sln /build Release /project db_static
" + CommandLine="cd $(bsddbDir)
if exist Release\libdb44s.lib exit 0
vcbuild /useenv db_static.vcproj "Release|Win32"
" /> <Tool Name="VCLinkerTool" @@ -369,7 +369,7 @@ /> <Tool Name="VCPreLinkEventTool" - CommandLine="cd $(bsddbDir)
if exist Release_AMD64\libdb44s.lib exit 0
devenv Berkeley_DB.sln /build "Release AMD64" /project db_static /useenv
" + CommandLine="cd $(bsddbDir)
if exist Release_AMD64\libdb44s.lib exit 0
vcbuild /useenv db_static.vcproj "Release AMD64|Win32"
" /> <Tool Name="VCLinkerTool" @@ -433,7 +433,7 @@ /> <Tool Name="VCPreLinkEventTool" - CommandLine="cd $(bsddbDir)
if exist Release\libdb44s.lib exit 0
devenv Berkeley_DB.sln /build Release /project db_static
" + CommandLine="cd $(bsddbDir)
if exist Release\libdb44s.lib exit 0
vcbuild /useenv db_static.vcproj "Release|Win32"
" /> <Tool Name="VCLinkerTool" @@ -497,7 +497,7 @@ /> <Tool Name="VCPreLinkEventTool" - CommandLine="cd $(bsddbDir)
if exist Release_AMD64\libdb44s.lib exit 0
devenv Berkeley_DB.sln /build "Release AMD64" /project db_static /useenv
" + CommandLine="cd $(bsddbDir)
if exist Release_AMD64\libdb44s.lib exit 0
vcbuild /useenv db_static.vcproj "Release AMD64|Win32"
" /> <Tool Name="VCLinkerTool" diff --git a/PCbuild/build.bat b/PCbuild/build.bat index 9bc8186..d181daf 100644 --- a/PCbuild/build.bat +++ b/PCbuild/build.bat @@ -12,6 +12,6 @@ if "%1"=="-c" (set conf=%2) & shift & shift & goto CheckOpts if "%1"=="-p" (set platf=%2) & shift & shift & goto CheckOpts if "%1"=="-r" (set build=/rebuild) & shift & goto CheckOpts -set cmd=devenv pcbuild.sln %build% "%conf%|%platf%" +set cmd=vcbuild /useenv pcbuild.sln %build% "%conf%|%platf%" echo %cmd% %cmd% diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt index 764ab8a..2b2d1f8 100644 --- a/PCbuild/readme.txt +++ b/PCbuild/readme.txt @@ -23,7 +23,6 @@ Solution" or F6 takes care of dependencies except for x64 builds. To make cross compiling x64 builds on a 32bit OS possible the x64 builds require a 32bit version of Python. - NOTE: You probably don't want to build most of the other subprojects, unless you're building an entire Python distribution from scratch, or @@ -192,10 +191,11 @@ _bsddb svn export http://svn.python.org/projects/external/db-4.4.20 Next open the solution file db-4.4.20\build_win32\Berkeley_DB.sln with - Visual Studio and convert the projects to the new format. The standard - and professional version of VS 2008 builds the necessary libraries - in a pre-link step of _bsddb. However the express edition is missing - some pieces and you have to build the libs yourself. + Visual Studio and convert the projects to the new format. VS 2008 + builds the necessary libraries in a pre-link step of _bsddb. You + have to add "$(VCInstallDir)vcpackages" to the search path first + (Tools -> Options -> Projects and Solutions -> VC++ Directories, + Platform: Win32, Show directories for: Executable files). The _bsddb subprojects depends only on the db_static project of Berkeley DB. You have to choose either "Release", "Release AMD64", "Debug" |