diff options
author | Zachary Ware <zachary.ware@gmail.com> | 2017-06-10 19:58:42 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-10 19:58:42 (GMT) |
commit | 6b6e68776663c0dda04b6a36609297728da2ae9e (patch) | |
tree | 893a56bd5943397b5c1a25c49d707d4000e7e5a4 /Tools/buildbot | |
parent | 29fda8db16e0edab92841277fa223f844f5a92cc (diff) | |
download | cpython-6b6e68776663c0dda04b6a36609297728da2ae9e.zip cpython-6b6e68776663c0dda04b6a36609297728da2ae9e.tar.gz cpython-6b6e68776663c0dda04b6a36609297728da2ae9e.tar.bz2 |
bpo-27425: Be more explicit in .gitattributes (GH-840)
Updates checked-in line endings on several files.
Diffstat (limited to 'Tools/buildbot')
-rw-r--r-- | Tools/buildbot/build.bat | 34 | ||||
-rw-r--r-- | Tools/buildbot/buildmsi.bat | 16 | ||||
-rw-r--r-- | Tools/buildbot/clean.bat | 34 | ||||
-rw-r--r-- | Tools/buildbot/test.bat | 38 |
4 files changed, 61 insertions, 61 deletions
diff --git a/Tools/buildbot/build.bat b/Tools/buildbot/build.bat index 5e840cc..9af511a 100644 --- a/Tools/buildbot/build.bat +++ b/Tools/buildbot/build.bat @@ -1,17 +1,17 @@ -@rem Used by the buildbot "compile" step.
-
-@rem Clean up
-call "%~dp0clean.bat" %*
-
-@rem If you need the buildbots to start fresh (such as when upgrading to
-@rem a new version of an external library, especially Tcl/Tk):
-@rem 1) uncomment the following line:
-
-@rem call "%~dp0..\..\PCbuild\get_externals.bat" --clean-only
-
-@rem 2) commit and push
-@rem 3) wait for all Windows bots to start a build with that changeset
-@rem 4) re-comment, commit and push again
-
-@rem Do the build
-call "%~dp0..\..\PCbuild\build.bat" -e -d -k -v %*
+@rem Used by the buildbot "compile" step. + +@rem Clean up +call "%~dp0clean.bat" %* + +@rem If you need the buildbots to start fresh (such as when upgrading to +@rem a new version of an external library, especially Tcl/Tk): +@rem 1) uncomment the following line: + +@rem call "%~dp0..\..\PCbuild\get_externals.bat" --clean-only + +@rem 2) commit and push +@rem 3) wait for all Windows bots to start a build with that changeset +@rem 4) re-comment, commit and push again + +@rem Do the build +call "%~dp0..\..\PCbuild\build.bat" -e -d -k -v %* diff --git a/Tools/buildbot/buildmsi.bat b/Tools/buildbot/buildmsi.bat index e3c2dbd..6804d79 100644 --- a/Tools/buildbot/buildmsi.bat +++ b/Tools/buildbot/buildmsi.bat @@ -1,9 +1,9 @@ -@rem Used by the buildbot "buildmsi" step.
-setlocal
-
-pushd
-
-@rem build both snapshot MSIs
-call "%~dp0..\msi\build.bat" -x86 -x64
-
+@rem Used by the buildbot "buildmsi" step. +setlocal + +pushd + +@rem build both snapshot MSIs +call "%~dp0..\msi\build.bat" -x86 -x64 + popd
\ No newline at end of file diff --git a/Tools/buildbot/clean.bat b/Tools/buildbot/clean.bat index 13e6679..fe252a9 100644 --- a/Tools/buildbot/clean.bat +++ b/Tools/buildbot/clean.bat @@ -1,17 +1,17 @@ -@echo off
-rem Used by the buildbot "clean" step.
-
-setlocal
-set root=%~dp0..\..
-set pcbuild=%root%\PCbuild
-
-echo Deleting build
-call "%pcbuild%\build.bat" -t Clean -k %*
-call "%pcbuild%\build.bat" -t Clean -k -d %*
-
-echo Deleting .pyc/.pyo files ...
-del /s "%root%\Lib\*.pyc" "%root%\Lib\*.pyo"
-
-echo Deleting test leftovers ...
-rmdir /s /q "%root%\build"
-del /s "%pcbuild%\python*.zip"
+@echo off +rem Used by the buildbot "clean" step. + +setlocal +set root=%~dp0..\.. +set pcbuild=%root%\PCbuild + +echo Deleting build +call "%pcbuild%\build.bat" -t Clean -k %* +call "%pcbuild%\build.bat" -t Clean -k -d %* + +echo Deleting .pyc/.pyo files ... +del /s "%root%\Lib\*.pyc" "%root%\Lib\*.pyo" + +echo Deleting test leftovers ... +rmdir /s /q "%root%\build" +del /s "%pcbuild%\python*.zip" diff --git a/Tools/buildbot/test.bat b/Tools/buildbot/test.bat index a32d38b..0b3a309 100644 --- a/Tools/buildbot/test.bat +++ b/Tools/buildbot/test.bat @@ -1,19 +1,19 @@ -@echo off
-rem Used by the buildbot "test" step.
-setlocal
-
-set here=%~dp0
-set rt_opts=-q -d
-set regrtest_args=-j1
-
-:CheckOpts
-if "%1"=="-x64" (set rt_opts=%rt_opts% %1) & shift & goto CheckOpts
-if "%1"=="-d" (set rt_opts=%rt_opts% %1) & shift & goto CheckOpts
-if "%1"=="-O" (set rt_opts=%rt_opts% %1) & shift & goto CheckOpts
-if "%1"=="-q" (set rt_opts=%rt_opts% %1) & shift & goto CheckOpts
-if "%1"=="+d" (set rt_opts=%rt_opts:-d=%) & shift & goto CheckOpts
-if "%1"=="+q" (set rt_opts=%rt_opts:-q=%) & shift & goto CheckOpts
-if NOT "%1"=="" (set regrtest_args=%regrtest_args% %1) & shift & goto CheckOpts
-
-echo on
-call "%here%..\..\PCbuild\rt.bat" %rt_opts% -uall -rwW --slowest --timeout=1200 %regrtest_args%
+@echo off +rem Used by the buildbot "test" step. +setlocal + +set here=%~dp0 +set rt_opts=-q -d +set regrtest_args=-j1 + +:CheckOpts +if "%1"=="-x64" (set rt_opts=%rt_opts% %1) & shift & goto CheckOpts +if "%1"=="-d" (set rt_opts=%rt_opts% %1) & shift & goto CheckOpts +if "%1"=="-O" (set rt_opts=%rt_opts% %1) & shift & goto CheckOpts +if "%1"=="-q" (set rt_opts=%rt_opts% %1) & shift & goto CheckOpts +if "%1"=="+d" (set rt_opts=%rt_opts:-d=%) & shift & goto CheckOpts +if "%1"=="+q" (set rt_opts=%rt_opts:-q=%) & shift & goto CheckOpts +if NOT "%1"=="" (set regrtest_args=%regrtest_args% %1) & shift & goto CheckOpts + +echo on +call "%here%..\..\PCbuild\rt.bat" %rt_opts% -uall -rwW --slowest --timeout=1200 %regrtest_args% |