Merge p3yk branch with the trunk up to revision 45595. This breaks a fair

number of tests, all because of the codecs/_multibytecodecs issue described
here (it's not a Py3K issue, just something Py3K discovers):
http://mail.python.org/pipermail/python-dev/2006-April/064051.html

Hye-Shik Chang promised to look for a fix, so no need to fix it here. The
tests that are expected to break are:

test_codecencodings_cn
test_codecencodings_hk
test_codecencodings_jp
test_codecencodings_kr
test_codecencodings_tw
test_codecs
test_multibytecodec

This merge fixes an actual test failure (test_weakref) in this branch,
though, so I believe merging is the right thing to do anyway.

1 files changed, 21 insertions, 0 deletions

diff --git a/Tools/buildbot/external.bat b/Tools/buildbot/external.bat
index 1b032ae..c6d252d 100644
--- a/Tools/buildbot/external.bat
+++ b/Tools/buildbot/external.bat
@@ -12,3 +12,24 @@ if not exist db-4.4.20 svn export http://svn.python.org/projects/external/db-4.4
 if not exist db-4.4.20\build_win32\debug\libdb44sd.lib (

    devenv db-4.4.20\build_win32\Berkeley_DB.sln /build Debug /project db_static

 )

+

+@rem OpenSSL

+if not exist openssl-0.9.8a svn export http://svn.python.org/projects/external/openssl-0.9.8a

+

+@rem tcltk

+if not exist tcl8.4.12 (

+   if exist tcltk rd /s/q tcltk

+   svn export http://svn.python.org/projects/external/tcl8.4.12

+   svn export http://svn.python.org/projects/external/tk8.4.12

+   cd tcl8.4.12\win

+   nmake -f makefile.vc

+   nmake -f makefile.vc INSTALLDIR=..\..\tcltk install

+   cd ..\..

+   cd tk8.4.12\win

+   nmake -f makefile.vc TCLDIR=..\..\tcl8.4.12

+   nmake -f makefile.vc TCLDIR=..\..\tcl8.4.12 INSTALLDIR=..\..\tcltk install

+)

+

+@rem sqlite

+if not exist sqlite-source-3.3.4 svn export http://svn.python.org/projects/external/sqlite-source-3.3.4

+if not exist build\PCbuild\sqlite3.dll copy sqlite-source-3.3.4\sqlite3.dll build\PCbuild