diff options
| author | Kurt B. Kaiser <kbk@shore.net> | 2010-01-03 08:36:45 (GMT) |
|---|---|---|
| committer | Kurt B. Kaiser <kbk@shore.net> | 2010-01-03 08:36:45 (GMT) |
| commit | ae628c97bebac31681defd66ca76a5d95561cd3b (patch) | |
| tree | 1caa46e10428d1762a2d15ffe09c6d505e0a6f18 /Misc | |
| parent | 9d3252154f99c8f229e12e4146ae322abf042450 (diff) | |
| download | cpython-ae628c97bebac31681defd66ca76a5d95561cd3b.zip cpython-ae628c97bebac31681defd66ca76a5d95561cd3b.tar.gz cpython-ae628c97bebac31681defd66ca76a5d95561cd3b.tar.bz2 | |
r77152 to Doc/Makefile broke doc build due to (at least some) make
binaries running clean prereq after checkout.
1. So, fix the insane make call in build.sh - seems to solve it.
2. Fix a missing redirection.
3. Check in the rsync opts that actually work during upload.
Diffstat (limited to 'Misc')
| -rwxr-xr-x | Misc/build.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Misc/build.sh b/Misc/build.sh index 3f03a73..2d45af3 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/docs.python.org/dev/" RESULT_FILE="$DIR/build/index.html" INSTALL_DIR="/tmp/python-test/local" -RSYNC_OPTS="-aC -e ssh" +RSYNC_OPTS="-C -e ssh -rlogD" # Always run the installed version of Python. PYTHON=$INSTALL_DIR/bin/python @@ -134,7 +134,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/ @@ -273,7 +273,7 @@ if [ $conflict_count != 0 ]; then err=1 else make clean > ../build/$F 2>&1 - make checkout update html >> ../build/$F 2>&1 + make html >> ../build/$F 2>&1 err=$? fi update_status "Making doc" "$F" $start |