changeset:   93347:64a54f0c87d7
parent:      93344:e119343bc3ec
parent:      93346:b5e9bc4352e1
user:        Zachary Ware <zachary.ware@gmail.com>
date:        Sat Nov 01 22:48:24 2014 -0500
files:       .gitignore .hgignore Misc/NEWS PCbuild/get_externals.bat PCbuild/prepare_ssl.py PCbuild/pyproject.props PCbuild/readme.txt PCbuild/rt.bat Tools/buildbot/test-amd64.bat Tools/buildbot/test.bat
description:
Issue #17896: Move Windows external lib sources from .. to externals.


diff -r e119343bc3ec -r 64a54f0c87d7 .gitignore
--- a/.gitignore	Sat Nov 01 19:33:25 2014 -0700
+++ b/.gitignore	Sat Nov 01 22:48:24 2014 -0500
@@ -80,4 +80,5 @@
 TAGS
 .coverage
 coverage/
+externals/
 htmlcov/
diff -r e119343bc3ec -r 64a54f0c87d7 .hgignore
--- a/.hgignore	Sat Nov 01 19:33:25 2014 -0700
+++ b/.hgignore	Sat Nov 01 22:48:24 2014 -0500
@@ -93,6 +93,7 @@
 Programs/_testembed
 .coverage
 coverage/
+externals/
 htmlcov/
 *.gcda
 *.gcno
diff -r e119343bc3ec -r 64a54f0c87d7 Lib/tkinter/_fix.py
--- a/Lib/tkinter/_fix.py	Sat Nov 01 19:33:25 2014 -0700
+++ b/Lib/tkinter/_fix.py	Sat Nov 01 22:48:24 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 e119343bc3ec -r 64a54f0c87d7 Misc/NEWS
--- a/Misc/NEWS	Sat Nov 01 19:33:25 2014 -0700
+++ b/Misc/NEWS	Sat Nov 01 22:48:24 2014 -0500
@@ -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 -r e119343bc3ec -r 64a54f0c87d7 PCbuild/get_externals.bat
--- a/PCbuild/get_externals.bat	Sat Nov 01 19:33:25 2014 -0700
+++ b/PCbuild/get_externals.bat	Sat Nov 01 22:48:24 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 e119343bc3ec -r 64a54f0c87d7 PCbuild/pyproject.props
--- a/PCbuild/pyproject.props	Sat Nov 01 19:33:25 2014 -0700
+++ b/PCbuild/pyproject.props	Sat Nov 01 22:48:24 2014 -0500
@@ -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 -r e119343bc3ec -r 64a54f0c87d7 PCbuild/readme.txt
--- a/PCbuild/readme.txt	Sat Nov 01 19:33:25 2014 -0700
+++ b/PCbuild/readme.txt	Sat Nov 01 22:48:24 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 e119343bc3ec -r 64a54f0c87d7 Tools/buildbot/test-amd64.bat
--- a/Tools/buildbot/test-amd64.bat	Sat Nov 01 19:33:25 2014 -0700
+++ b/Tools/buildbot/test-amd64.bat	Sat Nov 01 22:48:24 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 e119343bc3ec -r 64a54f0c87d7 Tools/buildbot/test.bat
--- a/Tools/buildbot/test.bat	Sat Nov 01 19:33:25 2014 -0700
+++ b/Tools/buildbot/test.bat	Sat Nov 01 22:48:24 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 %*