[Telepathy-commits] [telepathy-qt4/master] Hook up code coverage analysis and other useful stuff from telepathy-glib

[Simon McVittie]

---
 .gitignore         |    5 +++++
 Makefile.am        |   22 ++++++++++++++++------
 configure.ac       |    1 +
 tools/Makefile.am  |    2 ++
 tools/lcov.am      |   21 +++++++++++++++++++++
 tools/telepathy.am |   27 +++++++++++++++++++++++++++
 6 files changed, 72 insertions(+), 6 deletions(-)
 create mode 100644 tools/lcov.am
 create mode 100644 tools/telepathy.am

diff --git a/.gitignore b/.gitignore
index 29eb3a9..e9d287d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,8 @@
 # git-ls-files --others --exclude-from=.git/info/exclude
 *.[ao]
 *.directory
+*.gcno
+*.gcda
 *.l[ao]
 *.loT
 *.moc.hpp
@@ -22,6 +24,9 @@
 /doc/
 /doxygen.cfg
 /install-sh
+/lcov.info
+/lcov.info.tmp
+/lcov.html
 /libtool
 /ltmain.sh
 /missing
diff --git a/Makefile.am b/Makefile.am
index 165c7cc..c395305 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,8 +4,6 @@ SUBDIRS = m4 tools spec TelepathyQt4 examples tests
 
 DISTCHECK_CONFIGURE_FLAGS = --disable-debug
 
-include doxygen.am
-
 EXTRA_DIST = \
     autogen.sh \
     doc/html \
@@ -18,8 +16,20 @@ check-local::
 	egrep -A 5 '[F]IXME|[T]ODO|[X]XX' $(srcdir)/TelepathyQt4/*.[ch] \
 		> FIXME.out || true
 
-dist-hook:
-	chmod u+w ${distdir}/ChangeLog
-	if test -d .git; then git log >${distdir}/ChangeLog; fi
-
 doc/html: doxygen-doc
+
+BRANCH = misc
+UPLOAD_BRANCH_TO = people.freedesktop.org:public_html/telepathy-qt4
+
+upload-branch-docs: doc/html
+	rsync -rtzvPp --chmod=a+rX doc/html/ \
+		$(UPLOAD_BRANCH_TO)-$(BRANCH)/
+
+maintainer-upload-release: _maintainer-upload-release-local
+_maintainer-upload-release-local: _maintainer-upload-release-check
+	rsync -rtvzPp --chmod=Dg+s,ug+rwX,o=rX doc/html/ \
+	telepathy.freedesktop.org:/srv/telepathy.freedesktop.org/www/doc/telepathy-qt4/
+
+include doxygen.am
+include tools/lcov.am
+include tools/telepathy.am
diff --git a/configure.ac b/configure.ac
index 818a30e..d86aae9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -66,6 +66,7 @@ dnl optimizations, etc.
 COMPILER_OPTIMISATIONS
 COMPILER_COVERAGE
 LINKER_OPTIMISATIONS
+LINKER_VERSION_SCRIPT
 
 dnl decide error flags
 TP_CXX_COMPILER_FLAG(-Wall, ERROR_CXXFLAGS="-Wall", ERROR_CXXFLAGS="")
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 9c2cd66..e67921f 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -2,11 +2,13 @@ EXTRA_DIST = \
     check-coding-style.mk \
     check-misc.sh \
     check-whitespace.sh \
+    lcov.am \
     libtpcodegen.py \
     libqt4codegen.py \
     qt4-client-gen.py \
     qt4-constants-gen.py \
     qt4-types-gen.py \
+    telepathy.am \
     with-session-bus.sh \
     xincludator.py
 
diff --git a/tools/lcov.am b/tools/lcov.am
new file mode 100644
index 0000000..73a7cf7
--- /dev/null
+++ b/tools/lcov.am
@@ -0,0 +1,21 @@
+lcov-reset:
+	lcov --directory @top_srcdir@ --zerocounters
+
+lcov-report:
+	rm -f tests/pinocchio/lib/.libs/lib.gcda
+	lcov --directory @top_srcdir@ --capture \
+		--output-file @top_builddir@/lcov.info
+	$(mkdir_p) @top_builddir@/lcov.html
+	genhtml --title @PACKAGE@ \
+		--output-directory @top_builddir@/lcov.html lcov.info
+	@echo
+	@echo 'lcov report can be found in:'
+	@echo 'file://@abs_top_builddir@/lcov.html/index.html'
+	@echo
+
+lcov-check:
+	$(MAKE) lcov-reset
+	$(MAKE) check
+	$(MAKE) lcov-report
+
+## vim:set ft=automake:
diff --git a/tools/telepathy.am b/tools/telepathy.am
new file mode 100644
index 0000000..d061b89
--- /dev/null
+++ b/tools/telepathy.am
@@ -0,0 +1,27 @@
+## Useful top-level Makefile.am snippets for Telepathy projects.
+
+dist-hook:
+	chmod u+w ${distdir}/ChangeLog
+	if test -d ${top_srcdir}/.git; then \
+		git log --stat > ${distdir}/ChangeLog || \
+		git log > ${distdir}/ChangeLog; \
+	fi
+
+maintainer-upload-release: _maintainer-upload-release
+
+_maintainer-upload-release-check:
+	@case @VERSION@ in \
+		(*.*.*.*) \
+			echo "@VERSION@ is not a release" >&2; \
+			exit 2; \
+			;; \
+	esac
+	test -f @PACKAGE at -@VERSION at .tar.gz
+	test -f @PACKAGE at -@VERSION at .tar.gz.asc
+	gpg --verify @PACKAGE at -@VERSION at .tar.gz.asc
+
+_maintainer-upload-release: _maintainer-upload-release-check
+	rsync -vzP @PACKAGE at -@VERSION at .tar.gz telepathy.freedesktop.org:/srv/telepathy.freedesktop.org/www/releases/@PACKAGE@/@PACKAGE at -@VERSION at .tar.gz
+	rsync -vzP @PACKAGE at -@VERSION at .tar.gz.asc telepathy.freedesktop.org:/srv/telepathy.freedesktop.org/www/releases/@PACKAGE@/@PACKAGE at -@VERSION at .tar.gz.asc
+
+## vim:set ft=automake:
-- 
1.5.6.5