diff -r 1e9fa629756c PCbuild/readme.txt
--- a/PCbuild/readme.txt	Mon Feb 11 20:33:24 2013 +0200
+++ b/PCbuild/readme.txt	Wed Feb 13 19:56:07 2013 -0600
@@ -189,10 +189,7 @@
 such, a little more work is required in order to download the relevant source 
 files for each project before they can be built.  The buildbots do this each
 time they're built, so the easiest approach is to run either external.bat or 
-external-amd64.bat in the ..\Tools\buildbot directory from ..\, i.e.:
-
-    C:\..\svn.python.org\projects\python\trunk\PCbuild>cd ..
-    C:\..\svn.python.org\projects\python\trunk>Tools\buildbot\external.bat
+external-amd64.bat in the ..\Tools\buildbot directory.
 
 This extracts all the external subprojects from http://svn.python.org/external
 via Subversion (so you'll need an svn.exe on your PATH) and places them in 
diff -r 1e9fa629756c Tools/buildbot/build-amd64.bat
--- a/Tools/buildbot/build-amd64.bat	Mon Feb 11 20:33:24 2013 +0200
+++ b/Tools/buildbot/build-amd64.bat	Wed Feb 13 19:56:07 2013 -0600
@@ -1,7 +1,9 @@
 @rem Used by the buildbot "compile" step.
+pushd "%~dp0..\.."
 cmd /c Tools\buildbot\external-amd64.bat
 call "%VS100COMNTOOLS%\..\..\VC\vcvarsall.bat" x86_amd64
 cmd /c Tools\buildbot\clean-amd64.bat
 msbuild PCbuild\kill_python.vcxproj /p:Configuration=Debug /p:PlatformTarget=x64
 PCbuild\amd64\kill_python_d.exe
 msbuild PCbuild\pcbuild.sln /p:Configuration=Debug /p:Platform=x64
+popd
diff -r 1e9fa629756c Tools/buildbot/build.bat
--- a/Tools/buildbot/build.bat	Mon Feb 11 20:33:24 2013 +0200
+++ b/Tools/buildbot/build.bat	Wed Feb 13 19:56:07 2013 -0600
@@ -1,8 +1,9 @@
 @rem Used by the buildbot "compile" step.
+pushd "%~dp0..\.."
 cmd /c Tools\buildbot\external.bat
 call "%VS100COMNTOOLS%vsvars32.bat"
 cmd /c Tools\buildbot\clean.bat
 msbuild PCbuild\kill_python.vcxproj /p:Configuration=Debug /p:PlatformTarget=x86
 PCbuild\kill_python_d.exe
 msbuild PCbuild\pcbuild.sln /p:Configuration=Debug /p:Platform=Win32
-
+popd
diff -r 1e9fa629756c Tools/buildbot/buildmsi.bat
--- a/Tools/buildbot/buildmsi.bat	Mon Feb 11 20:33:24 2013 +0200
+++ b/Tools/buildbot/buildmsi.bat	Wed Feb 13 19:56:07 2013 -0600
@@ -1,5 +1,5 @@
 @rem Used by the buildbot "buildmsi" step.
-
+pushd "%~dp0..\.."
 cmd /c Tools\buildbot\external.bat
 @rem build release versions of things
 call "%VS100COMNTOOLS%vsvars32.bat"
@@ -19,3 +19,4 @@
 nmake /f msisupport.mak
 %HOST_PYTHON% msi.py
 
+popd
diff -r 1e9fa629756c Tools/buildbot/clean-amd64.bat
--- a/Tools/buildbot/clean-amd64.bat	Mon Feb 11 20:33:24 2013 +0200
+++ b/Tools/buildbot/clean-amd64.bat	Wed Feb 13 19:56:07 2013 -0600
@@ -1,5 +1,6 @@
 @rem Used by the buildbot "clean" step.
 call "%VS100COMNTOOLS%\..\..\VC\vcvarsall.bat" x86_amd64
+pushd "%~dp0..\.."
 @echo Deleting .pyc/.pyo files ...
 del /s Lib\*.pyc Lib\*.pyo
 @echo Deleting test leftovers ...
@@ -7,4 +8,4 @@
 cd PCbuild
 msbuild /target:clean pcbuild.sln /p:Configuration=Release /p:PlatformTarget=x64
 msbuild /target:clean pcbuild.sln /p:Configuration=Debug /p:PlatformTarget=x64
-cd ..
+popd
diff -r 1e9fa629756c Tools/buildbot/clean.bat
--- a/Tools/buildbot/clean.bat	Mon Feb 11 20:33:24 2013 +0200
+++ b/Tools/buildbot/clean.bat	Wed Feb 13 19:56:07 2013 -0600
@@ -1,8 +1,9 @@
 @rem Used by the buildbot "clean" step.
 call "%VS100COMNTOOLS%vsvars32.bat"
+pushd "%~dp0..\.."
 @echo Deleting test leftovers ...
 rmdir /s /q build
 cd PCbuild
 msbuild /target:clean pcbuild.sln /p:Configuration=Release /p:PlatformTarget=x86
 msbuild /target:clean pcbuild.sln /p:Configuration=Debug /p:PlatformTarget=x86
-cd ..
+popd
diff -r 1e9fa629756c Tools/buildbot/external-amd64.bat
--- a/Tools/buildbot/external-amd64.bat	Mon Feb 11 20:33:24 2013 +0200
+++ b/Tools/buildbot/external-amd64.bat	Wed Feb 13 19:56:07 2013 -0600
@@ -1,9 +1,11 @@
 @rem Fetches (and builds if necessary) external dependencies
 
-@rem Assume we start inside the Python source directory
+pushd "%~dp0..\.."
 call "Tools\buildbot\external-common.bat"
 call "%VS100COMNTOOLS%\..\..\VC\vcvarsall.bat" x86_amd64
 
+cd ..
+
 if not exist tcltk64\bin\tcl85g.dll (
     cd tcl-8.5.11.0\win
     nmake -f makefile.vc DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 clean all
@@ -12,10 +14,11 @@
 )
 
 if not exist tcltk64\bin\tk85g.dll (
-    cd tk-8.5.11.0\win    
+    cd tk-8.5.11.0\win
     nmake -f makefile.vc OPTS=noxp DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 TCLDIR=..\..\tcl-8.5.11.0 clean
     nmake -f makefile.vc OPTS=noxp DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 TCLDIR=..\..\tcl-8.5.11.0 all
     nmake -f makefile.vc OPTS=noxp DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 TCLDIR=..\..\tcl-8.5.11.0 install
     cd ..\..
 )
 
+popd
diff -r 1e9fa629756c Tools/buildbot/external-common.bat
--- a/Tools/buildbot/external-common.bat	Mon Feb 11 20:33:24 2013 +0200
+++ b/Tools/buildbot/external-common.bat	Wed Feb 13 19:56:07 2013 -0600
@@ -1,7 +1,8 @@
 @rem Common file shared between external.bat and external-amd64.bat.  Responsible for
 @rem fetching external components into the root\.. buildbot directories.
 
-cd ..
+pushd "%~dp0..\..\.."
+
 @rem XXX: If you need to force the buildbots to start from a fresh environment, uncomment
 @rem the following, check it in, then check it out, comment it out, then check it back in.
 @rem if exist bzip2-1.0.6 rd /s/q bzip2-1.0.6
@@ -15,7 +16,7 @@
 @rem if exist tk-8.4.18.1 rd /s/q tk-8.4.18.1
 @rem if exist db-4.4.20 rd /s/q db-4.4.20
 @rem if exist openssl-1.0.1c rd /s/q openssl-1.0.1c
-@rem if exist sqlite-3.7.12 rd /s/q sqlite-3.7.12    
+@rem if exist sqlite-3.7.12 rd /s/q sqlite-3.7.12
 
 @rem bzip
 if not exist bzip2-1.0.6 (
@@ -46,3 +47,5 @@
 if not exist xz-5.0.3 (
   svn export http://svn.python.org/projects/external/xz-5.0.3
 )
+
+popd
diff -r 1e9fa629756c Tools/buildbot/external.bat
--- a/Tools/buildbot/external.bat	Mon Feb 11 20:33:24 2013 +0200
+++ b/Tools/buildbot/external.bat	Wed Feb 13 19:56:07 2013 -0600
@@ -1,13 +1,15 @@
 @rem Fetches (and builds if necessary) external dependencies
 
-@rem Assume we start inside the Python source directory
+pushd "%~dp0..\.."
 call "Tools\buildbot\external-common.bat"
 call "%VS100COMNTOOLS%\vsvars32.bat"
 
+cd ..
+
 if not exist tcltk\bin\tcl85g.dll (
     @rem all and install need to be separate invocations, otherwise nmakehlp is not found on install
     cd tcl-8.5.11.0\win
-    nmake -f makefile.vc DEBUG=1 INSTALLDIR=..\..\tcltk clean all 
+    nmake -f makefile.vc DEBUG=1 INSTALLDIR=..\..\tcltk clean all
     nmake -f makefile.vc DEBUG=1 INSTALLDIR=..\..\tcltk install
     cd ..\..
 )
@@ -19,3 +21,5 @@
     nmake -f makefile.vc OPTS=noxp DEBUG=1 INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl-8.5.11.0 install
     cd ..\..
 )
+
+popd
diff -r 1e9fa629756c Tools/buildbot/test-amd64.bat
--- a/Tools/buildbot/test-amd64.bat	Mon Feb 11 20:33:24 2013 +0200
+++ b/Tools/buildbot/test-amd64.bat	Wed Feb 13 19:56:07 2013 -0600
@@ -1,3 +1,4 @@
 @rem Used by the buildbot "test" step.
-cd PCbuild
+pushd "%~dp0..\..\PCbuild"
 call rt.bat -d -q -x64 -uall -rwW -n %1 %2 %3 %4 %5 %6 %7 %8 %9
+popd
diff -r 1e9fa629756c Tools/buildbot/test.bat
--- a/Tools/buildbot/test.bat	Mon Feb 11 20:33:24 2013 +0200
+++ b/Tools/buildbot/test.bat	Wed Feb 13 19:56:07 2013 -0600
@@ -1,3 +1,4 @@
 @rem Used by the buildbot "test" step.
-cd PCbuild
+pushd "%~dp0..\..\PCbuild"
 call rt.bat -d -q -uall -rwW -n %1 %2 %3 %4 %5 %6 %7 %8 %9
+popd