From a7dec876aae2f4f1aa77ce26ff443de2aa9235ca Mon Sep 17 00:00:00 2001 From: Jason Smith Date: Mon, 7 Dec 2009 17:43:28 -0500 Subject: Add mono xml api file --- sources/app-indicator.sources.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 sources/app-indicator.sources.xml diff --git a/sources/app-indicator.sources.xml b/sources/app-indicator.sources.xml new file mode 100644 index 0000000..3ba4c05 --- /dev/null +++ b/sources/app-indicator.sources.xml @@ -0,0 +1,12 @@ + + + + + + app-indicator-enum-types.h.in + app-indicator-enum-types.c.in + + + + + -- cgit v1.2.3 From e945be8427993928c3753849e87011f6a93b3a1e Mon Sep 17 00:00:00 2001 From: Jason Smith Date: Mon, 7 Dec 2009 19:03:41 -0500 Subject: Make build work --- sources/app-indicator.sources.xml | 4 ++-- sources/libappindicator-api.metadata | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 sources/libappindicator-api.metadata diff --git a/sources/app-indicator.sources.xml b/sources/app-indicator.sources.xml index 3ba4c05..d2568c5 100644 --- a/sources/app-indicator.sources.xml +++ b/sources/app-indicator.sources.xml @@ -1,6 +1,6 @@ - - + + app-indicator-enum-types.h.in diff --git a/sources/libappindicator-api.metadata b/sources/libappindicator-api.metadata new file mode 100644 index 0000000..a86a375 --- /dev/null +++ b/sources/libappindicator-api.metadata @@ -0,0 +1,8 @@ + + + ApplicationIndicator + NewAttentionIcon + NewStatus + ConnectionChanged + NewIcon + -- cgit v1.2.3 From 633509804d73121082eaa5f02c361d3f8df510b2 Mon Sep 17 00:00:00 2001 From: Jason Smith Date: Mon, 7 Dec 2009 19:10:16 -0500 Subject: Ensure names are nice and pretty --- sources/libappindicator-api.metadata | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sources/libappindicator-api.metadata b/sources/libappindicator-api.metadata index a86a375..36c69e1 100644 --- a/sources/libappindicator-api.metadata +++ b/sources/libappindicator-api.metadata @@ -5,4 +5,11 @@ NewStatus ConnectionChanged NewIcon + ID + Category + Status + IconName + AttentionIconName + Menu + Connected -- cgit v1.2.3 From dc33785e02e846dc061b06a349a1d6033e333d35 Mon Sep 17 00:00:00 2001 From: Jason Smith Date: Mon, 7 Dec 2009 19:11:11 -0500 Subject: Add script to automate building (someone should do this without autofoo) --- sources/build-mono-bindings.sh | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100755 sources/build-mono-bindings.sh diff --git a/sources/build-mono-bindings.sh b/sources/build-mono-bindings.sh new file mode 100755 index 0000000..bca765e --- /dev/null +++ b/sources/build-mono-bindings.sh @@ -0,0 +1,11 @@ +#!/bin/bash + +gapi2-parser app-indicator.sources.xml + +cp libappindicator-api.raw libappindicator-api.xml + +gapi2-fixup --api=libappindicator-api.xml --metadata=libappindicator-api.metadata + +gapi2-codegen --outdir=generated `pkg-config --cflags gtk-sharp-2.0` --generate libappindicator-api.xml + +gmcs -pkg:gtk-sharp-2.0 -target:library -out:AppIndicator.dll generated/*.cs -- cgit v1.2.3 From 6d3743ef998358604fc37a3e1759257cd1061523 Mon Sep 17 00:00:00 2001 From: Cody Russell Date: Fri, 11 Dec 2009 10:28:06 -0600 Subject: Build for Mono bindings --- Makefile.am | 1 + configure.ac | 54 +++++++++++++++++++++++++++++++- sources/Makefile.am | 39 +++++++++++++++++++++++ sources/appindicator-sharp.dll.config.in | 7 +++++ sources/appindicator-sharp.pc.in | 12 +++++++ sources/build-mono-bindings.sh | 11 ------- 6 files changed, 112 insertions(+), 12 deletions(-) create mode 100644 sources/Makefile.am create mode 100644 sources/appindicator-sharp.dll.config.in create mode 100644 sources/appindicator-sharp.pc.in delete mode 100755 sources/build-mono-bindings.sh diff --git a/Makefile.am b/Makefile.am index 33f9f3e..14ff7f7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,6 @@ SUBDIRS = data \ src \ + sources \ example \ tests diff --git a/configure.ac b/configure.ac index 1b5e120..bf4aff8 100644 --- a/configure.ac +++ b/configure.ac @@ -26,7 +26,7 @@ AC_PATH_PROG([GLIB_GENMARSHAL], [glib-genmarshal]) PKG_PROG_PKG_CONFIG ########################### -# Dependencies +# Dependencies ########################### GTK_REQUIRED_VERSION=2.12 @@ -40,6 +40,55 @@ PKG_CHECK_MODULES(INDICATOR, gtk+-2.0 >= $GTK_REQUIRED_VERSION AC_SUBST(INDICATOR_CFLAGS) AC_SUBST(INDICATOR_LIBS) +########################### +# Check for Mono support +########################### +MONO_REQUIRED_VERSION=1.0 +PKG_CHECK_MODULES(MONO_DEPENDENCY, mono >= $MONO_REQUIRED_VERSION, has_mono=true, has_mono=false) + +AC_PATH_PROG(AL, al, no) +if test "x$AL" = "xno" ; then + AC_MSG_ERROR([No al tool found. You need to install Mono.]) +fi + +if test "x$has_mono" = "xtrue" ; then + GENERATED_SOURCES=generated/*.cs + AC_PATH_PROG(RUNTIME, mono, no) + + if test "x$RUNTIME" != "no" ; then + RUNTIME=mono + fi + + AC_PATH_PROG(CSC, gmcs, no) + LIB_PREFIX=.so + LIB_SUFFIX= +fi + +if test "x$CSC" = "xno" ; then + AC_MSG_ERROR([No Mono compiler found.]) +fi + +AC_SUBST(RUNTIME) +AC_SUBST(CSC) +AC_SUBST(LIB_PREFIX) +AC_SUBST(LIB_SUFFIX) +AC_SUBST(GENERATED_SOURCES) + +GLIB_SHARP_REQ_VERSION=2.12.1 +GTK_SHARP_REQ_VERSION=2.12 +PKG_CHECK_MODULES(GTK_SHARP, gtk-sharp-2.0 >= $GTK_SHARP_REQ_VERSION) +AC_SUBST(GTK_SHARP_LIBS) +AC_SUBST(GTK_SHARP_CFLAGS) + +PKG_CHECK_MODULES(GAPI, gapi-2.0 >= $GLIB_SHARP_REQ_VERSION) +AC_PATH_PROG(GAPI_PARSER, gapi2-parser, no) +AC_SUBST(GAPI_PARSER) +AC_PATH_PROG(GAPI_CODEGEN, gapi2-codegen, no) +AC_SUBST(GAPI_CODEGEN) +AC_PATH_PROG(GAPI_FIXUP, gapi2-fixup, no) +AC_SUBST(GAPI_FIXUP) + + ########################### # Check to see if we're local ########################### @@ -79,6 +128,9 @@ AC_SUBST(DBUSSERVICEDIR) AC_OUTPUT([ Makefile src/Makefile +sources/Makefile +sources/appindicator-sharp.dll.config +sources/appindicator-sharp.pc data/Makefile tests/Makefile example/Makefile diff --git a/sources/Makefile.am b/sources/Makefile.am new file mode 100644 index 0000000..23e8214 --- /dev/null +++ b/sources/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/sources/appindicator-sharp.dll.config.in b/sources/appindicator-sharp.dll.config.in new file mode 100644 index 0000000..c8caa80 --- /dev/null +++ b/sources/appindicator-sharp.dll.config.in @@ -0,0 +1,7 @@ + + + + + + + diff --git a/sources/appindicator-sharp.pc.in b/sources/appindicator-sharp.pc.in new file mode 100644 index 0000000..be5595a --- /dev/null +++ b/sources/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/sources/build-mono-bindings.sh b/sources/build-mono-bindings.sh deleted file mode 100755 index bca765e..0000000 --- a/sources/build-mono-bindings.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash - -gapi2-parser app-indicator.sources.xml - -cp libappindicator-api.raw libappindicator-api.xml - -gapi2-fixup --api=libappindicator-api.xml --metadata=libappindicator-api.metadata - -gapi2-codegen --outdir=generated `pkg-config --cflags gtk-sharp-2.0` --generate libappindicator-api.xml - -gmcs -pkg:gtk-sharp-2.0 -target:library -out:AppIndicator.dll generated/*.cs -- cgit v1.2.3 From 88a109e2f9513a4560419f0892971967636224b1 Mon Sep 17 00:00:00 2001 From: Cody Russell 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 @@ + + + + + + app-indicator-enum-types.h.in + app-indicator-enum-types.c.in + + + + + 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 @@ + + + + + + + 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 @@ + + + ApplicationIndicator + NewAttentionIcon + NewStatus + ConnectionChanged + NewIcon + ID + Category + Status + IconName + AttentionIconName + Menu + Connected + 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 @@ - - - - - - app-indicator-enum-types.h.in - app-indicator-enum-types.c.in - - - - - 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 @@ - - - - - - - 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 @@ - - - ApplicationIndicator - NewAttentionIcon - NewStatus - ConnectionChanged - NewIcon - ID - Category - Status - IconName - AttentionIconName - Menu - Connected - -- cgit v1.2.3 From 5fe114ea67dd850e36c7903ea5a6c28d693f3dc3 Mon Sep 17 00:00:00 2001 From: Cody Russell Date: Fri, 11 Dec 2009 10:32:56 -0600 Subject: Add missing Makefile.am --- bindings/Makefile.am | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 bindings/Makefile.am diff --git a/bindings/Makefile.am b/bindings/Makefile.am new file mode 100644 index 0000000..bee9b1d --- /dev/null +++ b/bindings/Makefile.am @@ -0,0 +1,2 @@ +SUBDIRS = \ + mono -- cgit v1.2.3 From 7783eb689c166151cec3ab3219d02587a3b0463f Mon Sep 17 00:00:00 2001 From: Cody Russell Date: Fri, 11 Dec 2009 11:00:29 -0600 Subject: Move appindicator-sharp.pc to appindicator-sharp-0.1.pc --- bindings/mono/Makefile.am | 6 +++--- bindings/mono/appindicator-sharp-0.1.pc.in | 12 ++++++++++++ bindings/mono/appindicator-sharp.pc.in | 12 ------------ configure.ac | 2 +- 4 files changed, 16 insertions(+), 16 deletions(-) create mode 100644 bindings/mono/appindicator-sharp-0.1.pc.in delete mode 100644 bindings/mono/appindicator-sharp.pc.in diff --git a/bindings/mono/Makefile.am b/bindings/mono/Makefile.am index 23e8214..7cabf18 100644 --- a/bindings/mono/Makefile.am +++ b/bindings/mono/Makefile.am @@ -1,5 +1,5 @@ pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = appindicator-sharp.pc +pkgconfig_DATA = appindicator-sharp-0.1.pc API = libappindicator-api.xml RAW_API = libappindicator-api.raw @@ -11,7 +11,7 @@ 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 +EXTRA_DIST = $(RAW_API) $(METADATA) appindicator-sharp-0.1.pc.in appindicator-sharp.dll.config.in references = $(GTK_SHARP_LIBS) @@ -36,4 +36,4 @@ generated-stamp: $(API) $(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 + $(CSC) $(CSFLAGS) -nowarn:0169,0612,0618 -unsafe -out:$(ASSEMBLY) -target:library $(references) $(GENERATED_SOURCES) diff --git a/bindings/mono/appindicator-sharp-0.1.pc.in b/bindings/mono/appindicator-sharp-0.1.pc.in new file mode 100644 index 0000000..16872ae --- /dev/null +++ b/bindings/mono/appindicator-sharp-0.1.pc.in @@ -0,0 +1,12 @@ +prefix=${pcfiledir}/../.. +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +assemblies_dir=${libdir}/appindicator-sharp-0.1 + +Name: appindicator-sharp +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/appindicator-sharp.pc.in b/bindings/mono/appindicator-sharp.pc.in deleted file mode 100644 index be5595a..0000000 --- a/bindings/mono/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/configure.ac b/configure.ac index 456ca87..fc1381c 100644 --- a/configure.ac +++ b/configure.ac @@ -140,7 +140,7 @@ src/libappindicator/appindicator-0.1.pc bindings/Makefile bindings/mono/Makefile bindings/mono/appindicator-sharp.dll.config -bindings/mono/appindicator-sharp.pc +bindings/mono/appindicator-sharp-0.1.pc data/Makefile tests/Makefile example/Makefile -- cgit v1.2.3 From ed4810839b0bd16af47201bae84524088b9ef178 Mon Sep 17 00:00:00 2001 From: Cody Russell Date: Fri, 11 Dec 2009 11:24:30 -0600 Subject: Fix distcheck --- bindings/mono/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bindings/mono/Makefile.am b/bindings/mono/Makefile.am index 7cabf18..a8444ea 100644 --- a/bindings/mono/Makefile.am +++ b/bindings/mono/Makefile.am @@ -11,7 +11,7 @@ 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-0.1.pc.in appindicator-sharp.dll.config.in +EXTRA_DIST = $(RAW_API) $(METADATA) appindicator-sharp-0.1.pc.in appindicator-sharp.dll.config.in app-indicator.sources.xml references = $(GTK_SHARP_LIBS) -- cgit v1.2.3 From 59526b689303cde25721d0a1fdcafdb371fdddba Mon Sep 17 00:00:00 2001 From: Cody Russell Date: Sat, 12 Dec 2009 12:20:52 -0600 Subject: Initial stab at setting up test/example fu --- bindings/mono/Makefile.am | 14 ++++- bindings/mono/TestIndicator.cs | 82 +++++++++++++++++++++++++++++ bindings/mono/examples/IndicatorExample.cs | 36 +++++++++++++ bindings/mono/examples/Makefile.am | 12 +++++ bindings/mono/examples/indicator-example.in | 2 + configure.ac | 4 ++ 6 files changed, 149 insertions(+), 1 deletion(-) create mode 100644 bindings/mono/TestIndicator.cs create mode 100644 bindings/mono/examples/IndicatorExample.cs create mode 100644 bindings/mono/examples/Makefile.am create mode 100755 bindings/mono/examples/indicator-example.in diff --git a/bindings/mono/Makefile.am b/bindings/mono/Makefile.am index a8444ea..ef03f7e 100644 --- a/bindings/mono/Makefile.am +++ b/bindings/mono/Makefile.am @@ -1,6 +1,10 @@ +SUBDIRS = . examples + pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = appindicator-sharp-0.1.pc +TEST = AppIndicator.Test.dll + API = libappindicator-api.xml RAW_API = libappindicator-api.raw METADATA = libappindicator-api.metadata @@ -9,11 +13,14 @@ 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) +CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb generated-stamp generated/*.cs $(API) $(RAW_API) $(TEST) DISTCLEANFILES = $(ASSEMBLY).config EXTRA_DIST = $(RAW_API) $(METADATA) appindicator-sharp-0.1.pc.in appindicator-sharp.dll.config.in app-indicator.sources.xml +TEST_SOURCES = TestIndicator.cs + 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 @@ -37,3 +44,8 @@ generated-stamp: $(API) $(ASSEMBLY): generated-stamp @rm -f $(ASSEMBLY).mdb $(CSC) $(CSFLAGS) -nowarn:0169,0612,0618 -unsafe -out:$(ASSEMBLY) -target:library $(references) $(GENERATED_SOURCES) + +$(TEST): $(ASSEMBLY) + $(CSC) -out:$(TEST) -target:library $(test_references) $(TEST_SOURCES) + +all: $(TEST) diff --git a/bindings/mono/TestIndicator.cs b/bindings/mono/TestIndicator.cs new file mode 100644 index 0000000..3127342 --- /dev/null +++ b/bindings/mono/TestIndicator.cs @@ -0,0 +1,82 @@ +/* + * Copyright 2009 Canonical Ltd. + * + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 3, as published + * by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranties of + * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR + * PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + * + * Authors: + * Cody Russell + */ + +using System; +using GLib; +using Gtk; +using AppIndicator; + +using NUnit.Framework; + +namespace Ayatana.AppIndicator.Test +{ + [TestFixture] + public class IndicatorTest + { + ApplicationIndicator indicator; + + private void Update () + { + while (MainContext.Pending ()) + MainContext.Iteration(true); + } + + [SetUp] + public void Init () + { + Application.Init (); + + Console.WriteLine ("Init()"); + + indicator = new ApplicationIndicator ("my-id", "my-name", Category.ApplicationStatus); + + Console.WriteLine ("Created indicator"); + + Update(); + } + + [Test] + public void TestProperties () + { + Console.WriteLine ("TestProperties()"); + + Assert.AreNotSame (indicator, null); + + Assert.AreEqual (indicator.IconName, "my-name"); + Assert.AreEqual (indicator.ID, "my-id"); + Assert.AreEqual (indicator.Status, Category.ApplicationStatus); + + Console.WriteLine ("End.."); + } + + [Test] + public void TestSetProperties () + { + Console.WriteLine ("TestSetProperties"); + + indicator.Status = Status.Attention; + indicator.AttentionIconName = "my-attention-name"; + + Assert.AreEqual (indicator.Status, Status.Attention); + Assert.AreEqual (indicator.AttentionIconName, "my-attention-name"); + + Console.WriteLine ("End.."); + } + } +} \ No newline at end of file diff --git a/bindings/mono/examples/IndicatorExample.cs b/bindings/mono/examples/IndicatorExample.cs new file mode 100644 index 0000000..0cb72a1 --- /dev/null +++ b/bindings/mono/examples/IndicatorExample.cs @@ -0,0 +1,36 @@ +using Gtk; +using AppIndicator; + +public class IndicatorExample +{ + public static void Main () + { + Application.Init (); + + Window win = new Window ("Test"); + win.Resize (200, 200); + + Label label = new Label (); + label.Text = "Hello, world!"; + + win.Add (label); + + ApplicationIndicator indicator = new ApplicationIndicator ("my-id", + "my-name", + Category.ApplicationStatus); + + indicator.Status = Status.Attention; + + /* + Menu menu = new Menu (); + menu.Append (new MenuItem ("Foo")); + menu.Append (new MenuItem ("Bar")); + + indicator.Menu = menu; + */ + + win.ShowAll (); + + Application.Run (); + } +} \ No newline at end of file diff --git a/bindings/mono/examples/Makefile.am b/bindings/mono/examples/Makefile.am new file mode 100644 index 0000000..cb7f268 --- /dev/null +++ b/bindings/mono/examples/Makefile.am @@ -0,0 +1,12 @@ +ASSEMBLY = IndicatorExample.exe +CSFILES = IndicatorExample.cs +CLEANFILES = $(ASSEMBLY) + +EXTRA_DIST = $(CSFILES) + +references = $(GTK_SHARP_LIBS) -r:$(top_builddir)/bindings/mono/appindicator-sharp.dll + +$(ASSEMBLY): + $(CSC) $(CSFLAGS) -out:$(ASSEMBLY) -target:exe $(references) $(CSFILES) + +all: $(ASSEMBLY) \ No newline at end of file diff --git a/bindings/mono/examples/indicator-example.in b/bindings/mono/examples/indicator-example.in new file mode 100755 index 0000000..3eca155 --- /dev/null +++ b/bindings/mono/examples/indicator-example.in @@ -0,0 +1,2 @@ +#!/bin/sh +MONO_PATH=@top_builddir@/bindings/mono @top_builddir@/bindings/mono/examples/IndicatorExample.exe diff --git a/configure.ac b/configure.ac index fc1381c..ca1793a 100644 --- a/configure.ac +++ b/configure.ac @@ -96,6 +96,8 @@ AC_SUBST(GAPI_CODEGEN) AC_PATH_PROG(GAPI_FIXUP, gapi2-fixup, no) AC_SUBST(GAPI_FIXUP) +PKG_CHECK_MODULES(NUNIT, nunit-2.4 >= 2.4.7) +AC_SUBST(NUNIT_LIBS) ########################### # Check to see if we're local @@ -141,6 +143,8 @@ bindings/Makefile bindings/mono/Makefile bindings/mono/appindicator-sharp.dll.config bindings/mono/appindicator-sharp-0.1.pc +bindings/mono/examples/Makefile +bindings/mono/examples/indicator-example data/Makefile tests/Makefile example/Makefile -- cgit v1.2.3 From 40f3778a064695662c814fb02ba1722501c72e9a Mon Sep 17 00:00:00 2001 From: Cody Russell Date: Sat, 12 Dec 2009 12:27:20 -0600 Subject: Try to add SetMenu() --- bindings/mono/libappindicator-api.metadata | 1 + 1 file changed, 1 insertion(+) diff --git a/bindings/mono/libappindicator-api.metadata b/bindings/mono/libappindicator-api.metadata index 36c69e1..52a44f2 100644 --- a/bindings/mono/libappindicator-api.metadata +++ b/bindings/mono/libappindicator-api.metadata @@ -12,4 +12,5 @@ AttentionIconName Menu Connected + SetMenu -- cgit v1.2.3 From 3d0245f5d5bd66855d73288a0a9e1d863cb296c9 Mon Sep 17 00:00:00 2001 From: Jason Smith Date: Mon, 14 Dec 2009 10:20:17 -0500 Subject: Make build work right --- bindings/mono/Makefile.am | 2 +- bindings/mono/libappindicator-api.metadata | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/bindings/mono/Makefile.am b/bindings/mono/Makefile.am index ef03f7e..67da2c1 100644 --- a/bindings/mono/Makefile.am +++ b/bindings/mono/Makefile.am @@ -33,7 +33,7 @@ $(API): $(METADATA) $(RAW_API) $(GAPI_FIXUP) --api=$(API) --metadata=$(srcdir)/$(METADATA); \ fi -api_includes = $(GTK_SHARP_FLAGS) +api_includes = `pkg-config --cflags gtk-sharp-2.0` generated-stamp: $(API) rm -f generated/* && \ diff --git a/bindings/mono/libappindicator-api.metadata b/bindings/mono/libappindicator-api.metadata index 52a44f2..ad0ebc0 100644 --- a/bindings/mono/libappindicator-api.metadata +++ b/bindings/mono/libappindicator-api.metadata @@ -11,6 +11,7 @@ IconName AttentionIconName Menu + GtkMenu* Connected SetMenu -- cgit v1.2.3 From 5e6e5ba6c2ad9b2919aa87da80cbbe8f4655d1c1 Mon Sep 17 00:00:00 2001 From: Jason Smith Date: Mon, 14 Dec 2009 10:32:30 -0500 Subject: Nicer fix --- bindings/mono/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bindings/mono/Makefile.am b/bindings/mono/Makefile.am index 67da2c1..cfae87a 100644 --- a/bindings/mono/Makefile.am +++ b/bindings/mono/Makefile.am @@ -33,7 +33,7 @@ $(API): $(METADATA) $(RAW_API) $(GAPI_FIXUP) --api=$(API) --metadata=$(srcdir)/$(METADATA); \ fi -api_includes = `pkg-config --cflags gtk-sharp-2.0` +api_includes = $(GTK_SHARP_CFLAGS) generated-stamp: $(API) rm -f generated/* && \ -- cgit v1.2.3 From 04e218db5fd996ebb04503949ff73584b73c80a9 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 14 Dec 2009 09:59:12 -0600 Subject: Adding the test files to dist and making sure we find them in the right directory. --- bindings/mono/Makefile.am | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/bindings/mono/Makefile.am b/bindings/mono/Makefile.am index cfae87a..b03cde8 100644 --- a/bindings/mono/Makefile.am +++ b/bindings/mono/Makefile.am @@ -15,7 +15,13 @@ assemblydir = $(libdir)/appindicator-sharp assembly_DATA = $(TARGET) CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb generated-stamp generated/*.cs $(API) $(RAW_API) $(TEST) DISTCLEANFILES = $(ASSEMBLY).config -EXTRA_DIST = $(RAW_API) $(METADATA) appindicator-sharp-0.1.pc.in appindicator-sharp.dll.config.in app-indicator.sources.xml +EXTRA_DIST = \ + $(RAW_API) \ + $(METADATA) \ + appindicator-sharp-0.1.pc.in \ + appindicator-sharp.dll.config.in \ + app-indicator.sources.xml \ + $(TEST_SOURCES) TEST_SOURCES = TestIndicator.cs @@ -43,9 +49,9 @@ generated-stamp: $(API) $(ASSEMBLY): generated-stamp @rm -f $(ASSEMBLY).mdb - $(CSC) $(CSFLAGS) -nowarn:0169,0612,0618 -unsafe -out:$(ASSEMBLY) -target:library $(references) $(GENERATED_SOURCES) + $(CSC) $(CSFLAGS) -nowarn:0169,0612,0618 -unsafe -out:$(ASSEMBLY) -target:library $(references) $(builddir)/$(GENERATED_SOURCES) -$(TEST): $(ASSEMBLY) - $(CSC) -out:$(TEST) -target:library $(test_references) $(TEST_SOURCES) +$(TEST): $(ASSEMBLY) $(TEST_SOURCES) + $(CSC) -out:$(TEST) -target:library $(test_references) $(srcdir)/$(TEST_SOURCES) all: $(TEST) -- cgit v1.2.3 From bb6fa61d8ddc76486533f01ffa645e7894705f6c Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 14 Dec 2009 09:59:29 -0600 Subject: Looking for the assembly files in the right location. --- bindings/mono/examples/Makefile.am | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bindings/mono/examples/Makefile.am b/bindings/mono/examples/Makefile.am index cb7f268..b929492 100644 --- a/bindings/mono/examples/Makefile.am +++ b/bindings/mono/examples/Makefile.am @@ -6,7 +6,7 @@ EXTRA_DIST = $(CSFILES) references = $(GTK_SHARP_LIBS) -r:$(top_builddir)/bindings/mono/appindicator-sharp.dll -$(ASSEMBLY): - $(CSC) $(CSFLAGS) -out:$(ASSEMBLY) -target:exe $(references) $(CSFILES) +$(ASSEMBLY): $(CSFILES) Makefile.am + $(CSC) $(CSFLAGS) -out:$(ASSEMBLY) -target:exe $(references) $(srcdir)/$(CSFILES) -all: $(ASSEMBLY) \ No newline at end of file +all: $(ASSEMBLY) -- cgit v1.2.3