diff options
| author | Sense Egbert Hofstede <sense@ubuntu.com> | 2010-09-20 17:54:51 +0200 |
|---|---|---|
| committer | Sense Egbert Hofstede <sense@ubuntu.com> | 2010-09-20 17:54:51 +0200 |
| commit | 482276fcb7af568bf09047d9613e6817c4af8ad1 (patch) | |
| tree | 0b0c6ff946e998a15a459800acd73a1ac82c9293 | |
| parent | 6c8da9ed8f79fb5f411a4130c99ce3189b7b5b82 (diff) | |
| parent | 316dbc5d675e78b92334dc087d95c795a3a108d0 (diff) | |
| download | ayatana-indicator-application-482276fcb7af568bf09047d9613e6817c4af8ad1.tar.gz ayatana-indicator-application-482276fcb7af568bf09047d9613e6817c4af8ad1.tar.bz2 ayatana-indicator-application-482276fcb7af568bf09047d9613e6817c4af8ad1.zip | |
Merging Jo Shields' fixes to the build infrastructure to shut GAPI up.
| -rw-r--r-- | bindings/mono/ApplicationIndicator.custom | 8 | ||||
| -rw-r--r-- | bindings/mono/Makefile.am | 8 | ||||
| -rw-r--r-- | bindings/mono/app-indicator.sources.xml | 4 | ||||
| -rw-r--r-- | bindings/mono/appindicator-sharp.dll.config.in | 2 |
4 files changed, 14 insertions, 8 deletions
diff --git a/bindings/mono/ApplicationIndicator.custom b/bindings/mono/ApplicationIndicator.custom index 11d16a8..fcc52d7 100644 --- a/bindings/mono/ApplicationIndicator.custom +++ b/bindings/mono/ApplicationIndicator.custom @@ -1,10 +1,10 @@ -[DllImport ("libappindicator.so.0")] +[DllImport ("appindicator.dll")] static extern int app_indicator_get_status (IntPtr i); -[DllImport ("libappindicator.so.0")] +[DllImport ("appindicator.dll")] static extern int app_indicator_get_category (IntPtr i); -[DllImport ("libappindicator.so.0")] +[DllImport ("appindicator.dll")] static extern void app_indicator_set_status (IntPtr i, int s); [GLib.Property ("status")] @@ -23,4 +23,4 @@ static extern void app_indicator_set_status (IntPtr i, int s); get { return (Category) app_indicator_get_category (Handle); } - }
\ No newline at end of file + } diff --git a/bindings/mono/Makefile.am b/bindings/mono/Makefile.am index 203dcae..d9c0ef6 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) diff --git a/bindings/mono/app-indicator.sources.xml b/bindings/mono/app-indicator.sources.xml index 2649eb4..6cf28e9 100644 --- a/bindings/mono/app-indicator.sources.xml +++ b/bindings/mono/app-indicator.sources.xml @@ -1,8 +1,8 @@ <gapi-parser-input> <api filename="libappindicator-api.raw"> - <library name="libappindicator.so.0"> + <library name="appindicator.dll"> <namespace name="AppIndicator"> - <file>../../src/app-indicator.c</file> + <file>app-indicator.c</file> <file>../../src/app-indicator-enum-types.c</file> <file>../../src/app-indicator-enum-types.h</file> <file>../../src/app-indicator.h</file> diff --git a/bindings/mono/appindicator-sharp.dll.config.in b/bindings/mono/appindicator-sharp.dll.config.in index d0e9e1e..2d21d00 100644 --- a/bindings/mono/appindicator-sharp.dll.config.in +++ b/bindings/mono/appindicator-sharp.dll.config.in @@ -1,5 +1,5 @@ <configuration> - <dllmap dll="appindicator-sharp.dll" target="libappindicator@LIB_PREFIX@.0@LIB_SUFFIX@"/> + <dllmap dll="appindicator.dll" target="libappindicator@LIB_PREFIX@.1@LIB_SUFFIX@"/> <dllmap dll="libgtk-2.0-0.dll" target="libgtk-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/> <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/> <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/> |