From 6f293994f8f9c260401fd76a189c7461b1b5f994 Mon Sep 17 00:00:00 2001 From: Allan LeSage Date: Tue, 27 Mar 2012 16:54:01 -0500 Subject: Added coverage tooling. --- configure.ac | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 7c067e9..f38947d 100644 --- a/configure.ac +++ b/configure.ac @@ -215,6 +215,19 @@ AC_ARG_ENABLE([tests], [enable_tests=yes]) AM_CONDITIONAL([WANT_TESTS], [test "x$enable_tests" != "xno"]) +########################### +# gcov coverage reporting +########################### + +m4_include([m4/gcov.m4]) +AC_TDD_GCOV +AM_CONDITIONAL([HAVE_GCOV], [test "x$ac_cv_check_gcov" = xyes]) +AM_CONDITIONAL([HAVE_LCOV], [test "x$ac_cv_check_lcov" = xyes]) +AM_CONDITIONAL([HAVE_GCOVR], [test "x$ac_cv_check_gcovr" = xyes]) +AC_SUBST(COVERAGE_CFLAGS) +AC_SUBST(COVERAGE_CXXFLAGS) +AC_SUBST(COVERAGE_LDFLAGS) + ########################### # Files ########################### @@ -256,4 +269,5 @@ Libappindicator Configuration: GTK+ Version: $with_gtk Tests: $enable_tests Mono tests: $have_nunit + gcov: $use_gcov ]) -- cgit v1.2.3 From 086dae17154b4da70d39cbf62a4cdd766ea1b132 Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Sun, 10 Jun 2012 09:32:04 +0200 Subject: make building mono extension optional, so we can build on archs that do not have mono --- bindings/Makefile.am | 6 ++++-- configure.ac | 30 +++++++++++++++++++----------- 2 files changed, 23 insertions(+), 13 deletions(-) (limited to 'configure.ac') diff --git a/bindings/Makefile.am b/bindings/Makefile.am index 8e621e4..d1f6d73 100644 --- a/bindings/Makefile.am +++ b/bindings/Makefile.am @@ -1,10 +1,12 @@ if USE_GTK3 SUBDIRS = \ - mono \ vala else SUBDIRS = \ - mono \ python \ vala endif + +if HAS_MONO +SUBDIRS += mono +endif diff --git a/configure.ac b/configure.ac index 1a34310..ba9071d 100644 --- a/configure.ac +++ b/configure.ac @@ -106,10 +106,11 @@ AM_CONDITIONAL(HAVE_VALAC, [test "x$VALAC" != "x"]) MONO_REQUIRED_VERSION=1.0 PKG_CHECK_MODULES(MONO_DEPENDENCY, mono >= $MONO_REQUIRED_VERSION, has_mono=true, has_mono=false) +AM_CONDITIONAL(HAS_MONO, [test "x$has_mono" = "xtrue"]) AC_PATH_PROG(AL, al, no) if test "x$AL" = "xno" ; then - AC_MSG_ERROR([No al tool found. You need to install Mono.]) + AC_MSG_NOTICE([No al tool found. You need to install Mono.]) fi if test "x$has_mono" = "xtrue" ; then @@ -126,12 +127,12 @@ if test "x$has_mono" = "xtrue" ; then fi if test "x$CSC" = "xno" ; then - AC_MSG_ERROR([No Mono compiler found.]) + AC_MSG_NOTICE([No Mono compiler found.]) fi AC_PATH_PROG(GACUTIL, gacutil, no) if test "x$GACUTIL" = "xno" ; then - AC_MSG_ERROR([No gacutil tool found]) + AC_MSG_NOTICE([No gacutil tool found]) fi AC_SUBST(RUNTIME) @@ -143,9 +144,9 @@ AC_SUBST(GENERATED_SOURCES) GLIB_SHARP_REQ_VERSION=2.12.1 GTK_SHARP_REQ_VERSION=2.12 -PKG_CHECK_MODULES(GTK_SHARP, gtk-sharp-2.0 >= $GTK_SHARP_REQ_VERSION) +PKG_CHECK_MODULES(GTK_SHARP, gtk-sharp-2.0 >= $GTK_SHARP_REQ_VERSION, has_gtksharp=true, has_gtksharp=false) -PKG_CHECK_MODULES(GAPI, gapi-2.0 >= $GLIB_SHARP_REQ_VERSION) +PKG_CHECK_MODULES(GAPI, gapi-2.0 >= $GLIB_SHARP_REQ_VERSION, has_gapi=true, has_gapi=false) AC_PATH_PROG(GAPI_PARSER, gapi2-parser, no) AC_SUBST(GAPI_PARSER) AC_PATH_PROG(GAPI_CODEGEN, gapi2-codegen, no) @@ -238,12 +239,6 @@ src/Makefile src/appindicator-0.1.pc src/appindicator3-0.1.pc bindings/Makefile -bindings/mono/Makefile -bindings/mono/appindicator-sharp.dll.config -bindings/mono/appindicator-sharp-0.1.pc -bindings/mono/app-indicator.sources.xml -bindings/mono/examples/Makefile -bindings/mono/examples/indicator-example bindings/python/Makefile bindings/python/appindicator.override bindings/vala/Makefile @@ -255,6 +250,18 @@ docs/reference/Makefile docs/reference/version.xml docs/reference/libappindicator-docs.sgml ]) + +if test "x$has_mono" = "xtrue" ; then + AC_CONFIG_FILES([ + bindings/mono/Makefile + bindings/mono/appindicator-sharp.dll.config + bindings/mono/appindicator-sharp-0.1.pc + bindings/mono/app-indicator.sources.xml + bindings/mono/examples/Makefile + bindings/mono/examples/indicator-example + ]) +fi + AC_OUTPUT ########################### @@ -267,6 +274,7 @@ Libappindicator Configuration: Prefix: $prefix GTK+ Version: $with_gtk + Mono: $has_mono Tests: $enable_tests Mono tests: $have_nunit gcov: $use_gcov -- cgit v1.2.3 From f2744fa7a2ec60767c0fa4b4e358dac86a867ad1 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Wed, 11 Jul 2012 12:28:57 -0500 Subject: bump version to 12.10.0 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index ba9071d..ee03390 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_INIT([libappindicator], - [0.4.92], + [12.10.0], [http://bugs.launchpad.net/libappindicator], [libappindicator], [http://launchpad.net/libappindicator]) -- cgit v1.2.3