summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZachary Ware <zachary.ware@gmail.com>2015-06-17 15:08:44 (GMT)
committerZachary Ware <zachary.ware@gmail.com>2015-06-17 15:08:44 (GMT)
commit4ab4ac8e035060956f71fb73feae567a83bc5fbd (patch)
tree34c7a89cbfe726a8f859acd3b7fe52f0c4aac49b
parent6c7f2acd9913ad8d88ba64dfb670732b52fe700c (diff)
parent9fe164364af47d119c4bed420694570ee9a4e6a6 (diff)
downloadcpython-4ab4ac8e035060956f71fb73feae567a83bc5fbd.zip
cpython-4ab4ac8e035060956f71fb73feae567a83bc5fbd.tar.gz
cpython-4ab4ac8e035060956f71fb73feae567a83bc5fbd.tar.bz2
Merge 3.4
-rw-r--r--Tools/buildbot/build-amd64.bat5
-rw-r--r--Tools/buildbot/clean-amd64.bat5
-rw-r--r--Tools/buildbot/external-amd64.bat1
-rw-r--r--Tools/buildbot/external.bat1
-rw-r--r--Tools/buildbot/test-amd64.bat6
5 files changed, 15 insertions, 3 deletions
diff --git a/Tools/buildbot/build-amd64.bat b/Tools/buildbot/build-amd64.bat
index 8b93bb0..f77407b 100644
--- a/Tools/buildbot/build-amd64.bat
+++ b/Tools/buildbot/build-amd64.bat
@@ -1,2 +1,5 @@
-@rem Used by the buildbot "compile" step.
+@rem Formerly used by the buildbot "compile" step.
+@echo This script is no longer used and may be removed in the future.
+@echo To get the same effect as this script, use
+@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
index 6bbbb65..b53c7c1 100644
--- a/Tools/buildbot/clean-amd64.bat
+++ b/Tools/buildbot/clean-amd64.bat
@@ -1,2 +1,5 @@
-@rem Used by the buildbot "clean" step.
+@rem Formerly used by the buildbot "clean" step.
+@echo This script is no longer used and may be removed in the future.
+@echo To get the same effect as this script, use `clean.bat` from this
+@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
index 13056c7..bfaef05 100644
--- a/Tools/buildbot/external-amd64.bat
+++ b/Tools/buildbot/external-amd64.bat
@@ -1,2 +1,3 @@
+@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
index 13056c7..bfaef05 100644
--- a/Tools/buildbot/external.bat
+++ b/Tools/buildbot/external.bat
@@ -1,2 +1,3 @@
+@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
index 859b37f..e48329c 100644
--- a/Tools/buildbot/test-amd64.bat
+++ b/Tools/buildbot/test-amd64.bat
@@ -1,2 +1,6 @@
-@rem Used by the buildbot "test" step.
+@rem Formerly used by the buildbot "test" step.
+@echo This script is no longer used and may be removed in the future.
+@echo To get the same effect as this script, use
+@echo PCbuild\rt.bat -q -d -x64 -uall -rwW
+@echo or use `test.bat` in this directory and pass `-x64` as an argument.
call "%~dp0test.bat" -x64 %*