Fix paths for build bot

diff --git a/PC/VS7.1/build_ssl.py b/PC/VS7.1/build_ssl.py
index 96809b3daef085d2075b39e79324089bdf27a512..2e9f4e3bd06382b6d9006f0e27c38a0f4112dd4e 100644 (file)
--- a/PC/VS7.1/build_ssl.py
+++ b/PC/VS7.1/build_ssl.py
@@ -131,7 +131,7 @@ def main():
     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(("..\\..",))
+    ssl_dir = find_best_ssl_dir(("..\\..\\..",))
     if ssl_dir is None:
         sys.exit(1)
 

diff --git a/PC/VS7.1/rt.bat b/PC/VS7.1/rt.bat
index 8e386c5856694dba0fc9c043cc562b603c5450ad..29801d29269a85d3043d1e20c824bd3c944515a2 100755 (executable)
--- a/PC/VS7.1/rt.bat
+++ b/PC/VS7.1/rt.bat
@@ -10,11 +10,11 @@ rem All leading instances of these switches are shifted off, and
 rem whatever remains is passed to regrtest.py.  For example,
 rem     rt -O -d -x test_thread
 rem runs
-rem     python_d -O ../lib/test/regrtest.py -x test_thread
+rem     python_d -O ../../lib/test/regrtest.py -x test_thread
 rem twice, and
 rem     rt -q -g test_binascii
 rem runs
-rem     python_d ../lib/test/regrtest.py -g test_binascii
+rem     python_d ../../lib/test/regrtest.py -g test_binascii
 rem to generate the expected-output file for binascii quickly.
 rem
 rem Confusing:  if you want to pass a comma-separated list, like
@@ -27,14 +27,14 @@ setlocal
 set exe=python
 set qmode=
 set dashO=
-PATH %PATH%;..\..\tcltk\bin
+PATH %PATH%;..\..\..\tcltk\bin
 
 :CheckOpts
 if "%1"=="-O" (set dashO=-O)     & shift & goto CheckOpts
 if "%1"=="-q" (set qmode=yes)    & shift & goto CheckOpts
 if "%1"=="-d" (set exe=python_d) & shift & goto CheckOpts
 
-set cmd=%exe% %dashO% -E -tt ../lib/test/regrtest.py %1 %2 %3 %4 %5 %6 %7 %8 %9
+set cmd=%exe% %dashO% -E -tt ../../lib/test/regrtest.py %1 %2 %3 %4 %5 %6 %7 %8 %9
 if defined qmode goto Qmode
 
 echo Deleting .pyc/.pyo files ...

diff --git a/Tools/buildbot/build-amd64.bat b/Tools/buildbot/build-amd64.bat
index 88edd8d30323f5c9f02b0cafc7ea5c3acbcfa78b..cddd3dde6e4504660c214c75d288a9ae83b69dd9 100644 (file)
--- a/Tools/buildbot/build-amd64.bat
+++ b/Tools/buildbot/build-amd64.bat
@@ -3,4 +3,4 @@ setlocal
 cmd /c Tools\buildbot\external-amd64.bat
 call "%VS71COMNTOOLS%vsvars32.bat"
 REM cmd /q/c Tools\buildbot\kill_python.bat
-devenv.com /build ReleaseAMD64 PCbuild\pcbuild.sln
+devenv.com /build ReleaseAMD64 PC\VS7.1\pcbuild.sln

diff --git a/Tools/buildbot/build.bat b/Tools/buildbot/build.bat
index e96323c5b9e615a239093f9ca00ab0dc02c550f4..f64c2192ebd209bac4ad46e4eafcd835e92ae34f 100644 (file)
--- a/Tools/buildbot/build.bat
+++ b/Tools/buildbot/build.bat
@@ -2,4 +2,4 @@
 cmd /c Tools\buildbot\external.bat
 call "%VS71COMNTOOLS%vsvars32.bat"
 cmd /q/c Tools\buildbot\kill_python.bat
-devenv.com /useenv /build Debug PCbuild\pcbuild.sln
+devenv.com /useenv /build Debug PC\VS7.1\pcbuild.sln

