Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

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.
This commit is contained in:
Kurt B. Kaiser 2010-01-03 08:36:45 +00:00
parent 9d3252154f
commit ae628c97be
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Misc/build.sh
View File

@ -55,7 +55,7 @@ REMOTE_SYSTEM="neal@dinsdale.python.org"
REMOTE_DIR="/data/ftp.python.org/pub/docs.python.org/dev/" REMOTE_DIR="/data/ftp.python.org/pub/docs.python.org/dev/"
RESULT_FILE="$DIR/build/index.html" RESULT_FILE="$DIR/build/index.html"
INSTALL_DIR="/tmp/python-test/local" INSTALL_DIR="/tmp/python-test/local"
RSYNC_OPTS="-aC -e ssh" RSYNC_OPTS="-C -e ssh -rlogD"
# Always run the installed version of Python. # Always run the installed version of Python.
PYTHON=$INSTALL_DIR/bin/python PYTHON=$INSTALL_DIR/bin/python
@ -134,7 +134,7 @@ mail_on_failure() {
## setup ## setup
cd $DIR cd $DIR
make clobber /dev/null 2>&1 make clobber > /dev/null 2>&1
cp -p Modules/Setup.dist Modules/Setup cp -p Modules/Setup.dist Modules/Setup
# But maybe there was no Makefile - we are only building docs. Clear build: # But maybe there was no Makefile - we are only building docs. Clear build:
rm -rf build/ rm -rf build/
@ -273,7 +273,7 @@ if [ $conflict_count != 0 ]; then
err=1 err=1
else else
make clean > ../build/$F 2>&1 make clean > ../build/$F 2>&1
make checkout update html >> ../build/$F 2>&1 make html >> ../build/$F 2>&1
err=$? err=$?
fi fi
update_status "Making doc" "$F" $start update_status "Making doc" "$F" $start