Skip to content

C
cpython
Kaydet (Commit) 3f8f16d1 authored tarafından Zachary Ware's avatar Zachary Ware Kaydeden (comit) GitHub
Dosyalara gözat
Seçenekler

Show what's changed when Travis fails regen check (GH-2095) 

Also fixed a few more line endings that were missed in GH-840, which were causing failure.
üst 6ea4186d
Hide whitespace changes
Inline Side-by-side
Showing with 138 additions and 136 deletions
.travis.yml
Dosyayı görüntüle @ 3f8f16d1
...@@ -80,9 +80,11 @@ before_script: ...@@ -80,9 +80,11 @@ before_script:
./configure --with-pydebug ./configure --with-pydebug
make -j4 make -j4
make -j4 regen-all clinic make -j4 regen-all clinic
if ! test -z "`git status --porcelain`" changes=`git status --porcelain`
if ! test -z "$changes"
then then
echo "Generated files not up to date" echo "Generated files not up to date"
echo "$changes"
exit 1 exit 1
fi fi
......
Doc/make.bat
Dosyayı görüntüle @ 3f8f16d1
@echo off @echo off
setlocal setlocal
pushd %~dp0 pushd %~dp0
set this=%~n0 set this=%~n0
if "%SPHINXBUILD%" EQU "" set SPHINXBUILD=sphinx-build if "%SPHINXBUILD%" EQU "" set SPHINXBUILD=sphinx-build
if "%PYTHON%" EQU "" set PYTHON=py if "%PYTHON%" EQU "" set PYTHON=py
if "%1" NEQ "htmlhelp" goto :skiphhcsearch if "%1" NEQ "htmlhelp" goto :skiphhcsearch
if exist "%HTMLHELP%" goto :skiphhcsearch if exist "%HTMLHELP%" goto :skiphhcsearch
rem Search for HHC in likely places rem Search for HHC in likely places
set HTMLHELP= set HTMLHELP=
where hhc /q && set HTMLHELP=hhc && goto :skiphhcsearch where hhc /q && set HTMLHELP=hhc && goto :skiphhcsearch
where /R ..\externals hhc > "%TEMP%\hhc.loc" 2> nul && set /P HTMLHELP= < "%TEMP%\hhc.loc" & del "%TEMP%\hhc.loc" where /R ..\externals hhc > "%TEMP%\hhc.loc" 2> nul && set /P HTMLHELP= < "%TEMP%\hhc.loc" & del "%TEMP%\hhc.loc"
if not exist "%HTMLHELP%" where /R "%ProgramFiles(x86)%" hhc > "%TEMP%\hhc.loc" 2> nul && set /P HTMLHELP= < "%TEMP%\hhc.loc" & del "%TEMP%\hhc.loc" if not exist "%HTMLHELP%" where /R "%ProgramFiles(x86)%" hhc > "%TEMP%\hhc.loc" 2> nul && set /P HTMLHELP= < "%TEMP%\hhc.loc" & del "%TEMP%\hhc.loc"
if not exist "%HTMLHELP%" where /R "%ProgramFiles%" hhc > "%TEMP%\hhc.loc" 2> nul && set /P HTMLHELP= < "%TEMP%\hhc.loc" & del "%TEMP%\hhc.loc" if not exist "%HTMLHELP%" where /R "%ProgramFiles%" hhc > "%TEMP%\hhc.loc" 2> nul && set /P HTMLHELP= < "%TEMP%\hhc.loc" & del "%TEMP%\hhc.loc"
if not exist "%HTMLHELP%" ( if not exist "%HTMLHELP%" (
echo. echo.
echo.The HTML Help Workshop was not found. Set the HTMLHELP variable echo.The HTML Help Workshop was not found. Set the HTMLHELP variable
echo.to the path to hhc.exe or download and install it from echo.to the path to hhc.exe or download and install it from
echo.http://msdn.microsoft.com/en-us/library/ms669985 echo.http://msdn.microsoft.com/en-us/library/ms669985
exit /B 1 exit /B 1
) )
:skiphhcsearch :skiphhcsearch
if "%DISTVERSION%" EQU "" for /f "usebackq" %%v in (`%PYTHON% tools/extensions/patchlevel.py`) do set DISTVERSION=%%v if "%DISTVERSION%" EQU "" for /f "usebackq" %%v in (`%PYTHON% tools/extensions/patchlevel.py`) do set DISTVERSION=%%v
if "%BUILDDIR%" EQU "" set BUILDDIR=build if "%BUILDDIR%" EQU "" set BUILDDIR=build
rem Targets that don't require sphinx-build rem Targets that don't require sphinx-build
if "%1" EQU "" goto help if "%1" EQU "" goto help
if "%1" EQU "help" goto help if "%1" EQU "help" goto help
if "%1" EQU "check" goto check if "%1" EQU "check" goto check
if "%1" EQU "serve" goto serve if "%1" EQU "serve" goto serve
if "%1" == "clean" ( if "%1" == "clean" (
rmdir /q /s %BUILDDIR% rmdir /q /s %BUILDDIR%
goto end goto end
) )
%SPHINXBUILD% >nul 2> nul %SPHINXBUILD% >nul 2> nul
if errorlevel 9009 ( if errorlevel 9009 (
echo. echo.
echo.The 'sphinx-build' command was not found. Make sure you have Sphinx echo.The 'sphinx-build' command was not found. Make sure you have Sphinx
echo.installed, then set the SPHINXBUILD environment variable to point echo.installed, then set the SPHINXBUILD environment variable to point
echo.to the full path of the 'sphinx-build' executable. Alternatively you echo.to the full path of the 'sphinx-build' executable. Alternatively you
echo.may add the Sphinx directory to PATH. echo.may add the Sphinx directory to PATH.
echo. echo.
echo.If you don't have Sphinx installed, grab it from echo.If you don't have Sphinx installed, grab it from
echo.http://sphinx-doc.org/ echo.http://sphinx-doc.org/
popd popd
exit /B 1 exit /B 1
) )
rem Targets that do require sphinx-build and have their own label rem Targets that do require sphinx-build and have their own label
if "%1" EQU "htmlview" goto htmlview if "%1" EQU "htmlview" goto htmlview
rem Everything else rem Everything else
goto build goto build
:help :help
echo.usage: %this% BUILDER [filename ...] echo.usage: %this% BUILDER [filename ...]
echo. echo.
echo.Call %this% with the desired Sphinx builder as the first argument, e.g. echo.Call %this% with the desired Sphinx builder as the first argument, e.g.
echo.``%this% html`` or ``%this% doctest``. Interesting targets that are echo.``%this% html`` or ``%this% doctest``. Interesting targets that are
echo.always available include: echo.always available include:
echo. echo.
echo. Provided by Sphinx: echo. Provided by Sphinx:
echo. html, htmlhelp, latex, text echo. html, htmlhelp, latex, text
echo. suspicious, linkcheck, changes, doctest echo. suspicious, linkcheck, changes, doctest
echo. Provided by this script: echo. Provided by this script:
echo. clean, check, serve, htmlview echo. clean, check, serve, htmlview
echo. echo.
echo.All arguments past the first one are passed through to sphinx-build as echo.All arguments past the first one are passed through to sphinx-build as
echo.filenames to build or are ignored. See README.rst in this directory or echo.filenames to build or are ignored. See README.rst in this directory or
echo.the documentation for your version of Sphinx for more exhaustive lists echo.the documentation for your version of Sphinx for more exhaustive lists
echo.of available targets and descriptions of each. echo.of available targets and descriptions of each.
echo. echo.
echo.This script assumes that the SPHINXBUILD environment variable contains echo.This script assumes that the SPHINXBUILD environment variable contains
echo.a legitimate command for calling sphinx-build, or that sphinx-build is echo.a legitimate command for calling sphinx-build, or that sphinx-build is
echo.on your PATH if SPHINXBUILD is not set. Options for sphinx-build can echo.on your PATH if SPHINXBUILD is not set. Options for sphinx-build can
echo.be passed by setting the SPHINXOPTS environment variable. echo.be passed by setting the SPHINXOPTS environment variable.
goto end goto end
:build :build
if NOT "%PAPER%" == "" ( if NOT "%PAPER%" == "" (
set SPHINXOPTS=-D latex_elements.papersize=%PAPER% %SPHINXOPTS% set SPHINXOPTS=-D latex_elements.papersize=%PAPER% %SPHINXOPTS%
) )
cmd /C %SPHINXBUILD% %SPHINXOPTS% -b%1 -dbuild\doctrees . %BUILDDIR%\%* cmd /C %SPHINXBUILD% %SPHINXOPTS% -b%1 -dbuild\doctrees . %BUILDDIR%\%*
if "%1" EQU "htmlhelp" ( if "%1" EQU "htmlhelp" (
cmd /C "%HTMLHELP%" build\htmlhelp\python%DISTVERSION:.=%.hhp cmd /C "%HTMLHELP%" build\htmlhelp\python%DISTVERSION:.=%.hhp
rem hhc.exe seems to always exit with code 1, reset to 0 for less than 2 rem hhc.exe seems to always exit with code 1, reset to 0 for less than 2
if not errorlevel 2 cmd /C exit /b 0 if not errorlevel 2 cmd /C exit /b 0
) )
echo. echo.
if errorlevel 1 ( if errorlevel 1 (
echo.Build failed (exit code %ERRORLEVEL%^), check for error messages echo.Build failed (exit code %ERRORLEVEL%^), check for error messages
echo.above. Any output will be found in %BUILDDIR%\%1 echo.above. Any output will be found in %BUILDDIR%\%1
) else ( ) else (
echo.Build succeeded. All output should be in %BUILDDIR%\%1 echo.Build succeeded. All output should be in %BUILDDIR%\%1
) )
goto end goto end
:htmlview :htmlview
if NOT "%2" EQU "" ( if NOT "%2" EQU "" (
echo.Can't specify filenames to build with htmlview target, ignoring. echo.Can't specify filenames to build with htmlview target, ignoring.
) )
cmd /C %this% html cmd /C %this% html
if EXIST %BUILDDIR%\html\index.html ( if EXIST %BUILDDIR%\html\index.html (
echo.Opening %BUILDDIR%\html\index.html in the default web browser... echo.Opening %BUILDDIR%\html\index.html in the default web browser...
start %BUILDDIR%\html\index.html start %BUILDDIR%\html\index.html
) )
goto end goto end
:check :check
cmd /C %PYTHON% tools\rstlint.py -i tools cmd /C %PYTHON% tools\rstlint.py -i tools
goto end goto end
:serve :serve
cmd /C %PYTHON% ..\Tools\scripts\serve.py %BUILDDIR%\html cmd /C %PYTHON% ..\Tools\scripts\serve.py %BUILDDIR%\html
goto end goto end
:end :end
popd popd
Lib/ctypes/macholib/fetch_macholib.bat
Dosyayı görüntüle @ 3f8f16d1
svn export --force http://svn.red-bean.com/bob/macholib/trunk/macholib/ . svn export --force http://svn.red-bean.com/bob/macholib/trunk/macholib/ .
Lib/idlelib/idle.bat
Dosyayı görüntüle @ 3f8f16d1
@echo off @echo off
rem Start IDLE using the appropriate Python interpreter rem Start IDLE using the appropriate Python interpreter
set CURRDIR=%~dp0 set CURRDIR=%~dp0
start "IDLE" "%CURRDIR%..\..\pythonw.exe" "%CURRDIR%idle.pyw" %1 %2 %3 %4 %5 %6 %7 %8 %9 start "IDLE" "%CURRDIR%..\..\pythonw.exe" "%CURRDIR%idle.pyw" %1 %2 %3 %4 %5 %6 %7 %8 %9
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment