[Python-checkins] r84901 - in python/branches/release27-maint: PC/VS7.1/rt.bat PC/VS8.0/rt.bat PCbuild/rt.bat

Sun Sep 19 11:10:40 CEST 2010

Author: hirokazu.yamamoto
Date: Sun Sep 19 11:10:40 2010
New Revision: 84901
Log:
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.
........
Modified:
 python/branches/release27-maint/ (props changed)
 python/branches/release27-maint/PC/VS7.1/rt.bat
 python/branches/release27-maint/PC/VS8.0/rt.bat
 python/branches/release27-maint/PCbuild/rt.bat
Modified: python/branches/release27-maint/PC/VS7.1/rt.bat
==============================================================================

--- python/branches/release27-maint/PC/VS7.1/rt.bat	(original)
+++ python/branches/release27-maint/PC/VS7.1/rt.bat	Sun Sep 19 11:10:40 2010
@@ -27,7 +27,7 @@
 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
Modified: python/branches/release27-maint/PC/VS8.0/rt.bat
==============================================================================
--- python/branches/release27-maint/PC/VS8.0/rt.bat	(original)
+++ python/branches/release27-maint/PC/VS8.0/rt.bat	Sun Sep 19 11:10:40 2010
@@ -27,7 +27,7 @@
 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
Modified: python/branches/release27-maint/PCbuild/rt.bat
==============================================================================
--- python/branches/release27-maint/PCbuild/rt.bat	(original)
+++ python/branches/release27-maint/PCbuild/rt.bat	Sun Sep 19 11:10:40 2010
@@ -30,7 +30,7 @@
 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"=="-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
