diff -r ff2290de8cca .gitignore --- a/.gitignore Sat Oct 25 23:05:06 2014 -0500 +++ b/.gitignore Tue Oct 28 21:57:54 2014 -0500 @@ -70,4 +70,5 @@ TAGS .coverage coverage/ +externals/ htmlcov/ diff -r ff2290de8cca .hgignore --- a/.hgignore Sat Oct 25 23:05:06 2014 -0500 +++ b/.hgignore Tue Oct 28 21:57:54 2014 -0500 @@ -92,6 +92,7 @@ Modules/_testembed .coverage coverage/ +externals/ htmlcov/ *.gcda *.gcno diff -r ff2290de8cca Lib/tkinter/_fix.py --- a/Lib/tkinter/_fix.py Sat Oct 25 23:05:06 2014 -0500 +++ b/Lib/tkinter/_fix.py Tue Oct 28 21:57:54 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 ff2290de8cca PCbuild/build_ssl.py --- a/PCbuild/build_ssl.py Sat Oct 25 23:05:06 2014 -0500 +++ b/PCbuild/build_ssl.py Tue Oct 28 21:57:54 2014 -0500 @@ -68,7 +68,7 @@ propfile = (os.path.join(os.path.dirname(__file__), 'pyproject.props')) with open(propfile, encoding='utf-8-sig') as f: m = re.search('openssl-([^<]+)<', f.read()) - return "..\..\openssl-"+m.group(1) + return "..\externals\openssl-"+m.group(1) def create_makefile64(makefile, m32): diff -r ff2290de8cca PCbuild/pyproject.props --- a/PCbuild/pyproject.props Sat Oct 25 23:05:06 2014 -0500 +++ b/PCbuild/pyproject.props Tue Oct 28 21:57:54 2014 -0500 @@ -16,7 +16,7 @@ python34$(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 ff2290de8cca PCbuild/readme.txt --- a/PCbuild/readme.txt Sat Oct 25 23:05:06 2014 -0500 +++ b/PCbuild/readme.txt Tue Oct 28 21:57:54 2014 -0500 @@ -222,9 +222,10 @@ Unlike the other external libraries listed above, Tk must be built separately before the _tkinter module can be built. This means that - a pre-built Tcl/Tk installation is expected in ..\..\tcltk (tcltk64 - for 64-bit) relative to this directory. See "Getting External - Sources" below for the easiest method to ensure Tcl/Tk is built. + a pre-built Tcl/Tk installation is expected in ..\externals\tcltk + (tcltk64 for 64-bit) relative to this directory. See "Getting + External Sources" below for the easiest method to ensure Tcl/Tk is + built. Getting External Sources @@ -244,12 +245,12 @@ This extracts all the external sub-projects from http://svn.python.org/projects/external via Subversion (so you'll need an 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 the names of some folders in order to make things work. For instance, if you were to download a version 5.0.7 of -XZ Utils, you would need to extract the archive into ..\..\xz-5.0.5 +XZ Utils, you would need to extract the archive into ..\externals\xz-5.0.5 anyway, since that is where the solution is set to look for xz. The same is true for all other external projects. @@ -266,7 +267,7 @@ So for a release build, you'd call it as: nmake -f makefile.vc MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 clean all install -Note that the above command is called from within ..\..\tcl-8.6.1.0\win +Note that the above command is called from within ..\externals\tcl-8.6.1.0\win (relative to this directory); don't forget to build Tk as well as Tcl! This will be cleaned up in the future; http://bugs.python.org/issue15968 diff -r ff2290de8cca PCbuild/rt.bat --- a/PCbuild/rt.bat Sat Oct 25 23:05:06 2014 -0500 +++ b/PCbuild/rt.bat Tue Oct 28 21:57:54 2014 -0500 @@ -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%;%~dp0..\..\%tcltk%\bin +PATH %PATH%;%~dp0..\externals\%tcltk%\bin set exe=%prefix%\python%suffix% set cmd=%exe% %dashO% -Wd -E -bb ../lib/test/regrtest.py %1 %2 %3 %4 %5 %6 %7 %8 %9 if defined qmode goto Qmode diff -r ff2290de8cca Tools/buildbot/external-common.bat --- a/Tools/buildbot/external-common.bat Sat Oct 25 23:05:06 2014 -0500 +++ b/Tools/buildbot/external-common.bat Tue Oct 28 21:57:54 2014 -0500 @@ -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 .. +if not exist externals mkdir externals +cd externals @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