bk commit - mysqldoc tree (paul:1.2906)

[paul]

Below is the list of changes that have just been committed into a local
mysqldoc repository of paul. When paul does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet
  1.2906 05/04/27 09:55:47 paul@stripped +1 -0
  build-chm:
    More error-checking tuning.

  tools/build-chm
    1.5 05/04/27 09:55:31 paul@stripped +5 -1
    More error-checking tuning.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	paul
# Host:	kite-hub.kitebird.com
# Root:	/src/extern/MySQL/bk/mysqldoc

--- 1.4/tools/build-chm	2005-04-27 09:25:23 -05:00
+++ 1.5/tools/build-chm	2005-04-27 09:55:31 -05:00
@@ -46,8 +46,11 @@
 tar Ccfz $HTMLHELPDIR $TARBALL .
 ssh $SSH_KEY docs@docswin mkdir $ROOTDIR/chmarch-$$
 scp $SSH_KEY $TARBALL docs@docswin:$ROOTDIR/$TARBALL
-ssh $SSH_KEY docs@docswin "cd $ROOTDIR/chmarch-$$; tar -xzf ../$TARBALL"
+ssh $SSH_KEY docs@docswin "cd $ROOTDIR/chmarch-$$; gunzip - < ../$TARBALL|tar -xf -"
+# Grr ... we cannot rely on Help Compiler to return 0 status for success
+set +e
 ssh $SSH_KEY docs@docswin "cd $ROOTDIR/chmarch-$$; hhc.exe htmlhelp.hhp" > $CHMOUT
2>&1
+set -e
 scp $SSH_KEY docs@docswin:$ROOTDIR/chmarch-$$/htmlhelp.chm $CHMFILE
 ssh $SSH_KEY docs@docswin "rm -rf $ROOTDIR/chmarch-$$.tar.gz $ROOTDIR/chmarch-$$"
 $RM $TARBALL
@@ -57,6 +60,7 @@
 	$RM $CHMOUT
 	exit 1
 fi
+set +e
 grep "HHC.*Error:" $CHMOUT
 if [ $? -eq 0 ]; then
 	echo "Errors occurred while building $CHMFILE" 1>&2