diff options
| author | Neal Norwitz <nnorwitz@gmail.com> | 2007-08-16 05:07:03 (GMT) |
|---|---|---|
| committer | Neal Norwitz <nnorwitz@gmail.com> | 2007-08-16 05:07:03 (GMT) |
| commit | 7def3e05ce1be2a984e8e58884618d1153f5d065 (patch) | |
| tree | 61e92d4cb602e93ab91dff7a8602a824dec6dab2 /Misc | |
| parent | bf863b17f0f67453fe07c4eb57cbede1ee0f6d3f (diff) | |
| download | cpython-7def3e05ce1be2a984e8e58884618d1153f5d065.zip cpython-7def3e05ce1be2a984e8e58884618d1153f5d065.tar.gz cpython-7def3e05ce1be2a984e8e58884618d1153f5d065.tar.bz2 | |
Support the new doc system.
Diffstat (limited to 'Misc')
| -rwxr-xr-x | Misc/build.sh | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/Misc/build.sh b/Misc/build.sh index 327a92c..4883c0e 100755 --- a/Misc/build.sh +++ b/Misc/build.sh @@ -214,17 +214,21 @@ fi cd $DIR/Doc F="make-doc.out" 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 # 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` +#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 >& ../build/$F + make html >& ../build/$F err=$? fi update_status "Making doc" "$F" $start @@ -238,6 +242,6 @@ echo "</body>" >> $RESULT_FILE echo "</html>" >> $RESULT_FILE ## copy results -rsync $RSYNC_OPTS html/* $REMOTE_SYSTEM:$REMOTE_DIR +rsync $RSYNC_OPTS build/html/* $REMOTE_SYSTEM:$REMOTE_DIR cd ../build rsync $RSYNC_OPTS index.html *.out $REMOTE_SYSTEM:$REMOTE_DIR/results/ |