From 077275b799305cc99a5c20a5fbe43cc2121ce618 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gy=C3=B6rgy=20Ball=C3=B3?= Date: Tue, 22 Nov 2011 08:36:34 +0100 Subject: Make building tests optional --- Makefile.am | 5 ++++- configure.ac | 9 +++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 5920abe..e19101d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,9 +4,12 @@ SUBDIRS = \ src \ bindings \ example \ - tests \ docs +if WANT_TESTS +SUBDIRS += tests +endif + EXTRA_DIST = \ m4/introspection.m4 \ gtk-doc.make \ diff --git a/configure.ac b/configure.ac index d271627..b05f967 100644 --- a/configure.ac +++ b/configure.ac @@ -189,6 +189,14 @@ PYGTK_CODEGEN="$PYTHON `$PKG_CONFIG --variable=codegendir pygtk-2.0`/codegen.py" AC_SUBST(PYGTK_CODEGEN) AC_MSG_RESULT($PYGTK_CODEGEN) +######################### +# Check if build tests +######################### +AC_ARG_ENABLE([tests], + AC_HELP_STRING([--disable-tests], [Disable tests]),, + [enable_tests=yes]) +AM_CONDITIONAL([WANT_TESTS], [test "x$enable_tests" != "xno"]) + ########################### # Files ########################### @@ -226,4 +234,5 @@ Libappindicator Configuration: Prefix: $prefix GTK+ Version: $with_gtk + Tests: $enable_tests ]) -- cgit v1.2.3 From 4777acb01158d1a39ad5f57a73812d4d3bf9e0ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gy=C3=B6rgy=20Ball=C3=B3?= Date: Tue, 22 Nov 2011 08:42:36 +0100 Subject: Fix header files location for GTK3 --- src/appindicator3-0.1.pc.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/appindicator3-0.1.pc.in b/src/appindicator3-0.1.pc.in index 0ffe409..f59ac70 100644 --- a/src/appindicator3-0.1.pc.in +++ b/src/appindicator3-0.1.pc.in @@ -4,7 +4,7 @@ libdir=@libdir@ bindir=@bindir@ includedir=@includedir@ -Cflags: -I${includedir}/libappindicator-0.1 +Cflags: -I${includedir}/libappindicator3-0.1 Requires: dbusmenu-glib-0.4 gtk+-3.0 Libs: -L${libdir} -lappindicator3 -- cgit v1.2.3 From c101b27f98d83e7ad2e8c36bed7eda202aab4ddd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gy=C3=B6rgy=20Ball=C3=B3?= Date: Tue, 22 Nov 2011 08:43:20 +0100 Subject: Do not link pyglib explicitly --- bindings/python/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bindings/python/Makefile.am b/bindings/python/Makefile.am index 0b606db..7febc11 100644 --- a/bindings/python/Makefile.am +++ b/bindings/python/Makefile.am @@ -19,7 +19,7 @@ pkgappindicator_PYTHON = __init__.py appindicatordir = $(pkgpyexecdir)/appindicator appindicator_LTLIBRARIES = _appindicator.la -_appindicator_la_LDFLAGS = -module -avoid-version -export-symbols-regex init_appindicator -lpyglib-2.0-python2.6 +_appindicator_la_LDFLAGS = -module -avoid-version -export-symbols-regex init_appindicator _appindicator_la_LIBADD = $(APPINDICATOR_PYTHON_LIBS) -L$(top_builddir)/src/.libs -lappindicator _appindicator_la_SOURCES = appindicatormodule.c nodist__appindicator_la_SOURCES = appindicator.c -- cgit v1.2.3 From 1798a73298c603506b571d515893ac21d4b38413 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gy=C3=B6rgy=20Ball=C3=B3?= Date: Tue, 22 Nov 2011 21:53:38 +0100 Subject: Use the standard location for mono bindings --- bindings/mono/Makefile.am | 2 +- bindings/mono/appindicator-sharp-0.1.pc.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bindings/mono/Makefile.am b/bindings/mono/Makefile.am index 9a899e1..6df22d0 100644 --- a/bindings/mono/Makefile.am +++ b/bindings/mono/Makefile.am @@ -29,7 +29,7 @@ TARGET = \ $(DLLPOLICY1) \ $(POLICY1).config -assemblydir = $(libdir)/cli/appindicator-sharp-0.1 +assemblydir = $(libdir)/mono/appindicator-sharp assembly_DATA = $(TARGET) CLEANFILES = \ diff --git a/bindings/mono/appindicator-sharp-0.1.pc.in b/bindings/mono/appindicator-sharp-0.1.pc.in index 11ae719..dc245e7 100644 --- a/bindings/mono/appindicator-sharp-0.1.pc.in +++ b/bindings/mono/appindicator-sharp-0.1.pc.in @@ -1,7 +1,7 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ libdir=@libdir@ -assemblies_dir=${libdir}/cli/appindicator-sharp-0.1 +assemblies_dir=${libdir}/mono/appindicator-sharp Name: appindicator-sharp Description: application indicators for .NET -- cgit v1.2.3 From ce8b8824e6c8b690e1f8dbd66779ecad8e03334b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gy=C3=B6rgy=20Ball=C3=B3?= Date: Wed, 23 Nov 2011 03:47:46 +0100 Subject: Make building mono tests optional. Check for mono-nunit if nunit is not available --- bindings/mono/Makefile.am | 26 ++++++++++++++++++++++---- configure.ac | 21 ++++++++++++++++++++- 2 files changed, 42 insertions(+), 5 deletions(-) diff --git a/bindings/mono/Makefile.am b/bindings/mono/Makefile.am index 9a899e1..5bb13ab 100644 --- a/bindings/mono/Makefile.am +++ b/bindings/mono/Makefile.am @@ -3,7 +3,9 @@ SUBDIRS = . examples pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = appindicator-sharp-0.1.pc +if BUILD_MONO_TEST TEST = AppIndicator.Test.dll +endif API = libappindicator-api.xml MIDDLE_API = libappindicator-api.middle @@ -40,16 +42,24 @@ CLEANFILES = \ $(API) \ $(MIDDLE_API) \ $(RAW_API) \ - $(TEST) \ $(DLLPOLICY) \ $(DLLPOLICY1) \ $(WRAPPER_FREE_BINDING) \ $(POLICY).config \ $(POLICY1).config +if BUILD_MONO_TEST +CLEANFILES += $(TEST) +endif + DISTCLEANFILES = $(ASSEMBLY).config + +if BUILD_MONO_TEST TEST_SOURCES = TestIndicator.cs +endif + customs = ApplicationIndicator.custom + EXTRA_DIST = \ AssemblyInfo.cs \ $(RAW_API) \ @@ -60,13 +70,19 @@ EXTRA_DIST = \ $(ASSEMBLY_NAME).snk \ $(POLICY).config.in \ $(POLICY1).config.in \ - $(customs) \ - $(TEST_SOURCES) + $(customs) + +if BUILD_MONO_TEST +EXTRA_DIST += $(TEST_SOURCES) +endif GACUTIL_FLAGS=-package $(ASSEMBLY_NAME) -root $(DESTDIR)$(prefix)/lib references = $(GTK_SHARP_LIBS) -test_references = $(GTK_SHARP_LIBS) $(NUNIT_LIBS) -r:$(ASSEMBLY) + +if BUILD_MONO_TEST +test_references = $(GTK_SHARP_LIBS) $(NUNIT_LIBS) $(MONO_NUNIT_LIBS) -r:$(ASSEMBLY) +endif $(RAW_API): app-indicator.sources.xml $(WRAPPER_FREE_BINDING) $(GAPI_PARSER) $(srcdir)/app-indicator.sources.xml @@ -130,10 +146,12 @@ uninstall-local: echo "$(GACUTIL) -u $(DLLPOLICY) $(GACUTIL_FLAGS)"; \ $(GACUTIL) -u $(POLICY) $(GACUTIL_FLAGS) || exit 1; +if BUILD_MONO_TEST $(TEST): $(ASSEMBLY) $(TEST_SOURCES) $(CSC) -out:$(TEST) -target:library $(test_references) $(srcdir)/$(TEST_SOURCES) all: $(TEST) +endif $(POLICY).config: $(POLICY).config.in Makefile sed -e "s|@ASSEMBLY_NAME@|$(ASSEMBLY_NAME)|" \ diff --git a/configure.ac b/configure.ac index b05f967..fe2d754 100644 --- a/configure.ac +++ b/configure.ac @@ -153,7 +153,25 @@ AC_SUBST(GAPI_CODEGEN) AC_PATH_PROG(GAPI_FIXUP, gapi2-fixup, no) AC_SUBST(GAPI_FIXUP) -PKG_CHECK_MODULES(NUNIT, nunit >= 2.4.7) +# Check for nunit +AC_ARG_ENABLE([mono-test], + AC_HELP_STRING([--disable-mono-test], [Disable mono test]),, + [enable_mono_test=auto]) + +if test x"$enable_mono_test" != x"no" ; then + PKG_CHECK_MODULES(NUNIT, nunit >= 2.4.7, + [have_nunit=yes], + [PKG_CHECK_MODULES(MONO_NUNIT, mono-nunit, + [have_nunit=yes], + [have_nunit=no]) + ]) + if test x${enable_mono_test} = xyes && test x${have_nunit} = xno; then + AC_MSG_ERROR([Mono test configured but nunit not found]) + fi +else + have_nunit=no +fi +AM_CONDITIONAL(BUILD_MONO_TEST, test x${have_nunit} = xyes) ########################### # Check to see if we're local @@ -235,4 +253,5 @@ Libappindicator Configuration: Prefix: $prefix GTK+ Version: $with_gtk Tests: $enable_tests + Mono tests: $have_nunit ]) -- cgit v1.2.3 From 95620c4bca686364c0b98ec4cc9b5aa4fae40d65 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Tue, 24 Jan 2012 14:22:39 -0500 Subject: Don't specify pyglib-2.0-python2.6 in LDFLAGS, it isn't needed and only works with python2.6 --- bindings/python/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bindings/python/Makefile.am b/bindings/python/Makefile.am index 0b606db..7febc11 100644 --- a/bindings/python/Makefile.am +++ b/bindings/python/Makefile.am @@ -19,7 +19,7 @@ pkgappindicator_PYTHON = __init__.py appindicatordir = $(pkgpyexecdir)/appindicator appindicator_LTLIBRARIES = _appindicator.la -_appindicator_la_LDFLAGS = -module -avoid-version -export-symbols-regex init_appindicator -lpyglib-2.0-python2.6 +_appindicator_la_LDFLAGS = -module -avoid-version -export-symbols-regex init_appindicator _appindicator_la_LIBADD = $(APPINDICATOR_PYTHON_LIBS) -L$(top_builddir)/src/.libs -lappindicator _appindicator_la_SOURCES = appindicatormodule.c nodist__appindicator_la_SOURCES = appindicator.c -- cgit v1.2.3