From 88a109e2f9513a4560419f0892971967636224b1 Mon Sep 17 00:00:00 2001
From: Cody Russell <crussell@canonical.com>
Date: Fri, 11 Dec 2009 10:31:49 -0600
Subject: Move to bindings/mono

---
 Makefile.am                                    | 11 ++++----
 bindings/mono/Makefile.am                      | 39 ++++++++++++++++++++++++++
 bindings/mono/app-indicator.sources.xml        | 12 ++++++++
 bindings/mono/appindicator-sharp.dll.config.in |  7 +++++
 bindings/mono/appindicator-sharp.pc.in         | 12 ++++++++
 bindings/mono/libappindicator-api.metadata     | 15 ++++++++++
 configure.ac                                   |  7 +++--
 sources/Makefile.am                            | 39 --------------------------
 sources/app-indicator.sources.xml              | 12 --------
 sources/appindicator-sharp.dll.config.in       |  7 -----
 sources/appindicator-sharp.pc.in               | 12 --------
 sources/libappindicator-api.metadata           | 15 ----------
 12 files changed, 95 insertions(+), 93 deletions(-)
 create mode 100644 bindings/mono/Makefile.am
 create mode 100644 bindings/mono/app-indicator.sources.xml
 create mode 100644 bindings/mono/appindicator-sharp.dll.config.in
 create mode 100644 bindings/mono/appindicator-sharp.pc.in
 create mode 100644 bindings/mono/libappindicator-api.metadata
 delete mode 100644 sources/Makefile.am
 delete mode 100644 sources/app-indicator.sources.xml
 delete mode 100644 sources/appindicator-sharp.dll.config.in
 delete mode 100644 sources/appindicator-sharp.pc.in
 delete mode 100644 sources/libappindicator-api.metadata

diff --git a/Makefile.am b/Makefile.am
index 14ff7f7..aee7109 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,8 +1,9 @@
-SUBDIRS = data \
-          src \
-          sources \
-		  example \
-		  tests
+SUBDIRS =		\
+	data		\
+	src		\
+	bindings	\
+	example		\
+	tests
 
 DISTCHECK_CONFIGURE_FLAGS = --enable-localinstall
 
