Support the new doc system. Also test_compiler was removed in 3k
diff --git a/Misc/build.sh b/Misc/build.sh
index 9ae6365..2c0665f 100755
--- a/Misc/build.sh
+++ b/Misc/build.sh
@@ -75,10 +75,8 @@
# Skip these tests altogether when looking for leaks. These tests
# do not need to be stored above in LEAKY_TESTS too.
-# test_compiler almost never finishes with the same number of refs
-# since it depends on other modules, skip it.
# test_logging causes hangs, skip it.
-LEAKY_SKIPS="-x test_compiler test_logging $_ALWAYS_SKIP"
+LEAKY_SKIPS="-x test_logging $_ALWAYS_SKIP"
# Change this flag to "yes" for old releases to only update/build the docs.
BUILD_DISABLED="no"
@@ -218,17 +216,23 @@
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.
+
+# 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
@@ -242,6 +246,6 @@
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/