diff options
| author | Serhiy Storchaka <storchaka@gmail.com> | 2015-10-06 15:52:52 (GMT) |
|---|---|---|
| committer | Serhiy Storchaka <storchaka@gmail.com> | 2015-10-06 15:52:52 (GMT) |
| commit | fc632e3912ba9bb6ec20359148f05ca3ec231663 (patch) | |
| tree | 9615a94c00877cd8a21a689081659272ed2d35b9 | |
| parent | d7e60b151978bca31b74998398302247056c975b (diff) | |
| parent | a3a19953e04cbee3da562164aec56ca25846d02d (diff) | |
| download | cpython-fc632e3912ba9bb6ec20359148f05ca3ec231663.zip cpython-fc632e3912ba9bb6ec20359148f05ca3ec231663.tar.gz cpython-fc632e3912ba9bb6ec20359148f05ca3ec231663.tar.bz2 | |
Merge with 3.5.
| -rw-r--r--[-rwxr-xr-x] | Lib/pydoc.py | 0 | ||||
| -rw-r--r-- | Lib/site-packages/README | 2 | ||||
| -rw-r--r--[-rwxr-xr-x] | Lib/test/regrtest.py | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | Lib/timeit.py | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | Parser/asdl_c.py | 0 | ||||
| -rw-r--r-- | Tools/buildbot/build-amd64.bat | 5 | ||||
| -rw-r--r-- | Tools/buildbot/clean-amd64.bat | 5 | ||||
| -rw-r--r-- | Tools/buildbot/external-amd64.bat | 3 | ||||
| -rw-r--r-- | Tools/buildbot/external.bat | 3 | ||||
| -rw-r--r-- | Tools/buildbot/test-amd64.bat | 6 | ||||
| -rw-r--r--[-rwxr-xr-x] | configure | 0 |
11 files changed, 24 insertions, 0 deletions
diff --git a/Lib/pydoc.py b/Lib/pydoc.py index f4f2530..f4f2530 100755..100644 --- a/Lib/pydoc.py +++ b/Lib/pydoc.py diff --git a/Lib/site-packages/README b/Lib/site-packages/README new file mode 100644 index 0000000..273f625 --- /dev/null +++ b/Lib/site-packages/README @@ -0,0 +1,2 @@ +This directory exists so that 3rd party packages can be installed +here. Read the source for site.py for more details. diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py index fcc3937..fcc3937 100755..100644 --- a/Lib/test/regrtest.py +++ b/Lib/test/regrtest.py diff --git a/Lib/timeit.py b/Lib/timeit.py index 98cb3eb..98cb3eb 100755..100644 --- a/Lib/timeit.py +++ b/Lib/timeit.py diff --git a/Parser/asdl_c.py b/Parser/asdl_c.py index d597122..d597122 100755..100644 --- a/Parser/asdl_c.py +++ b/Parser/asdl_c.py diff --git a/Tools/buildbot/build-amd64.bat b/Tools/buildbot/build-amd64.bat new file mode 100644 index 0000000..f77407b --- /dev/null +++ b/Tools/buildbot/build-amd64.bat @@ -0,0 +1,5 @@ +@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 new file mode 100644 index 0000000..b53c7c1 --- /dev/null +++ b/Tools/buildbot/clean-amd64.bat @@ -0,0 +1,5 @@ +@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 new file mode 100644 index 0000000..bfaef05 --- /dev/null +++ b/Tools/buildbot/external-amd64.bat @@ -0,0 +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 new file mode 100644 index 0000000..bfaef05 --- /dev/null +++ b/Tools/buildbot/external.bat @@ -0,0 +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 new file mode 100644 index 0000000..e48329c --- /dev/null +++ b/Tools/buildbot/test-amd64.bat @@ -0,0 +1,6 @@ +@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 %*
|