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 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) (limited to 'bindings') 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)|" \ -- cgit v1.2.3 From 4ccb5d75887671bce24df6eeaacd7eb89b2be189 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 3 Feb 2012 13:40:14 -0600 Subject: Fixing some of the properties in the mono bindings --- bindings/mono/Makefile.am | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'bindings') diff --git a/bindings/mono/Makefile.am b/bindings/mono/Makefile.am index 5bb13ab..f4a59a8 100644 --- a/bindings/mono/Makefile.am +++ b/bindings/mono/Makefile.am @@ -100,12 +100,14 @@ $(MIDDLE_API): $(METADATA) $(RAW_API) $(API): $(MIDDLE_API) Makefile.am sed -e "s|PROP_ID_S|id|" \ + -e "s|PROP_STATUS_S|Status|" \ -e "s|PROP_STATUS_S|status|" \ -e "s|PROP_CATEGORY_S|Category|" \ -e "s|PROP_CATEGORY_S|category|" \ -e "s|PROP_ICON_NAME_S|icon-name|" \ -e "s|PROP_ICON_DESC_S|IconDesc|" \ -e "s|PROP_ICON_DESC_S|icon-desc|" \ + -e "s|PROP_ATTENTION_ICON_NAME_S|AttentionIconName|" \ -e "s|PROP_ATTENTION_ICON_NAME_S|attention-icon-name|" \ -e "s|PROP_ATTENTION_ICON_DESC_S|AttentionIconDesc|" \ -e "s|PROP_ATTENTION_ICON_DESC_S|attention-icon-desc|" \ @@ -117,6 +119,8 @@ $(API): $(MIDDLE_API) Makefile.am -e "s|PROP_ORDERING_INDEX_S|ordering-index|" \ -e "s|PROP_DBUS_MENU_SERVER_S|DbusMenuServer|" \ -e "s|PROP_DBUS_MENU_SERVER_S|dbus-menu-server|" \ + -e "s|PROP_TITLE_S|Title|" \ + -e "s|PROP_TITLE_S|title|" \ $< > $@ api_includes = $(GTK_SHARP_CFLAGS) -- cgit v1.2.3