2006-11-17 Havoc Pennington <hp@redhat.com>

	* update-dbus-docs.sh: allow setting fd.org username via env
	variable. Make it run autogen with --enable-xml-docs=yes
	--enable-doxygen-docs=yes so configure will fail if the required
	tools are missing.

diff --git a/ChangeLog b/ChangeLog
index dbbd486fce9632a004206c9eec07be104866fc0e..a36a23ab3b9f680a392dd9f759f5c467a9fbdf12 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-11-17  Havoc Pennington  <hp@redhat.com>
+
+       * update-dbus-docs.sh: allow setting fd.org username via env
+       variable. Make it run autogen with --enable-xml-docs=yes
+       --enable-doxygen-docs=yes so configure will fail if the required
+       tools are missing.
+
 2006-11-17  Havoc Pennington  <hp@redhat.com>
 
        * doc/dbus-faq.xml: minor FAQ tweaks

diff --git a/update-dbus-docs.sh b/update-dbus-docs.sh
index 27f6bdee6b3b394514a436b0f9670767ff7fb735..e98d0b049019b8e2327dc91dc3c1bc13a87cf8f0 100755 (executable)
--- a/update-dbus-docs.sh
+++ b/update-dbus-docs.sh
@@ -6,8 +6,14 @@ function die()
     exit 1
 }
 
+if test -z "$FDUSER" ; then
+    FDUSER=johnp
+fi
+
+echo "Using freedesktop.org account $FDUSER"
+
 CHECKOUTDIR=/tmp/dbus-for-docs
-export CVSROOT=:ext:johnp@cvs.freedesktop.org:/cvs/dbus
+export CVSROOT=:ext:$FDUSER@cvs.freedesktop.org:/cvs/dbus
 
 cd $CHECKOUTDIR || die "could not changedir to $CHECKOUTDIR"
 
@@ -19,7 +25,9 @@ cd dbus || die "could not cd to dbus"
 
 echo "Configuring and building docs"
 
-./autogen.sh || die "could not autogen"
+## the configure flags are explicit so if you lack xmlto, etc. 
+## you won't fail to update those docs
+./autogen.sh --enable-xml-docs=yes --enable-doxygen-docs=yes || die "could not autogen"
 doxygen Doxyfile || die "could not run Doxygen"
 cd doc || die "could not cd to doc dir"
 make || die "could not build docs"
@@ -42,6 +50,6 @@ find doc -not -type d | grep -v CVS | grep -v -E '.~[0-9.]+~' | grep -v Makefile
 diff -u filesystem.list tarball.list || die "some files were not included"
 
 echo "Uploading docs to server"
-scp dbus-docs.tar.gz johnp@pdx.freedesktop.org:
-ssh johnp@pdx.freedesktop.org '(cd /srv/dbus.freedesktop.org/www/ && /bin/cp -f ~/dbus-docs.tar.gz . && tar zxf dbus-docs.tar.gz && echo "Successfully unpacked tarball on server")'
+scp dbus-docs.tar.gz "$FDUSER"@pdx.freedesktop.org:
+ssh "$FDUSER"@pdx.freedesktop.org '(cd /srv/dbus.freedesktop.org/www/ && /bin/cp -f ~/dbus-docs.tar.gz . && tar zxf dbus-docs.tar.gz && echo "Successfully unpacked tarball on server")'