diff options
Diffstat (limited to 'Misc/build.sh')
| -rwxr-xr-x | Misc/build.sh | 26 |
1 files changed, 5 insertions, 21 deletions
diff --git a/Misc/build.sh b/Misc/build.sh index 544fd29..4b55941 100755 --- a/Misc/build.sh +++ b/Misc/build.sh @@ -55,7 +55,7 @@ REMOTE_SYSTEM="neal@dinsdale.python.org" REMOTE_DIR="/data/ftp.python.org/pub/www.python.org/doc/3.1" RESULT_FILE="$DIR/build/index.html" INSTALL_DIR="/tmp/python-test-3.1/local" -RSYNC_OPTS="-aC -e ssh" +RSYNC_OPTS="-C -e ssh -rlogD" # Always run the installed version of Python. PYTHON=$INSTALL_DIR/bin/python @@ -136,7 +136,7 @@ mail_on_failure() { ## setup cd $DIR -make clobber /dev/null 2>&1 +make clobber > /dev/null 2>&1 cp -p Modules/Setup.dist Modules/Setup # But maybe there was no Makefile - we are only building docs. Clear build: rm -rf build/ @@ -259,25 +259,9 @@ fi cd $DIR/Doc F="make-doc.out" start=`current_time` -# XXX(nnorwitz): For now, keep the code that checks for a conflicted file until -# after the first release of 2.6a1 or 3.0a1. At that point, it will be clear -# if there will be a similar problem with the new doc system. - -# Doc/commontex/boilerplate.tex is expected to always have an outstanding -# modification for the date. When a release is cut, a conflict occurs. -# This allows us to detect this problem and not try to build the docs -# which will definitely fail with a conflict. -#CONFLICTED_FILE=commontex/boilerplate.tex -#conflict_count=`grep -c "<<<" $CONFLICTED_FILE` -conflict_count=0 -if [ $conflict_count != 0 ]; then - echo "Conflict detected in $CONFLICTED_FILE. Doc build skipped." > ../build/$F - err=1 -else - make clean > ../build/$F 2>&1 - make checkout update html >> ../build/$F 2>&1 - err=$? -fi +make clean > ../build/$F 2>&1 +make checkout html >> ../build/$F 2>&1 +err=$? update_status "Making doc" "$F" $start if [ $err != 0 ]; then NUM_FAILURES=1 |