diff options
| author | Ted Gould <ted@gould.cx> | 2010-09-21 10:46:32 -0500 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-09-21 10:46:32 -0500 |
| commit | 2491cd3e0bc6d6140c28fb5ebcda363299e34e90 (patch) | |
| tree | 32718c369c09a20cc1613c0585bc5aed429439fb /bindings | |
| parent | 50aa305c42afacb9b6ba09a3d10961aaebee0626 (diff) | |
| parent | 1be18c59d8366b80291977e93f97847ba23eca0e (diff) | |
| download | libayatana-appindicator-2491cd3e0bc6d6140c28fb5ebcda363299e34e90.tar.gz libayatana-appindicator-2491cd3e0bc6d6140c28fb5ebcda363299e34e90.tar.bz2 libayatana-appindicator-2491cd3e0bc6d6140c28fb5ebcda363299e34e90.zip | |
* Upstream Merge
* Fix Mono binding versioning and build (LP: #636132)
Diffstat (limited to 'bindings')
| -rw-r--r-- | bindings/mono/ApplicationIndicator.custom | 8 | ||||
| -rw-r--r-- | bindings/mono/Makefile.am | 10 | ||||
| -rw-r--r-- | bindings/mono/app-indicator.sources.xml | 4 | ||||
| -rw-r--r-- | bindings/mono/appindicator-sharp.dll.config.in | 2 |
4 files changed, 15 insertions, 9 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 98fe6f9..8d0444c 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 = $(top_srcdir)/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,8 +60,11 @@ 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 - $(GAPI_PARSER) app-indicator.sources.xml +$(RAW_API): app-indicator.sources.xml $(WRAPPER_FREE_BINDING) + $(GAPI_PARSER) $(srcdir)/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) 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@"/> |