diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rwxr-xr-x | update-dbus-docs.sh | 16 |
2 files changed, 19 insertions, 4 deletions
@@ -1,5 +1,12 @@ 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 2006-11-14 Havoc Pennington <hp@redhat.com> diff --git a/update-dbus-docs.sh b/update-dbus-docs.sh index 27f6bdee..e98d0b04 100755 --- 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")' |