Merged revisions 59642-59665 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r59653 | martin.v.loewis | 2008-01-01 22:05:17 +0100 (Tue, 01 Jan 2008) | 3 lines

  Return results from Python callbacks to Tcl as Tcl objects.
  Fixes Tk issue #1851526
........
  r59654 | martin.v.loewis | 2008-01-01 22:08:18 +0100 (Tue, 01 Jan 2008) | 4 lines

  Always convert Text.index result to string.
  This improves compatibility with Tcl 8.5, which would
  otherwise return textindex objects.
........
  r59655 | martin.v.loewis | 2008-01-01 22:09:07 +0100 (Tue, 01 Jan 2008) | 2 lines

  News item for r59653.
........
  r59656 | martin.v.loewis | 2008-01-02 00:00:00 +0100 (Wed, 02 Jan 2008) | 1 line

  Don't link with Tix; Tix is loaded dynamically by Tcl.
........
  r59657 | martin.v.loewis | 2008-01-02 00:00:48 +0100 (Wed, 02 Jan 2008) | 1 line

  Use Visual Studio 2009 on the build slaves.
........
  r59658 | martin.v.loewis | 2008-01-02 00:36:24 +0100 (Wed, 02 Jan 2008) | 1 line

  Test in PCbuild directory.
........
  r59661 | kurt.kaiser | 2008-01-02 05:11:28 +0100 (Wed, 02 Jan 2008) | 6 lines

  Issue1177
  r58207 and r58247 patch logic is reversed.  I noticed this when I
  tried to use urllib to retrieve a file which required auth.

  Fix that and add a test for 401 error to verify.
........
  r59662 | kurt.kaiser | 2008-01-02 06:23:38 +0100 (Wed, 02 Jan 2008) | 2 lines

  Change docstrings to comments so test output will display normally.
........
  r59665 | christian.heimes | 2008-01-02 18:43:40 +0100 (Wed, 02 Jan 2008) | 5 lines

  Removed PCbuild8/ directory and added a new build directory for VS 2005
  based on the VS 2008 build directory to PC/VS8.0. The script
  PCbuild/vs8to9.py was added to sync changes from PCbuild to PC/VS8.0.

  Kristjan, the initial creator of the PCbuild8 directory is fine with the replacement. I've moved the new version of the VS 2005 build directory next to the other legacy build directories. The new sync script is based on the work of wreck and syncs changes in the project, property and solution files.
........

6 files changed, 31 insertions, 25 deletions

diff --git a/Tools/buildbot/build.bat b/Tools/buildbot/build.bat
index f64c2192eb..69edef20a9 100644
--- a/Tools/buildbot/build.bat
+++ b/Tools/buildbot/build.bat
@@ -1,5 +1,6 @@
 @rem Used by the buildbot "compile" step.
 cmd /c Tools\buildbot\external.bat
-call "%VS71COMNTOOLS%vsvars32.bat"
+call "%VS90COMNTOOLS%vsvars32.bat"
 cmd /q/c Tools\buildbot\kill_python.bat
-devenv.com /useenv /build Debug PC\VS7.1\pcbuild.sln
+vcbuild /useenv PCbuild\pcbuild.sln "Debug|Win32"
+
diff --git a/Tools/buildbot/buildmsi.bat b/Tools/buildbot/buildmsi.bat
index c30faee8ba..c0537b4c06 100644
--- a/Tools/buildbot/buildmsi.bat
+++ b/Tools/buildbot/buildmsi.bat
@@ -2,14 +2,14 @@
 
 cmd /c Tools\buildbot\external.bat
 @rem build release versions of things
-call "%VS71COMNTOOLS%vsvars32.bat"
+call "%VS90COMNTOOLS%vsvars32.bat"
 if not exist ..\db-4.4.20\build_win32\release\libdb44s.lib (
    devenv ..\db-4.4.20\build_win32\Berkeley_DB.sln /build Release /project db_static
 )
 
 @rem build Python
 cmd /q/c Tools\buildbot\kill_python.bat
-devenv.com /useenv /build Release PC\VS7.1\pcbuild.sln
+devenv.com /useenv /build Release PCbuild\pcbuild.sln
 
 @rem build the documentation
 bash.exe -c 'cd Doc;make PYTHON=python2.5 update htmlhelp'
