traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Support the new doc system.

This commit is contained in:
Neal Norwitz 2007-08-16 05:07:03 +00:00
parent bf863b17f0
commit 7def3e05ce
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Misc/build.sh
View File

@ -214,17 +214,21 @@ fi
cd $DIR/Doc cd $DIR/Doc
F="make-doc.out" F="make-doc.out"
start=`current_time` start=`current_time`
# XXX(nnorwitz): will there be a similar problem with the new ReST-based system?
# Keep this code around until after the first release of 2.6a1 or 3.0a1.
# At that point, it should be clear if this code is needed or not.
# Doc/commontex/boilerplate.tex is expected to always have an outstanding # Doc/commontex/boilerplate.tex is expected to always have an outstanding
# modification for the date. When a release is cut, a conflict occurs. # 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 # This allows us to detect this problem and not try to build the docs
# which will definitely fail with a conflict. # which will definitely fail with a conflict.
CONFLICTED_FILE=commontex/boilerplate.tex #CONFLICTED_FILE=commontex/boilerplate.tex
conflict_count=`grep -c "<<<" $CONFLICTED_FILE` #conflict_count=`grep -c "<<<" $CONFLICTED_FILE`
conflict_count=0
if [ $conflict_count != 0 ]; then if [ $conflict_count != 0 ]; then
echo "Conflict detected in $CONFLICTED_FILE. Doc build skipped." > ../build/$F echo "Conflict detected in $CONFLICTED_FILE. Doc build skipped." > ../build/$F
err=1 err=1
else else
make >& ../build/$F make html >& ../build/$F
err=$? err=$?
fi fi
update_status "Making doc" "$F" $start update_status "Making doc" "$F" $start
@ -238,6 +242,6 @@ echo "</body>" >> $RESULT_FILE
echo "</html>" >> $RESULT_FILE echo "</html>" >> $RESULT_FILE
## copy results ## copy results
rsync $RSYNC_OPTS html/* $REMOTE_SYSTEM:$REMOTE_DIR rsync $RSYNC_OPTS build/html/* $REMOTE_SYSTEM:$REMOTE_DIR
cd ../build cd ../build
rsync $RSYNC_OPTS index.html *.out $REMOTE_SYSTEM:$REMOTE_DIR/results/ rsync $RSYNC_OPTS index.html *.out $REMOTE_SYSTEM:$REMOTE_DIR/results/