[Python-checkins] cpython (merge 3.4 -> default): Issue #17896: Move Windows external lib sources from .. to externals.

[zach.ware]

https://hg.python.org/cpython/rev/64a54f0c87d7
changeset:   93347:64a54f0c87d7
parent:      93344:e119343bc3ec
parent:      93346:b5e9bc4352e1
user:        Zachary Ware <zachary.ware at gmail.com>
date:        Sat Nov 01 22:48:24 2014 -0500
summary:
  Issue #17896: Move Windows external lib sources from .. to externals.

files:
  .gitignore                    |  1 +
  .hgignore                     |  1 +
  Lib/tkinter/_fix.py           |  4 ++--
  Misc/NEWS                     |  3 +++
  PCbuild/get_externals.bat     |  3 ++-
  PCbuild/pyproject.props       |  2 +-
  PCbuild/readme.txt            |  2 +-
  Tools/buildbot/test-amd64.bat |  2 +-
  Tools/buildbot/test.bat       |  2 +-
  9 files changed, 13 insertions(+), 7 deletions(-)


diff --git a/.gitignore b/.gitignore
--- a/.gitignore
+++ b/.gitignore
@@ -80,4 +80,5 @@
 TAGS
 .coverage
 coverage/
+externals/
 htmlcov/
diff --git a/.hgignore b/.hgignore
--- a/.hgignore
+++ b/.hgignore
@@ -93,6 +93,7 @@
 Programs/_testembed
 .coverage
 coverage/
+externals/
 htmlcov/
 *.gcda
 *.gcno
diff --git a/Lib/tkinter/_fix.py b/Lib/tkinter/_fix.py
--- a/Lib/tkinter/_fix.py
+++ b/Lib/tkinter/_fix.py
@@ -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 --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -1385,6 +1385,9 @@
 Windows
 -------
 
+- Issue #17896: The Windows build scripts now expect external library sources
+  to be in ``PCbuild\..\externals`` rather than ``PCbuild\..\..``.
+
 - Issue #17717: The Windows build scripts now use a copy of NASM pulled from
   svn.python.org to build OpenSSL.
 
diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat
--- a/PCbuild/get_externals.bat
+++ b/PCbuild/get_externals.bat
@@ -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 --git a/PCbuild/pyproject.props b/PCbuild/pyproject.props
--- a/PCbuild/pyproject.props
+++ b/PCbuild/pyproject.props
@@ -16,7 +16,7 @@
     <PyDllName>python35$(PyDebugExt)</PyDllName>
     <PythonExe>$(OutDir)python$(PyDebugExt).exe</PythonExe>
     <KillPythonExe>$(OutDir)kill_python$(PyDebugExt).exe</KillPythonExe>
-    <externalsDir>..\..</externalsDir>
+    <externalsDir>..\externals</externalsDir>
     <sqlite3Dir>$(externalsDir)\sqlite-3.8.3.1</sqlite3Dir>
     <bz2Dir>$(externalsDir)\bzip2-1.0.6</bz2Dir>
     <lzmaDir>$(externalsDir)\xz-5.0.5</lzmaDir>
diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt
--- a/PCbuild/readme.txt
+++ b/PCbuild/readme.txt
@@ -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 --git a/Tools/buildbot/test-amd64.bat b/Tools/buildbot/test-amd64.bat
--- a/Tools/buildbot/test-amd64.bat
+++ b/Tools/buildbot/test-amd64.bat
@@ -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 --git a/Tools/buildbot/test.bat b/Tools/buildbot/test.bat
--- a/Tools/buildbot/test.bat
+++ b/Tools/buildbot/test.bat
@@ -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 %*

-- 
Repository URL: https://hg.python.org/cpython