diff -r 367db2730b05 .gitignore --- a/.gitignore Tue Oct 28 23:00:25 2014 +0100 +++ b/.gitignore Tue Oct 28 21:57:40 2014 -0500 @@ -43,4 +43,5 @@ tags .coverage coverage/ +externals/ htmlcov/ diff -r 367db2730b05 .hgignore --- a/.hgignore Tue Oct 28 23:00:25 2014 +0100 +++ b/.hgignore Tue Oct 28 21:57:40 2014 -0500 @@ -61,4 +61,5 @@ PCbuild/Win32-temp-* .coverage coverage/ +externals/ htmlcov/ diff -r 367db2730b05 Lib/lib-tk/FixTk.py --- a/Lib/lib-tk/FixTk.py Tue Oct 28 23:00:25 2014 +0100 +++ b/Lib/lib-tk/FixTk.py Tue Oct 28 21:57:40 2014 -0500 @@ -48,8 +48,8 @@ prefix = os.path.join(sys.prefix,"tcl") if not os.path.exists(prefix): - # devdir/../tcltk/lib - prefix = os.path.join(sys.prefix, os.path.pardir, "tcltk", "lib") + # devdir/externals/tcltk/lib + prefix = os.path.join(sys.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 367db2730b05 PCbuild/build_ssl.py --- a/PCbuild/build_ssl.py Tue Oct 28 23:00:25 2014 +0100 +++ b/PCbuild/build_ssl.py Tue Oct 28 21:57:40 2014 -0500 @@ -69,7 +69,7 @@ propfile = (os.path.join(os.path.dirname(__file__), 'pyproject.vsprops')) with open(propfile) 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 367db2730b05 PCbuild/pyproject.vsprops --- a/PCbuild/pyproject.vsprops Tue Oct 28 23:00:25 2014 +0100 +++ b/PCbuild/pyproject.vsprops Tue Oct 28 21:57:40 2014 -0500 @@ -46,7 +46,7 @@ /> linkd.exe external ..\..\trunk\external - Link created at: external - - Only a slight tweak would be needed to the buildbots such that bots - building trunk and py3k could make use of the same facility. (2.5.x - builds need to be kept separate as they're using Visual Studio 7.1.) -/XXX trent.nelson 02-Apr-08 - Building for Itanium -------------------- diff -r 367db2730b05 PCbuild/rt.bat --- a/PCbuild/rt.bat Tue Oct 28 23:00:25 2014 +0100 +++ b/PCbuild/rt.bat Tue Oct 28 21:57:40 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 -3 -E -tt ../lib/test/regrtest.py %1 %2 %3 %4 %5 %6 %7 %8 %9 if defined qmode goto Qmode diff -r 367db2730b05 Tools/buildbot/external-common.bat --- a/Tools/buildbot/external-common.bat Tue Oct 28 23:00:25 2014 +0100 +++ b/Tools/buildbot/external-common.bat Tue Oct 28 21:57:40 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. +@rem fetching external components into the root\externals directory. -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