dbus ChangeLog,1.1207,1.1208 update-dbus-docs.sh,1.4,1.5

[Havoc Pennington]

Update of /cvs/dbus/dbus
In directory kemper:/tmp/cvs-serv30783

Modified Files:
	ChangeLog update-dbus-docs.sh 
Log Message:
2006-11-17  Havoc Pennington  <hp at 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.



Index: ChangeLog
===================================================================
RCS file: /cvs/dbus/dbus/ChangeLog,v
retrieving revision 1.1207
retrieving revision 1.1208
diff -u -d -r1.1207 -r1.1208
--- ChangeLog	18 Nov 2006 03:21:26 -0000	1.1207
+++ ChangeLog	18 Nov 2006 03:30:36 -0000	1.1208
@@ -1,5 +1,12 @@
 2006-11-17  Havoc Pennington  <hp at 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 at redhat.com>
+
 	* doc/dbus-faq.xml: minor FAQ tweaks
 
 2006-11-14  Havoc Pennington  <hp at redhat.com>

Index: update-dbus-docs.sh
===================================================================
RCS file: /cvs/dbus/dbus/update-dbus-docs.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- update-dbus-docs.sh	3 Nov 2006 20:53:22 -0000	1.4
+++ update-dbus-docs.sh	18 Nov 2006 03:30:36 -0000	1.5
@@ -6,8 +6,14 @@
     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 at cvs.freedesktop.org:/cvs/dbus
+export CVSROOT=:ext:$FDUSER at cvs.freedesktop.org:/cvs/dbus
 
 cd $CHECKOUTDIR || die "could not changedir to $CHECKOUTDIR"
 
@@ -19,7 +25,9 @@
 
 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 @@
 diff -u filesystem.list tarball.list || die "some files were not included"
 
 echo "Uploading docs to server"
-scp dbus-docs.tar.gz johnp at pdx.freedesktop.org:
-ssh johnp at 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")'