diff -r c8ba6df39b25 .gitignore --- a/.gitignore Tue Oct 28 23:00:36 2014 +0100 +++ b/.gitignore Tue Oct 28 23:28:46 2014 -0500 @@ -80,4 +80,5 @@ TAGS .coverage coverage/ +externals/ htmlcov/ diff -r c8ba6df39b25 .hgignore --- a/.hgignore Tue Oct 28 23:00:36 2014 +0100 +++ b/.hgignore Tue Oct 28 23:28:46 2014 -0500 @@ -93,6 +93,7 @@ Programs/_testembed .coverage coverage/ +externals/ htmlcov/ *.gcda *.gcno diff -r c8ba6df39b25 Lib/tkinter/_fix.py --- a/Lib/tkinter/_fix.py Tue Oct 28 23:00:36 2014 +0100 +++ b/Lib/tkinter/_fix.py Tue Oct 28 23:28:46 2014 -0500 @@ -48,8 +48,8 @@ prefix = os.path.join(sys.base_prefix,"tcl") if not os.path.exists(prefix): - # devdir/../tcltk/lib - prefix = os.path.join(sys.base_prefix, os.path.pardir, "tcltk", "lib") + # devdir/externals/tcltk/lib + prefix = os.path.join(sys.base_prefix, "externals", "tcltk", "lib") prefix = os.path.abspath(prefix) # if this does not exist, no further search is needed if os.path.exists(prefix): diff -r c8ba6df39b25 PCbuild/get_externals.bat --- a/PCbuild/get_externals.bat Tue Oct 28 23:00:36 2014 +0100 +++ b/PCbuild/get_externals.bat Tue Oct 28 23:28:46 2014 -0500 @@ -2,7 +2,8 @@ setlocal rem Simple script to fetch source for external libraries -pushd "%~dp0..\.." +if not exist "%~dp0..\externals" mkdir "%~dp0..\externals" +pushd "%~dp0..\externals" if "%SVNROOT%"=="" set SVNROOT=http://svn.python.org/projects/external/ diff -r c8ba6df39b25 PCbuild/pyproject.props --- a/PCbuild/pyproject.props Tue Oct 28 23:00:36 2014 +0100 +++ b/PCbuild/pyproject.props Tue Oct 28 23:28:46 2014 -0500 @@ -16,7 +16,7 @@ python35$(PyDebugExt) $(OutDir)python$(PyDebugExt).exe $(OutDir)kill_python$(PyDebugExt).exe - ..\.. + ..\externals $(externalsDir)\sqlite-3.8.3.1 $(externalsDir)\bzip2-1.0.6 $(externalsDir)\xz-5.0.5 diff -r c8ba6df39b25 PCbuild/readme.txt --- a/PCbuild/readme.txt Tue Oct 28 23:00:36 2014 +0100 +++ b/PCbuild/readme.txt Tue Oct 28 23:28:46 2014 -0500 @@ -278,7 +278,7 @@ directory. This script extracts all the external sub-projects from http://svn.python.org/projects/external via Subversion (so you'll need svn.exe on your PATH) and places them -in ..\.. (relative to this directory). +in ..\externals (relative to this directory). It is also possible to download sources from each project's homepage, though you may have to change folder names or pass the names to MSBuild diff -r c8ba6df39b25 Tools/buildbot/test-amd64.bat --- a/Tools/buildbot/test-amd64.bat Tue Oct 28 23:00:36 2014 +0100 +++ b/Tools/buildbot/test-amd64.bat Tue Oct 28 23:28:46 2014 -0500 @@ -2,6 +2,6 @@ setlocal rem The following line should be removed before #20035 is closed -set TCL_LIBRARY=%~dp0..\..\..\tcltk64\lib\tcl8.6 +set TCL_LIBRARY=%~dp0..\..\externals\tcltk64\lib\tcl8.6 call "%~dp0..\..\PCbuild\rt.bat" -d -q -x64 -uall -rwW -n --timeout=3600 %* diff -r c8ba6df39b25 Tools/buildbot/test.bat --- a/Tools/buildbot/test.bat Tue Oct 28 23:00:36 2014 +0100 +++ b/Tools/buildbot/test.bat Tue Oct 28 23:28:46 2014 -0500 @@ -2,6 +2,6 @@ setlocal rem The following line should be removed before #20035 is closed -set TCL_LIBRARY=%~dp0..\..\..\tcltk\lib\tcl8.6 +set TCL_LIBRARY=%~dp0..\..\externals\tcltk\lib\tcl8.6 call "%~dp0..\..\PCbuild\rt.bat" -d -q -uall -rwW -n --timeout=3600 %*