From 340d114cd0e6b065c7cc4b93b66c989e8108876e Mon Sep 17 00:00:00 2001 From: Will Thompson Date: Wed, 8 Sep 2010 19:20:18 +0100 Subject: [PATCH 1/9] Use Automake 1.11, if available, for silent rules Automake 1.11 adds support for silent rules, which are conditionally enabled in configure.in if available. Also, previously it was impossible to override the version chosen by this script; this patch makes that possible. --- autogen.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/autogen.sh b/autogen.sh index bf53b277..7c2ae062 100755 --- a/autogen.sh +++ b/autogen.sh @@ -27,8 +27,12 @@ fi DIE=1 } -AUTOMAKE=automake-1.9 -ACLOCAL=aclocal-1.9 +# If the user hasn't explicitly chosen an Automake version, use 1.11. This is +# the earliest version that gives us silent rules. +if test -z "$AUTOMAKE"; then + AUTOMAKE=automake-1.11 + ACLOCAL=aclocal-1.11 +fi ($AUTOMAKE --version) < /dev/null > /dev/null 2>&1 || { AUTOMAKE=automake From 36133656acf7169b0e242a386e8cbed19a9466ad Mon Sep 17 00:00:00 2001 From: Will Thompson Date: Wed, 8 Sep 2010 19:25:40 +0100 Subject: [PATCH 2/9] Squash warnings and spurious output from autogen.sh --- Makefile.am | 2 ++ autogen.sh | 1 - configure.in | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index a48e7069..73a34f42 100644 --- a/Makefile.am +++ b/Makefile.am @@ -65,3 +65,5 @@ update-authors: DISTCHECK_CONFIGURE_FLAGS = \ --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) + +ACLOCAL_AMFLAGS = -I m4 diff --git a/autogen.sh b/autogen.sh index 7c2ae062..4e9fa3b6 100755 --- a/autogen.sh +++ b/autogen.sh @@ -70,7 +70,6 @@ fi libtoolize --copy --force -echo $ACLOCAL $ACLOCAL_FLAGS $ACLOCAL $ACLOCAL_FLAGS ## optionally feature autoheader diff --git a/configure.in b/configure.in index c6e67649..4dda1fa1 100644 --- a/configure.in +++ b/configure.in @@ -12,6 +12,8 @@ AC_CANONICAL_HOST AC_LIBTOOL_WIN32_DLL AC_LIBTOOL_RC +AC_CONFIG_MACRO_DIR([m4]) + AM_INIT_AUTOMAKE([1.9 tar-ustar]) AM_CONFIG_HEADER(config.h) From 4d8c0c3074dc1dc0c189a2782f580335c9e5c29a Mon Sep 17 00:00:00 2001 From: Will Thompson Date: Wed, 8 Sep 2010 19:42:19 +0100 Subject: [PATCH 3/9] Silence silent build a bit more. --- test/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/Makefile.am b/test/Makefile.am index 58d313ab..5fb86357 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -122,7 +122,7 @@ dist-hook: ## copy tests to builddir so that generated tests and static tests ## are all in one place. all-local: - for D in $(TESTDIRS); do \ + $(AM_V_at)for D in $(TESTDIRS); do \ test -d $(top_builddir)/test/$$D || mkdir $(top_builddir)/test/$$D || exit 1 ; \ done ; \ if ! (test $(srcdir) = . || test $(srcdir) -ef .) ; then \ From 92ac7113d3ed732feb40dbe923895017f0c9b0d1 Mon Sep 17 00:00:00 2001 From: Will Thompson Date: Wed, 8 Sep 2010 22:19:28 +0100 Subject: [PATCH 4/9] Update a load of .gitignores --- .gitignore | 2 ++ bus/.gitignore | 1 + dbus/.gitignore | 1 + test/name-test/.gitignore | 8 ++++++-- 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 29363429..3c612d61 100644 --- a/.gitignore +++ b/.gitignore @@ -9,12 +9,14 @@ config.log config.status config.sub configure +cscope.out depcomp *.pc install-sh libtool ltmain.sh missing +m4 stamp-h1 stamp-h stamp-h.in diff --git a/bus/.gitignore b/bus/.gitignore index ff8d3038..74352674 100644 --- a/bus/.gitignore +++ b/bus/.gitignore @@ -16,6 +16,7 @@ dbus-daemon-launch-helper-test bus-test rc.messagebus messagebus +messagebus-config session.conf system.conf dbus-daemon.1 diff --git a/dbus/.gitignore b/dbus/.gitignore index 51cd09cb..34eace4d 100644 --- a/dbus/.gitignore +++ b/dbus/.gitignore @@ -14,3 +14,4 @@ dbus-arch-deps.h dbus-glib-error-enum.h *.gcno *.gcda +versioninfo.rc diff --git a/test/name-test/.gitignore b/test/name-test/.gitignore index 7e4233e5..c04df316 100644 --- a/test/name-test/.gitignore +++ b/test/name-test/.gitignore @@ -2,9 +2,13 @@ .libs Makefile Makefile.in +echo-error-output.tmp +run-with-tmp-session-bus.conf +test-ids test-names test-pending-call-dispatch test-pending-call-timeout +test-privserver +test-privserver-client +test-shutdown test-threads-init -test-ids -run-with-tmp-session-bus.conf From d0dda86f333d234d9b7951c9a44cd20918adc4ad Mon Sep 17 00:00:00 2001 From: Will Thompson Date: Wed, 8 Sep 2010 20:58:05 +0100 Subject: [PATCH 5/9] Build Doxygen documentation for `make all`. This depends on GNU Make for the wildcard dependency on all the source files in dbus/. If anyone objects very strongly to this, I'd welcome suggestions of a more portable way to do this. --- configure.in | 2 +- doc/Makefile.am | 15 ++++++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/configure.in b/configure.in index 4dda1fa1..e0472961 100644 --- a/configure.in +++ b/configure.in @@ -14,7 +14,7 @@ AC_LIBTOOL_RC AC_CONFIG_MACRO_DIR([m4]) -AM_INIT_AUTOMAKE([1.9 tar-ustar]) +AM_INIT_AUTOMAKE([1.9 tar-ustar -Wno-portability]) AM_CONFIG_HEADER(config.h) # Honor aclocal flags diff --git a/doc/Makefile.am b/doc/Makefile.am index f76335f6..d6554e16 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -19,7 +19,7 @@ HTML_FILES= \ dbus-tutorial.html if DBUS_XML_DOCS_ENABLED -all-local: $(HTML_FILES) +all-local:: $(HTML_FILES) EXTRA_DIST += $(HTML_FILES) @@ -37,5 +37,18 @@ dbus-faq.html: dbus-faq.xml endif +if DBUS_DOXYGEN_DOCS_ENABLED +# Use the index as a proxy for the entire doc tree. +DOXYGEN_HTML_INDEX = api/html/index.html + +all-local:: $(DOXYGEN_HTML_INDEX) + +$(DOXYGEN_HTML_INDEX): $(wildcard $(top_srcdir)/dbus/*.[ch]) + $(AM_V_GEN)cd $(top_builddir) && doxygen Doxyfile +endif + +clean-local: + rm -rf api + maintainer-clean-local: rm -f $(HTML_FILES) From 46b9961be70d80598eccdeda7d1064fba9914e16 Mon Sep 17 00:00:00 2001 From: Will Thompson Date: Wed, 8 Sep 2010 22:10:47 +0100 Subject: [PATCH 6/9] Move manpages to doc/ This will make integrating the building of HTML versions of these manpages into the build system way easier, at the cost of keeping manpages in a different directory to the source for the program they describe. I think this is an acceptable trade-off. --- bus/.gitignore | 1 - bus/Makefile.am | 5 +---- configure.in | 2 +- doc/.gitignore | 1 + doc/Makefile.am | 13 ++++++++++++- {tools => doc}/dbus-cleanup-sockets.1 | 0 {bus => doc}/dbus-daemon.1.in | 0 {tools => doc}/dbus-launch.1 | 0 {tools => doc}/dbus-monitor.1 | 0 {tools => doc}/dbus-send.1 | 0 {tools => doc}/dbus-uuidgen.1 | 0 tools/Makefile.am | 3 +-- 12 files changed, 16 insertions(+), 9 deletions(-) rename {tools => doc}/dbus-cleanup-sockets.1 (100%) rename {bus => doc}/dbus-daemon.1.in (100%) rename {tools => doc}/dbus-launch.1 (100%) rename {tools => doc}/dbus-monitor.1 (100%) rename {tools => doc}/dbus-send.1 (100%) rename {tools => doc}/dbus-uuidgen.1 (100%) diff --git a/bus/.gitignore b/bus/.gitignore index 74352674..bad51b1d 100644 --- a/bus/.gitignore +++ b/bus/.gitignore @@ -19,7 +19,6 @@ messagebus messagebus-config session.conf system.conf -dbus-daemon.1 bus-test-launch-helper bus-test-system dbus.service diff --git a/bus/Makefile.am b/bus/Makefile.am index 5c4fb15b..17c0df8f 100644 --- a/bus/Makefile.am +++ b/bus/Makefile.am @@ -276,9 +276,6 @@ systemdsystemunit_DATA = \ dbus.socket endif -MAN_IN_FILES=dbus-daemon.1.in -man_MANS = dbus-daemon.1 - #### Extra dist -EXTRA_DIST=$(CONFIG_IN_FILES) $(SCRIPT_IN_FILES) $(man_MANS) $(MAN_IN_FILES) +EXTRA_DIST=$(CONFIG_IN_FILES) $(SCRIPT_IN_FILES) diff --git a/configure.in b/configure.in index e0472961..6c1c9c12 100644 --- a/configure.in +++ b/configure.in @@ -1579,7 +1579,6 @@ bus/session.conf bus/messagebus bus/messagebus-config bus/rc.messagebus -bus/dbus-daemon.1 bus/dbus.service bus/dbus.socket Makefile @@ -1589,6 +1588,7 @@ tools/Makefile test/Makefile test/name-test/Makefile doc/Makefile +doc/dbus-daemon.1 dbus-1.pc test/data/valid-config-files/debug-allow-all.conf test/data/valid-config-files/debug-allow-all-sha1.conf diff --git a/doc/.gitignore b/doc/.gitignore index 3430689c..23125734 100644 --- a/doc/.gitignore +++ b/doc/.gitignore @@ -10,3 +10,4 @@ dbus-specification.html dbus-test-plan.html dbus-tutorial.html dbus-faq.html +dbus-daemon.1 diff --git a/doc/Makefile.am b/doc/Makefile.am index d6554e16..445d2fd6 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,3 +1,13 @@ +man_MANS = \ + dbus-cleanup-sockets.1 \ + dbus-daemon.1 \ + dbus-launch.1 \ + dbus-monitor.1 \ + dbus-send.1 \ + dbus-uuidgen.1 + +MAN_IN_FILES = dbus-daemon.1.in + EXTRA_DIST= \ busconfig.dtd \ diagram.png \ @@ -10,7 +20,8 @@ EXTRA_DIST= \ dcop-howto.txt \ file-boilerplate.c \ introspect.xsl \ - system-activation.txt + system-activation.txt \ + $(MAN_IN_FILES) $(man_MANS) HTML_FILES= \ dbus-faq.html \ diff --git a/tools/dbus-cleanup-sockets.1 b/doc/dbus-cleanup-sockets.1 similarity index 100% rename from tools/dbus-cleanup-sockets.1 rename to doc/dbus-cleanup-sockets.1 diff --git a/bus/dbus-daemon.1.in b/doc/dbus-daemon.1.in similarity index 100% rename from bus/dbus-daemon.1.in rename to doc/dbus-daemon.1.in diff --git a/tools/dbus-launch.1 b/doc/dbus-launch.1 similarity index 100% rename from tools/dbus-launch.1 rename to doc/dbus-launch.1 diff --git a/tools/dbus-monitor.1 b/doc/dbus-monitor.1 similarity index 100% rename from tools/dbus-monitor.1 rename to doc/dbus-monitor.1 diff --git a/tools/dbus-send.1 b/doc/dbus-send.1 similarity index 100% rename from tools/dbus-send.1 rename to doc/dbus-send.1 diff --git a/tools/dbus-uuidgen.1 b/doc/dbus-uuidgen.1 similarity index 100% rename from tools/dbus-uuidgen.1 rename to doc/dbus-uuidgen.1 diff --git a/tools/Makefile.am b/tools/Makefile.am index 271c1508..ce88c85f 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -48,8 +48,7 @@ dbus_uuidgen_LDFLAGS=@R_DYNAMIC_LDFLAG@ dbus_launch_LDADD= $(DBUS_X_LIBS) $(DBUS_CLIENT_LIBS) dbus_launch_LDFLAGS=@R_DYNAMIC_LDFLAG@ -man_MANS = dbus-send.1 dbus-monitor.1 dbus-launch.1 dbus-cleanup-sockets.1 dbus-uuidgen.1 -EXTRA_DIST = $(man_MANS) run-with-tmp-session-bus.sh strtoll.c strtoull.c +EXTRA_DIST = run-with-tmp-session-bus.sh strtoll.c strtoull.c CLEANFILES = \ run-with-tmp-session-bus.conf From e8c5d7525cb8515d62a0ca791c765b2316ebff98 Mon Sep 17 00:00:00 2001 From: Will Thompson Date: Wed, 8 Sep 2010 22:12:00 +0100 Subject: [PATCH 7/9] Report correct result of doxygen/xml doc checks Previously the configure output always said these were enabled during the 'Checking for...' stage, even if they weren't. The summary at the end of configure was correct, though. --- configure.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.in b/configure.in index 6c1c9c12..2286a0e5 100644 --- a/configure.in +++ b/configure.in @@ -1313,7 +1313,7 @@ if test x$enable_doxygen_docs = xyes; then fi AM_CONDITIONAL(DBUS_DOXYGEN_DOCS_ENABLED, test x$enable_doxygen_docs = xyes) -AC_MSG_RESULT(yes) +AC_MSG_RESULT($enable_doxygen_docs) ### XML Documentation @@ -1342,7 +1342,7 @@ if test x$enable_xml_docs = xyes; then fi AM_CONDITIONAL(DBUS_XML_DOCS_ENABLED, test x$enable_xml_docs = xyes) -AC_MSG_RESULT(yes) +AC_MSG_RESULT($enable_xml_docs) #### Have to go $localstatedir->$prefix/var->/usr/local/var From ee17175118028ad3b2c39be2fd58a21406325b91 Mon Sep 17 00:00:00 2001 From: Will Thompson Date: Wed, 8 Sep 2010 22:38:22 +0100 Subject: [PATCH 8/9] Integrate building HTML-ified manpages with the build system --- configure.in | 9 +++++++-- doc/.gitignore | 1 + doc/Makefile.am | 16 ++++++++++++++++ 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/configure.in b/configure.in index 2286a0e5..6af0ca9f 100644 --- a/configure.in +++ b/configure.in @@ -1344,6 +1344,10 @@ fi AM_CONDITIONAL(DBUS_XML_DOCS_ENABLED, test x$enable_xml_docs = xyes) AC_MSG_RESULT($enable_xml_docs) +AC_PATH_PROG([MAN2HTML], [man2html]) +AC_ARG_VAR([MAN2HTML], [Path to man2html (optional)]) +AM_CONDITIONAL(DBUS_HAVE_MAN2HTML, test x$MAN2HTML != x) + #### Have to go $localstatedir->$prefix/var->/usr/local/var #### find the actual value for $prefix that we'll end up with @@ -1630,8 +1634,9 @@ echo " 64-bit int: ${DBUS_INT64_TYPE} 32-bit int: ${DBUS_INT32_TYPE} 16-bit int: ${DBUS_INT16_TYPE} - Doxygen: ${DOXYGEN} - xmlto: ${XMLTO}" + Doxygen: ${DOXYGEN:-not found} + xmlto: ${XMLTO:-not found} + man2html: ${MAN2HTML:-not found}" echo " Maintainer mode: ${USE_MAINTAINER_MODE} diff --git a/doc/.gitignore b/doc/.gitignore index 23125734..8a38ca33 100644 --- a/doc/.gitignore +++ b/doc/.gitignore @@ -2,6 +2,7 @@ .libs Makefile Makefile.in +*.1.html *.lo *.la *.o diff --git a/doc/Makefile.am b/doc/Makefile.am index 445d2fd6..ec370843 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -8,6 +8,14 @@ man_MANS = \ MAN_IN_FILES = dbus-daemon.1.in +MAN_HTML_FILES = \ + dbus-cleanup-sockets.1.html \ + dbus-daemon.1.html \ + dbus-launch.1.html \ + dbus-monitor.1.html \ + dbus-send.1.html \ + dbus-uuidgen.1.html + EXTRA_DIST= \ busconfig.dtd \ diagram.png \ @@ -58,8 +66,16 @@ $(DOXYGEN_HTML_INDEX): $(wildcard $(top_srcdir)/dbus/*.[ch]) $(AM_V_GEN)cd $(top_builddir) && doxygen Doxyfile endif +if DBUS_HAVE_MAN2HTML +all-local:: $(MAN_HTML_FILES) + +%.1.html: %.1 + $(AM_V_GEN)( $(MAN2HTML) $< > $@.tmp && mv $@.tmp $@ ) +endif + clean-local: rm -rf api + rm -f *.1.html maintainer-clean-local: rm -f $(HTML_FILES) From 783baf9df290a30ee9157338d41a1bfebc36f2ab Mon Sep 17 00:00:00 2001 From: Will Thompson Date: Thu, 9 Sep 2010 13:15:57 +0100 Subject: [PATCH 9/9] Move uploading docs into build system. This uploads a doc tarball, and its contents, to the appropriate location on dbus.freedesktop.org. It also uploads the DTDs to the appropriate location on specifications.freedesktop.org. I believe this uploads the same files as the old update-dbus-docs.sh script did. --- configure.in | 4 +++ doc/.gitignore | 2 ++ doc/Makefile.am | 73 +++++++++++++++++++++++++++++++++++++-------- update-dbus-docs.sh | 56 ---------------------------------- 4 files changed, 66 insertions(+), 69 deletions(-) delete mode 100755 update-dbus-docs.sh diff --git a/configure.in b/configure.in index 6af0ca9f..c6033987 100644 --- a/configure.in +++ b/configure.in @@ -1348,6 +1348,10 @@ AC_PATH_PROG([MAN2HTML], [man2html]) AC_ARG_VAR([MAN2HTML], [Path to man2html (optional)]) AM_CONDITIONAL(DBUS_HAVE_MAN2HTML, test x$MAN2HTML != x) +AM_CONDITIONAL(DBUS_CAN_UPLOAD_DOCS, + test x$enable_doxygen_docs = xyes -a x$enable_xml_docs = xyes -a \ + x$MAN2HTML != x) + #### Have to go $localstatedir->$prefix/var->/usr/local/var #### find the actual value for $prefix that we'll end up with diff --git a/doc/.gitignore b/doc/.gitignore index 8a38ca33..fd193572 100644 --- a/doc/.gitignore +++ b/doc/.gitignore @@ -12,3 +12,5 @@ dbus-test-plan.html dbus-tutorial.html dbus-faq.html dbus-daemon.1 +dbus-docs +dbus-docs.tar.gz diff --git a/doc/Makefile.am b/doc/Makefile.am index ec370843..bc349f87 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -16,19 +16,25 @@ MAN_HTML_FILES = \ dbus-send.1.html \ dbus-uuidgen.1.html -EXTRA_DIST= \ - busconfig.dtd \ - diagram.png \ - diagram.svg \ - introspect.dtd \ - dbus-faq.xml \ - dbus-specification.xml \ - dbus-test-plan.xml \ - dbus-tutorial.xml \ - dcop-howto.txt \ - file-boilerplate.c \ - introspect.xsl \ - system-activation.txt \ +DTDS = \ + busconfig.dtd \ + introspect.dtd + +STATIC_DOCS = \ + diagram.png \ + diagram.svg \ + dbus-faq.xml \ + dbus-specification.xml \ + dbus-test-plan.xml \ + dbus-tutorial.xml \ + dcop-howto.txt \ + introspect.xsl \ + system-activation.txt \ + $(DTDS) + +EXTRA_DIST = \ + file-boilerplate.c \ + $(STATIC_DOCS) \ $(MAN_IN_FILES) $(man_MANS) HTML_FILES= \ @@ -73,8 +79,49 @@ all-local:: $(MAN_HTML_FILES) $(AM_V_GEN)( $(MAN2HTML) $< > $@.tmp && mv $@.tmp $@ ) endif +if DBUS_CAN_UPLOAD_DOCS +BONUS_FILES = \ + $(top_srcdir)/README \ + $(top_srcdir)/HACKING \ + $(top_srcdir)/AUTHORS \ + $(top_srcdir)/NEWS \ + $(top_srcdir)/COPYING \ + $(top_srcdir)/ChangeLog + +dbus-docs: $(STATIC_DOCS) $(HTML_FILES) $(MAN_HTML_FILES) $(BONUS_FILES) $(DOXYGEN_HTML_INDEX) + $(AM_V_at)rm -rf $@ + $(AM_V_GEN)mkdir -p $@/api + $(AM_V_at)cp $(STATIC_DOCS) $@ + $(AM_V_at)cp $(HTML_FILES) $@ + $(AM_V_at)cp $(MAN_HTML_FILES) $@ + $(AM_V_at)cp $(BONUS_FILES) $@ + $(AM_V_at)cp -r api/html $@/api + +dbus-docs.tar.gz: dbus-docs + $(AM_V_GEN)tar czf $@ $< + +DOC_SERVER = dbus.freedesktop.org +DOC_WWW_DIR = /srv/dbus.freedesktop.org/www + +SPECIFICATION_SERVER = specifications.freedesktop.org +SPECIFICATION_PATH = /srv/specifications.freedesktop.org/www/dbus/1.0 + +maintainer-upload-docs: dbus-docs.tar.gz dbus-docs + scp dbus-docs.tar.gz $(DOC_SERVER):$(DOC_WWW_DIR) + rsync -rvzP --chmod=Dg+s,ug+rwX,o=rX \ + dbus-docs/ $(DOC_SERVER):$(DOC_WWW_DIR)/doc/ + scp -p $(DTDS) $(SPECIFICATION_SERVER):$(SPECIFICATION_PATH) +else +maintainer-upload-docs: + @echo "Can't upload documentation! Re-run configure with" + @echo " --enable-doxygen-docs --enable-xml-docs" + @echo "and ensure that man2html is installed." + @false +endif + clean-local: rm -rf api + rm -rf dbus-docs rm -f *.1.html maintainer-clean-local: diff --git a/update-dbus-docs.sh b/update-dbus-docs.sh deleted file mode 100755 index 627f0a70..00000000 --- a/update-dbus-docs.sh +++ /dev/null @@ -1,56 +0,0 @@ -#! /bin/bash - -function die() -{ - echo $* 2>&1 - exit 1 -} - -if test -n "$FDUSER" ; then - echo "Using freedesktop.org account $FDUSER" - user="$FDUSER@" -else - echo "Using freedesktop.org account from ~/.ssh/config, or local username" -fi - -CHECKOUTDIR=`mktemp -d || echo /tmp/dbus-for-docs` -export CVSROOT=":ext:${user}cvs.freedesktop.org:/cvs/dbus" - -cd $CHECKOUTDIR || die "could not changedir to $CHECKOUTDIR" - -echo "Checking out to directory "`pwd` - -/bin/rm -rf dbus/doc || true ## get rid of old doxygen, etc. -cvs co dbus || die "failed to cvs update" -cd dbus || die "could not cd to dbus" - -echo "Configuring and building docs" - -## 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" -make -C doc || die "could not build docs" - -MANFILES=`find -name "dbus*.1"` -for M in $MANFILES ; do - BASENAME=`basename $M` - echo "Converting $M to $BASENAME.html" - man2html $M > doc/$BASENAME.html -done - -echo "Packing docs into tarball" -cp README HACKING AUTHORS NEWS COPYING ChangeLog doc/ || die "could not copy in assorted files" -tar cfz dbus-docs.tar.gz doc/*.dtd doc/*.xsl doc/*.xml doc/*.html doc/*.txt doc/api/html/*.html doc/api/html/*.css doc/api/html/*.png doc/api/html/*.gif doc/HACKING doc/AUTHORS doc/NEWS doc/ChangeLog doc/TODO doc/README doc/COPYING doc/*.png doc/*.svg || die "could not tar up docs" - -tar tfz dbus-docs.tar.gz | sort > tarball.list || die "could not list tarball contents" -find doc -not -type d | grep -v CVS | grep -v -E '.~[0-9.]+~' | grep -v Makefile | grep -vE '.c$' | grep -v man3dbus | grep -v .cvsignore | sort > filesystem.list || die "could not list doc/* contents" - -diff -u filesystem.list tarball.list || die "some files were not included" - -echo "Uploading docs to server" -scp dbus-docs.tar.gz "${user}"dbus.freedesktop.org: -ssh "${user}"dbus.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")' - -echo "Uploading DTD to server" -scp -p doc/introspect.dtd "${user}"dbus.freedesktop.org:/srv/specifications.freedesktop.org/www/dbus/1.0/introspect.dtd