diff --git a/Tools/buildbot/clean.bat b/Tools/buildbot/clean.bat
index 7101b533d8..15d7365068 100644
--- a/Tools/buildbot/clean.bat
+++ b/Tools/buildbot/clean.bat
@@ -1,7 +1,7 @@
 @rem Used by the buildbot "clean" step.
-call "%VS71COMNTOOLS%vsvars32.bat"
-cd PC\VS7.1
+call "%VS90COMNTOOLS%vsvars32.bat"
+cd PCbuild
 @echo Deleting .pyc/.pyo files ...
 del /s Lib\*.pyc Lib\*.pyo
-devenv.com /clean Release pcbuild.sln
-devenv.com /clean Debug pcbuild.sln
+vcbuild /clean pcbuild.sln "Release|Win32"
+vcbuild /clean pcbuild.sln "Debug|Win32"
diff --git a/Tools/buildbot/external.bat b/Tools/buildbot/external.bat
index 463285fa49..9797aa25f9 100644
--- a/Tools/buildbot/external.bat
+++ b/Tools/buildbot/external.bat
@@ -2,7 +2,7 @@
 

 @rem Assume we start inside the Python source directory

 cd ..

-call "%VS71COMNTOOLS%vsvars32.bat"

+call "%VS90COMNTOOLS%vsvars32.bat"

 

 @rem bzip

 if not exist bzip2-1.0.3 svn export http://svn.python.org/projects/external/bzip2-1.0.3

@@ -10,24 +10,29 @@ if not exist bzip2-1.0.3 svn export http://svn.python.org/projects/external/bzip
 @rem Sleepycat db

 if not exist db-4.4.20 svn export http://svn.python.org/projects/external/db-4.4.20

 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

+   vcbuild 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

+if not exist openssl-0.9.8g (

+  if exist openssl-0.9.8a rd /s/q openssl-0.9.8a

+  svn export http://svn.python.org/projects/external/openssl-0.9.8g

+)

 

 @rem tcltk

-if not exist tcl8.4.12 (

+if not exist tcl8.4.16 (

    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

+   if exist tcl8.4.12 rd /s/q tcl8.4.12

+   if exist tk8.4.12 rd /s/q tk8.4.12

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

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

+   cd tcl8.4.16\win

+   nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500

+   nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 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

+   cd tk8.4.16\win

+   nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 TCLDIR=..\..\tcl8.4.16

+   nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 TCLDIR=..\..\tcl8.4.16 INSTALLDIR=..\..\tcltk install

    cd ..\..

 )

 

diff --git a/Tools/buildbot/kill_python.c b/Tools/buildbot/kill_python.c
index fd707da6d5..5ba450f302 100644
--- a/Tools/buildbot/kill_python.c
+++ b/Tools/buildbot/kill_python.c
@@ -1,4 +1,4 @@
-/* This program looks for processes which have build\PC\VS7.1\python.exe
+/* This program looks for processes which have build\PCbuild\python.exe
    in their path and terminates them. */
 #include <windows.h>
 #include <psapi.h>
@@ -46,14 +46,14 @@ int main()
 		/* Check if we are running a buildbot version of Python.
 
 		   On Windows, this will always be a debug build from the
-		   PC\VS7.1 directory.  build\\PC\\VS7.1\\python_d.exe
+		   PCbuild directory.  build\\PCbuild\\python_d.exe
 		   
 		   On Cygwin, the pathname is similar to other Unixes.
 		   Use \\build\\python.exe to ensure we don't match
-		   PC\\VS7.1\\python.exe which could be a normal instance
+		   PCbuild\\python.exe which could be a normal instance
 		   of Python running on vanilla Windows.
 		*/
-		if ((strstr(path, "build\\pc\\vs7.1\\python_d.exe") != NULL) ||
+		if ((strstr(path, "pcbuild\\python_d.exe") != NULL) ||
 		    (strstr(path, "\\build\\python.exe") != NULL)) {
 			printf("Terminating %s (pid %d)\n", path, pids[i]);
 			if (!TerminateProcess(hProcess, 1)) {
diff --git a/Tools/buildbot/test.bat b/Tools/buildbot/test.bat
index 680ef98ea3..51569d24e2 100644
--- a/Tools/buildbot/test.bat
+++ b/Tools/buildbot/test.bat
@@ -1,3 +1,3 @@
 @rem Used by the buildbot "test" step.
-cd PC\VS7.1
+cd PCbuild
 call rt.bat -d -q -uall -rw -n