diff --git a/bindings/mono/Makefile.am b/bindings/mono/Makefile.am
new file mode 100644
index 0000000..23e8214
--- /dev/null
+++ b/bindings/mono/Makefile.am
@@ -0,0 +1,39 @@
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = appindicator-sharp.pc
+
+API = libappindicator-api.xml
+RAW_API = libappindicator-api.raw
+METADATA = libappindicator-api.metadata
+ASSEMBLY_NAME = appindicator-sharp
+ASSEMBLY = appindicator-sharp.dll
+TARGET = $(ASSEMBLY) $(ASSEMBLY).config
+assemblydir = $(libdir)/appindicator-sharp
+assembly_DATA = $(TARGET)
+CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb generated-stamp generated/*.cs $(API) $(RAW_API)
+DISTCLEANFILES = $(ASSEMBLY).config
+EXTRA_DIST = $(RAW_API) $(METADATA) appindicator-sharp.pc.in appindicator-sharp.dll.config.in
+
+references = $(GTK_SHARP_LIBS)
+
+$(RAW_API): app-indicator.sources.xml
+	$(GAPI_PARSER) app-indicator.sources.xml
+
+$(API): $(METADATA) $(RAW_API)
+	cp $(srcdir)/$(RAW_API) $(API)
+	chmod u+w $(API)
+	@if test -n '$(METADATA)'; then							\
+		echo "$(GAPI_FIXUP) --api=$(API) --metadata=$(srcdir)/$(METADATA)"; 	\
+		$(GAPI_FIXUP) --api=$(API) --metadata=$(srcdir)/$(METADATA);		\
+	fi
+
+api_includes = $(GTK_SHARP_FLAGS)
+
+generated-stamp: $(API)
+	rm -f generated/* &&					\
+	$(GAPI_CODEGEN) --generate $(API) $(api_includes)	\
+	--outdir=generated --assembly-name=$(ASSEMBLY_NAME)	\
+	&& touch generated-stamp
+
+$(ASSEMBLY): generated-stamp
+	@rm -f $(ASSEMBLY).mdb
+	$(CSC) $(CSFLAGS) -nowarn:0169,0612,0618 -unsafe -out:$(ASSEMBLY) -target:library $(references) $(GENERATED_SOURCES)
\ No newline at end of file
diff --git a/bindings/mono/app-indicator.sources.xml b/bindings/mono/app-indicator.sources.xml
new file mode 100644
index 0000000..8ee8758
--- /dev/null
+++ b/bindings/mono/app-indicator.sources.xml
@@ -0,0 +1,12 @@
+<gapi-parser-input>
+	<api filename="libappindicator-api.raw">
+		<library name="libappindicator.so">
+			<namespace name="AppIndicator">
+				<directory path="../../src/libappindicator">
+					<exclude>app-indicator-enum-types.h.in</exclude>
+					<exclude>app-indicator-enum-types.c.in</exclude>
+				</directory>
+			</namespace>
+		</library>
+	</api>
+</gapi-parser-input>
diff --git a/bindings/mono/appindicator-sharp.dll.config.in b/bindings/mono/appindicator-sharp.dll.config.in
new file mode 100644
index 0000000..c8caa80
--- /dev/null
+++ b/bindings/mono/appindicator-sharp.dll.config.in
@@ -0,0 +1,7 @@
+<configuration>
+  <dllmap dll="libappindicator.dll" target="libappindicator@LIB_PREFIX@.0@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@"/>
+  <dllmap dll="libgthread-2.0-0.dll" target="libgthread-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
+</configuration>
diff --git a/bindings/mono/appindicator-sharp.pc.in b/bindings/mono/appindicator-sharp.pc.in
new file mode 100644
index 0000000..be5595a
--- /dev/null
+++ b/bindings/mono/appindicator-sharp.pc.in
@@ -0,0 +1,12 @@
+prefix=${pcfiledir}/../..
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+assemblies_dir=${libdir}/appindicator-sharp
+
+Name: appindicator
+Description: application indicators for .NET
+Version: @VERSION@
+Libraries: ${assemblies_dir}/appindicator-sharp.dll ${assemblies_dir}/appindicator-sharp.dll.config
+Requires: gtk-sharp-2.0
+Cflags:
+Libs: -r:${assemblies_dir}/appindicator-sharp.dll
diff --git a/bindings/mono/libappindicator-api.metadata b/bindings/mono/libappindicator-api.metadata
new file mode 100644
index 0000000..36c69e1
--- /dev/null
+++ b/bindings/mono/libappindicator-api.metadata
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<metadata>
+	<attr path="/api/namespace/object[@cname='AppIndicator']" name="name">ApplicationIndicator</attr>
+	<attr path="/api/namespace/object[@cname='AppIndicator']/signal[@field_name='new_attention_icon']" name="name">NewAttentionIcon</attr>
+	<attr path="/api/namespace/object[@cname='AppIndicator']/signal[@field_name='new_status']" name="name">NewStatus</attr>
+	<attr path="/api/namespace/object[@cname='AppIndicator']/signal[@field_name='connection_changed']" name="name">ConnectionChanged</attr>
+	<attr path="/api/namespace/object[@cname='AppIndicator']/signal[@field_name='new_icon']" name="name">NewIcon</attr>
+	<attr path="/api/namespace/object[@cname='AppIndicator']/property[@cname='PROP_ID_S']" name="name">ID</attr>
+	<attr path="/api/namespace/object[@cname='AppIndicator']/property[@cname='PROP_CATEGORY_S']" name="name">Category</attr>
+	<attr path="/api/namespace/object[@cname='AppIndicator']/property[@cname='PROP_STATUS_S']" name="name">Status</attr>
+	<attr path="/api/namespace/object[@cname='AppIndicator']/property[@cname='PROP_ICON_NAME_S']" name="name">IconName</attr>
+	<attr path="/api/namespace/object[@cname='AppIndicator']/property[@cname='PROP_ATTENTION_ICON_NAME_S']" name="name">AttentionIconName</attr>
+	<attr path="/api/namespace/object[@cname='AppIndicator']/property[@cname='PROP_MENU_S']" name="name">Menu</attr>
+	<attr path="/api/namespace/object[@cname='AppIndicator']/property[@cname='PROP_CONNECTED_S']" name="name">Connected</attr>
+</metadata>
diff --git a/configure.ac b/configure.ac
index bf4aff8..8044d24 100644
--- a/configure.ac
+++ b/configure.ac
@@ -128,9 +128,10 @@ AC_SUBST(DBUSSERVICEDIR)
 AC_OUTPUT([
 Makefile
 src/Makefile
-sources/Makefile
-sources/appindicator-sharp.dll.config
-sources/appindicator-sharp.pc
+bindings/Makefile
+bindings/mono/Makefile
+bindings/mono/appindicator-sharp.dll.config
+bindings/mono/appindicator-sharp.pc
 data/Makefile
 tests/Makefile
 example/Makefile
diff --git a/sources/Makefile.am b/sources/Makefile.am
deleted file mode 100644
index 23e8214..0000000
--- a/sources/Makefile.am
+++ /dev/null
@@ -1,39 +0,0 @@
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = appindicator-sharp.pc
-
-API = libappindicator-api.xml
-RAW_API = libappindicator-api.raw
-METADATA = libappindicator-api.metadata
-ASSEMBLY_NAME = appindicator-sharp
-ASSEMBLY = appindicator-sharp.dll
-TARGET = $(ASSEMBLY) $(ASSEMBLY).config
-assemblydir = $(libdir)/appindicator-sharp
-assembly_DATA = $(TARGET)
-CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb generated-stamp generated/*.cs $(API) $(RAW_API)
-DISTCLEANFILES = $(ASSEMBLY).config
-EXTRA_DIST = $(RAW_API) $(METADATA) appindicator-sharp.pc.in appindicator-sharp.dll.config.in
-
-references = $(GTK_SHARP_LIBS)
-
-$(RAW_API): app-indicator.sources.xml
-	$(GAPI_PARSER) app-indicator.sources.xml
-
-$(API): $(METADATA) $(RAW_API)
-	cp $(srcdir)/$(RAW_API) $(API)
-	chmod u+w $(API)
-	@if test -n '$(METADATA)'; then							\
-		echo "$(GAPI_FIXUP) --api=$(API) --metadata=$(srcdir)/$(METADATA)"; 	\
-		$(GAPI_FIXUP) --api=$(API) --metadata=$(srcdir)/$(METADATA);		\
-	fi
-
-api_includes = $(GTK_SHARP_FLAGS)
-
-generated-stamp: $(API)
-	rm -f generated/* &&					\
-	$(GAPI_CODEGEN) --generate $(API) $(api_includes)	\
-	--outdir=generated --assembly-name=$(ASSEMBLY_NAME)	\
-	&& touch generated-stamp
-
-$(ASSEMBLY): generated-stamp
-	@rm -f $(ASSEMBLY).mdb
-	$(CSC) $(CSFLAGS) -nowarn:0169,0612,0618 -unsafe -out:$(ASSEMBLY) -target:library $(references) $(GENERATED_SOURCES)
\ No newline at end of file
diff --git a/sources/app-indicator.sources.xml b/sources/app-indicator.sources.xml
deleted file mode 100644
index d2568c5..0000000
--- a/sources/app-indicator.sources.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<gapi-parser-input>
-	<api filename="libappindicator-api.raw">
-		<library name="libappindicator.so">
-			<namespace name="AppIndicator">
-				<directory path="../src/libappindicator">
-					<exclude>app-indicator-enum-types.h.in</exclude>
-					<exclude>app-indicator-enum-types.c.in</exclude>
-				</directory>
-			</namespace>
-		</library>
-	</api>
-</gapi-parser-input>
diff --git a/sources/appindicator-sharp.dll.config.in b/sources/appindicator-sharp.dll.config.in
deleted file mode 100644
index c8caa80..0000000
--- a/sources/appindicator-sharp.dll.config.in
+++ /dev/null
@@ -1,7 +0,0 @@
-<configuration>
-  <dllmap dll="libappindicator.dll" target="libappindicator@LIB_PREFIX@.0@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@"/>
-  <dllmap dll="libgthread-2.0-0.dll" target="libgthread-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
-</configuration>
diff --git a/sources/appindicator-sharp.pc.in b/sources/appindicator-sharp.pc.in
deleted file mode 100644
index be5595a..0000000
--- a/sources/appindicator-sharp.pc.in
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=${pcfiledir}/../..
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-assemblies_dir=${libdir}/appindicator-sharp
-
-Name: appindicator
-Description: application indicators for .NET
-Version: @VERSION@
-Libraries: ${assemblies_dir}/appindicator-sharp.dll ${assemblies_dir}/appindicator-sharp.dll.config
-Requires: gtk-sharp-2.0
-Cflags:
-Libs: -r:${assemblies_dir}/appindicator-sharp.dll
diff --git a/sources/libappindicator-api.metadata b/sources/libappindicator-api.metadata
deleted file mode 100644
index 36c69e1..0000000
--- a/sources/libappindicator-api.metadata
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0"?>
-<metadata>
-	<attr path="/api/namespace/object[@cname='AppIndicator']" name="name">ApplicationIndicator</attr>
-	<attr path="/api/namespace/object[@cname='AppIndicator']/signal[@field_name='new_attention_icon']" name="name">NewAttentionIcon</attr>
-	<attr path="/api/namespace/object[@cname='AppIndicator']/signal[@field_name='new_status']" name="name">NewStatus</attr>
-	<attr path="/api/namespace/object[@cname='AppIndicator']/signal[@field_name='connection_changed']" name="name">ConnectionChanged</attr>
-	<attr path="/api/namespace/object[@cname='AppIndicator']/signal[@field_name='new_icon']" name="name">NewIcon</attr>
-	<attr path="/api/namespace/object[@cname='AppIndicator']/property[@cname='PROP_ID_S']" name="name">ID</attr>
-	<attr path="/api/namespace/object[@cname='AppIndicator']/property[@cname='PROP_CATEGORY_S']" name="name">Category</attr>
-	<attr path="/api/namespace/object[@cname='AppIndicator']/property[@cname='PROP_STATUS_S']" name="name">Status</attr>
-	<attr path="/api/namespace/object[@cname='AppIndicator']/property[@cname='PROP_ICON_NAME_S']" name="name">IconName</attr>
-	<attr path="/api/namespace/object[@cname='AppIndicator']/property[@cname='PROP_ATTENTION_ICON_NAME_S']" name="name">AttentionIconName</attr>
-	<attr path="/api/namespace/object[@cname='AppIndicator']/property[@cname='PROP_MENU_S']" name="name">Menu</attr>
-	<attr path="/api/namespace/object[@cname='AppIndicator']/property[@cname='PROP_CONNECTED_S']" name="name">Connected</attr>
-</metadata>
-- 
cgit v1.2.3