From e050bfc4eedf02d0adffecca9f3cf901e73686b2 Mon Sep 17 00:00:00 2001 From: Sense Egbert Hofstede Date: Sat, 18 Sep 2010 19:20:11 +0200 Subject: Commit latest changes before merging with trunk --- bindings/mono/Makefile.am | 3 +++ 1 file changed, 3 insertions(+) (limited to 'bindings/mono/Makefile.am') diff --git a/bindings/mono/Makefile.am b/bindings/mono/Makefile.am index 98fe6f9..203dcae 100644 --- a/bindings/mono/Makefile.am +++ b/bindings/mono/Makefile.am @@ -77,6 +77,9 @@ $(API): $(MIDDLE_API) Makefile.am -e "s|PROP_ICON_THEME_PATH_S|icon-theme-path|" \ -e "s|PROP_MENU_S|menu|" \ -e "s|PROP_CONNECTED_S|connected|" \ + -e "s|PROP_LABEL_S|label|" \ + -e "s|PROP_LABEL_GUIDE_S|label-guide|" \ + -e "s|PROP_ORDERING_INDEX_S|ordering-index|" \ $< > $@ api_includes = $(GTK_SHARP_CFLAGS) -- cgit v1.2.3 From b598108bd71748ab0dc7088a36835864f5f96e22 Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Sun, 19 Sep 2010 20:41:59 +0100 Subject: gapi2-parser cannot cope with multiple signals connected to the same method - it will bail out, complaining it cannot find a method to match the second signal. This patch modifies the build system to copy app-indicator.c locally, with the "bad" X_NEW_LABEL signal removed, and use that copy to build the binding. --- bindings/mono/Makefile.am | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'bindings/mono/Makefile.am') diff --git a/bindings/mono/Makefile.am b/bindings/mono/Makefile.am index 98fe6f9..b504d9a 100644 --- a/bindings/mono/Makefile.am +++ b/bindings/mono/Makefile.am @@ -15,6 +15,8 @@ ASSEMBLY = $(ASSEMBLY_NAME).dll POLICY = policy.$(POLICY_VERSION).$(ASSEMBLY_NAME) POLICY_VERSION = 0.0 DLLPOLICY = $(POLICY).dll +WRAPPER_FREE_BINDING_SRC = ../../src/app-indicator.c +WRAPPER_FREE_BINDING = app-indicator.c TARGET = \ $(ASSEMBLY) \ @@ -35,6 +37,7 @@ CLEANFILES = \ $(RAW_API) \ $(TEST) \ $(DLLPOLICY) \ + $(WRAPPER_FREE_BINDING) \ $(POLICY).config DISTCLEANFILES = $(ASSEMBLY).config @@ -57,9 +60,12 @@ GACUTIL_FLAGS=-package $(ASSEMBLY_NAME) -root $(DESTDIR)$(prefix)/lib references = $(GTK_SHARP_LIBS) test_references = $(GTK_SHARP_LIBS) $(NUNIT_LIBS) -r:$(ASSEMBLY) -$(RAW_API): app-indicator.sources.xml +$(RAW_API): app-indicator.sources.xml $(WRAPPER_FREE_BINDING) $(GAPI_PARSER) app-indicator.sources.xml +$(WRAPPER_FREE_BINDING): $(WRAPPER_FREE_BINDING_SRC) + sed '/signals\[X_NEW_LABEL\] /,+6d' $(WRAPPER_FREE_BINDING_SRC) > $(WRAPPER_FREE_BINDING) + $(MIDDLE_API): $(METADATA) $(RAW_API) cp $(srcdir)/$(RAW_API) $(MIDDLE_API) chmod u+w $(MIDDLE_API) -- cgit v1.2.3 From 3f3c6a091cb6f724905f94bec6c66175335ba73b Mon Sep 17 00:00:00 2001 From: Sense Egbert Hofstede Date: Mon, 20 Sep 2010 20:28:10 +0200 Subject: * Adding Python bindings for the new API additons * Updating the Mono assembly version to reflect the changes to the API * Remove two redundant elements from the Mono bindings' metadata file --- bindings/mono/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bindings/mono/Makefile.am') diff --git a/bindings/mono/Makefile.am b/bindings/mono/Makefile.am index d9c0ef6..2ad6d87 100644 --- a/bindings/mono/Makefile.am +++ b/bindings/mono/Makefile.am @@ -10,7 +10,7 @@ MIDDLE_API = libappindicator-api.middle RAW_API = libappindicator-api.raw METADATA = libappindicator-api.metadata ASSEMBLY_NAME = appindicator-sharp -ASSEMBLY_VERSION = 0.1.0.0 +ASSEMBLY_VERSION = 0.2.0.0 ASSEMBLY = $(ASSEMBLY_NAME).dll POLICY = policy.$(POLICY_VERSION).$(ASSEMBLY_NAME) POLICY_VERSION = 0.0 -- cgit v1.2.3 From df5dbe27aa3446bf9c7ea8953968bc49a4db5864 Mon Sep 17 00:00:00 2001 From: Sense Egbert Hofstede Date: Tue, 21 Sep 2010 21:13:43 +0200 Subject: Created a second policy file to make sure that applications depending on 'appindicator-sharp' will not have to be recompiled. Changes to the packaging is required to make sure the policy file gets installed. Many thanks to Jo Shields for looking into this issue and proposing a solution. --- bindings/mono/Makefile.am | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) (limited to 'bindings/mono/Makefile.am') diff --git a/bindings/mono/Makefile.am b/bindings/mono/Makefile.am index 2ad6d87..c9c038b 100644 --- a/bindings/mono/Makefile.am +++ b/bindings/mono/Makefile.am @@ -15,6 +15,9 @@ ASSEMBLY = $(ASSEMBLY_NAME).dll POLICY = policy.$(POLICY_VERSION).$(ASSEMBLY_NAME) POLICY_VERSION = 0.0 DLLPOLICY = $(POLICY).dll +POLICY1 = policy.$(POLICY1_VERSION).$(ASSEMBLY_NAME) +POLICY1_VERSION = 0.1 +DLLPOLICY1 = $(POLICY1).dll WRAPPER_FREE_BINDING_SRC = ../../src/app-indicator.c WRAPPER_FREE_BINDING = app-indicator.c @@ -22,7 +25,9 @@ TARGET = \ $(ASSEMBLY) \ $(ASSEMBLY).config \ $(DLLPOLICY) \ - $(POLICY).config + $(POLICY).config \ + $(DLLPOLICY1) \ + $(POLICY1).config assemblydir = $(libdir)/cli/appindicator-sharp-0.1 assembly_DATA = $(TARGET) @@ -37,8 +42,10 @@ CLEANFILES = \ $(RAW_API) \ $(TEST) \ $(DLLPOLICY) \ + $(DLLPOLICY1) \ $(WRAPPER_FREE_BINDING) \ - $(POLICY).config + $(POLICY).config \ + $(POLICY1).config DISTCLEANFILES = $(ASSEMBLY).config TEST_SOURCES = TestIndicator.cs @@ -52,6 +59,7 @@ EXTRA_DIST = \ app-indicator.sources.xml \ $(ASSEMBLY_NAME).snk \ $(POLICY).config.in \ + $(POLICY1).config.in \ $(customs) \ $(TEST_SOURCES) @@ -128,3 +136,11 @@ $(POLICY).config: $(POLICY).config.in Makefile $(DLLPOLICY): $(POLICY).config $(ASSEMBLY_NAME).snk Makefile $(AL) -link:$(POLICY).config -out:$(DLLPOLICY) -keyfile:$(srcdir)/$(ASSEMBLY_NAME).snk + +$(POLICY1).config: $(POLICY1).config.in Makefile + sed -e "s|@ASSEMBLY_NAME@|$(ASSEMBLY_NAME)|" \ + -e "s|@ASSEMBLY_VERSION@|$(ASSEMBLY_VERSION)|g" \ + $< > $@ + +$(DLLPOLICY1): $(POLICY1).config $(ASSEMBLY_NAME).snk Makefile + $(AL) -link:$(POLICY1).config -out:$(DLLPOLICY1) -keyfile:$(srcdir)/$(ASSEMBLY_NAME).snk -- cgit v1.2.3