Merged revisions 84857,84870,84875 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r84857 | hirokazu.yamamoto | 2010-09-17 17:53:31 +0900 | 1 line

  Let's see if tcl/tk test runs on windows buildbot with this fix.
........
  r84870 | hirokazu.yamamoto | 2010-09-18 09:31:44 +0900 | 3 lines

  regrtest.py now runs python in build/test_python_xxx. (deeper than here)
  So failed to load tcl/tk dll because $(dist)/tcltk/bin was set to PATH as
  relative path. (Windows)
........
  r84875 | hirokazu.yamamoto | 2010-09-18 13:02:52 +0900 | 1 line

  Applied r84870 to older compilers.
........

diff --git a/PC/VS7.1/rt.bat b/PC/VS7.1/rt.bat
index 29801d29269a85d3043d1e20c824bd3c944515a2..f05cf238a2f45ebf3c6fa1508125e194489bbce5 100755 (executable)
--- a/PC/VS7.1/rt.bat
+++ b/PC/VS7.1/rt.bat
@@ -27,7 +27,7 @@ setlocal
 set exe=python
 set qmode=
 set dashO=
-PATH %PATH%;..\..\..\tcltk\bin
+PATH %PATH%;%~dp0..\..\..\tcltk\bin
 
 :CheckOpts
 if "%1"=="-O" (set dashO=-O)     & shift & goto CheckOpts

diff --git a/PC/VS8.0/rt.bat b/PC/VS8.0/rt.bat
index 90fd794421d638e0bdecf1c6fa7ebf44b86d8ceb..2e0a681771081ba6033684b1999d4de0835f8e53 100644 (file)
--- a/PC/VS8.0/rt.bat
+++ b/PC/VS8.0/rt.bat
@@ -27,7 +27,7 @@ setlocal
 set exe=python\r
 set qmode=\r
 set dashO=\r
-PATH %PATH%;..\..\..\tcltk\bin\r
+PATH %PATH%;%~dp0..\..\..\tcltk\bin\r
 \r
 :CheckOpts\r
 if "%1"=="-O" (set dashO=-O)     & shift & goto CheckOpts\r

diff --git a/PCbuild/rt.bat b/PCbuild/rt.bat
index ee1661a21ab52a4dc2920fffd28377cf339713d5..9da1ed1b397079e74b993faf166d8d528170c389 100644 (file)
--- a/PCbuild/rt.bat
+++ b/PCbuild/rt.bat
@@ -30,7 +30,7 @@ set prefix=.\
 set suffix=
 set qmode=
 set dashO=
-set tcltk=
+set tcltk=tcltk
 
 :CheckOpts
 if "%1"=="-O" (set dashO=-O)     & shift & goto CheckOpts
@@ -38,7 +38,7 @@ if "%1"=="-q" (set qmode=yes)    & shift & goto CheckOpts
 if "%1"=="-d" (set suffix=_d)    & shift & goto CheckOpts
 if "%1"=="-x64" (set prefix=amd64) & (set tcltk=tcltk64) & shift & goto CheckOpts
 
-PATH %PATH%;..\..\%tcltk%\bin
+PATH %PATH%;%~dp0..\..\%tcltk%\bin
 set exe=%prefix%\python%suffix%
 set cmd=%exe% %dashO% -Wd -3 -E -tt ../lib/test/regrtest.py %1 %2 %3 %4 %5 %6 %7 %8 %9
 if defined qmode goto Qmode