diff --git a/Tools/buildbot/buildmsi.bat b/Tools/buildbot/buildmsi.bat
index 8adea48e31b9c4d388dd802ba1e8359a348b67f2..c30faee8ba4d783221a816d3aecf694f41da135e 100644 (file)
--- a/Tools/buildbot/buildmsi.bat
+++ b/Tools/buildbot/buildmsi.bat
@@ -9,7 +9,7 @@ if not exist ..\db-4.4.20\build_win32\release\libdb44s.lib (
 
 @rem build Python
 cmd /q/c Tools\buildbot\kill_python.bat
-devenv.com /useenv /build Release PCbuild\pcbuild.sln
+devenv.com /useenv /build Release PC\VS7.1\pcbuild.sln
 
 @rem build the documentation
 bash.exe -c 'cd Doc;make PYTHON=python2.5 update htmlhelp'

diff --git a/Tools/buildbot/clean-amd64.bat b/Tools/buildbot/clean-amd64.bat
index 7ef5e02fb6775df3cd27eb7528e1e78a28992778..e828c886eadc04eb74a6a915d9fdd75526897e35 100644 (file)
--- a/Tools/buildbot/clean-amd64.bat
+++ b/Tools/buildbot/clean-amd64.bat
@@ -1,6 +1,6 @@
 @rem Used by the buildbot "clean" step.
 call "%VS71COMNTOOLS%vsvars32.bat"
-cd PCbuild
+cd PC\VS7.1
 @echo Deleting .pyc/.pyo files ...
 python.exe rmpyc.py
 devenv.com /clean ReleaseAMD64 pcbuild.sln

diff --git a/Tools/buildbot/clean.bat b/Tools/buildbot/clean.bat
index 19400a9f9460d16e23b504897ec0ccc6e771d252..5e7e7908941c0e0d02baa4616c2ea3c9b8145daa 100644 (file)
--- a/Tools/buildbot/clean.bat
+++ b/Tools/buildbot/clean.bat
@@ -1,6 +1,6 @@
 @rem Used by the buildbot "clean" step.
 call "%VS71COMNTOOLS%vsvars32.bat"
-cd PCbuild
+cd PC\VS7.1
 @echo Deleting .pyc/.pyo files ...
 python_d.exe rmpyc.py
 devenv.com /clean Release pcbuild.sln

diff --git a/Tools/buildbot/kill_python.c b/Tools/buildbot/kill_python.c
index 023ff2deffca401ba723810c6c59534cac18efb4..fd707da6d588e23579c2460ad49b41b966528dbc 100644 (file)
--- a/Tools/buildbot/kill_python.c
+++ b/Tools/buildbot/kill_python.c
@@ -1,4 +1,4 @@
-/* This program looks for processes which have build\PCbuild\python.exe
+/* This program looks for processes which have build\PC\VS7.1\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
-                  PCbuild directory.  build\\PCbuild\\python_d.exe
+                  PC\VS7.1 directory.  build\\PC\\VS7.1\\python_d.exe
                   
                   On Cygwin, the pathname is similar to other Unixes.
                   Use \\build\\python.exe to ensure we don't match
-                  PCbuild\\python.exe which could be a normal instance
+                  PC\\VS7.1\\python.exe which could be a normal instance
                   of Python running on vanilla Windows.
                */
-               if ((strstr(path, "build\\pcbuild\\python_d.exe") != NULL) ||
+               if ((strstr(path, "build\\pc\\vs7.1\\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-amd64.bat b/Tools/buildbot/test-amd64.bat
index 6995ece5be977259457fdefc7b28ac6c7a1852a1..9cb6968ecc528af90349b0770f4c1b28161f2044 100644 (file)
--- a/Tools/buildbot/test-amd64.bat
+++ b/Tools/buildbot/test-amd64.bat
@@ -1,3 +1,3 @@
 @rem Used by the buildbot "test" step.
-cd PCbuild
+cd PC\VS7.1
 call rt.bat -q -uall -rw

diff --git a/Tools/buildbot/test.bat b/Tools/buildbot/test.bat
index c8b1937ca4e569cd91b54c69579851fb11a8ab58..ea4e8d5c5227f65f253d9456702988e18637ff58 100644 (file)
--- a/Tools/buildbot/test.bat
+++ b/Tools/buildbot/test.bat
@@ -1,3 +1,3 @@
 @rem Used by the buildbot "test" step.
-cd PCbuild
+cd PC\VS7.1
 call rt.bat -d -q -uall -rw