[Python-checkins] cpython (merge 3.5 -> default): Merge 3.5

[zach.ware]

https://hg.python.org/cpython/rev/bfb1f6642d82
changeset:   96617:bfb1f6642d82
parent:      96614:821e0e7420e8
parent:      96616:1f57839b7b4b
user:        Zachary Ware <zachary.ware at gmail.com>
date:        Wed Jun 17 10:08:57 2015 -0500
summary:
  Merge 3.5

files:
  Tools/buildbot/build-amd64.bat    |  5 ++++-
  Tools/buildbot/clean-amd64.bat    |  5 ++++-
  Tools/buildbot/external-amd64.bat |  1 +
  Tools/buildbot/external.bat       |  1 +
  Tools/buildbot/test-amd64.bat     |  6 +++++-
  5 files changed, 15 insertions(+), 3 deletions(-)


diff --git a/Tools/buildbot/build-amd64.bat b/Tools/buildbot/build-amd64.bat
--- a/Tools/buildbot/build-amd64.bat
+++ b/Tools/buildbot/build-amd64.bat
@@ -1,2 +1,5 @@
- at rem Used by the buildbot "compile" step.
+ at rem Formerly used by the buildbot "compile" step.
+ at echo This script is no longer used and may be removed in the future.
+ at echo To get the same effect as this script, use
+ at echo     PCbuild\build.bat -d -e -k -p x64
 call "%~dp0build.bat" -p x64 %*
diff --git a/Tools/buildbot/clean-amd64.bat b/Tools/buildbot/clean-amd64.bat
--- a/Tools/buildbot/clean-amd64.bat
+++ b/Tools/buildbot/clean-amd64.bat
@@ -1,2 +1,5 @@
- at rem Used by the buildbot "clean" step.
+ at rem Formerly used by the buildbot "clean" step.
+ at echo This script is no longer used and may be removed in the future.
+ at echo To get the same effect as this script, use `clean.bat` from this
+ at echo directory and pass `-p x64` as two arguments.
 call "%~dp0clean.bat" -p x64 %*
diff --git a/Tools/buildbot/external-amd64.bat b/Tools/buildbot/external-amd64.bat
--- a/Tools/buildbot/external-amd64.bat
+++ b/Tools/buildbot/external-amd64.bat
@@ -1,2 +1,3 @@
+ at echo This script is no longer used and may be removed in the future.
 @echo Please use PCbuild\get_externals.bat instead.
 @"%~dp0..\..\PCbuild\get_externals.bat" %*
diff --git a/Tools/buildbot/external.bat b/Tools/buildbot/external.bat
--- a/Tools/buildbot/external.bat
+++ b/Tools/buildbot/external.bat
@@ -1,2 +1,3 @@
+ at echo This script is no longer used and may be removed in the future.
 @echo Please use PCbuild\get_externals.bat instead.
 @"%~dp0..\..\PCbuild\get_externals.bat" %*
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
@@ -1,2 +1,6 @@
- at rem Used by the buildbot "test" step.
+ at rem Formerly used by the buildbot "test" step.
+ at echo This script is no longer used and may be removed in the future.
+ at echo To get the same effect as this script, use
+ at echo     PCbuild\rt.bat -q -d -x64 -uall -rwW
+ at echo or use `test.bat` in this directory and pass `-x64` as an argument.
 call "%~dp0test.bat" -x64 %*

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