Merge lp:~directhex/libubuntuone/mono-bindings into lp:libubuntuone

[Jo Shields]

Add Mono bindings

This change includes auto-generated Mono bindings, including integration with the build system and a pkg-config file.

[Rodrigo Moya (rodrigo-moya)]

Looks good, except for one thing, which is that I'd like the mono bindings to be optional, that is:

108 +dnl Checks for Mono bindings
109 +AC_PATH_PROG(MONO_GAPI_PARSER, gapi2-parser, no)
110 +if test "x$MONO_GAPI_PARSER" = "xno"; then
111 + AC_MSG_ERROR(could not find gapi2-parser)
112 +fi
113 +
114 +AC_PATH_PROG(MONO_GAPI_CODEGEN, gapi2-codegen, no)
115 +if test "x$MONO_GAPI_CODEGEN" = "xno"; then
116 + AC_MSG_ERROR(could not find gapi2-codegen)
117 +fi
118 +
119 +AC_PATH_PROG(MONO_CSC, gmcs, no)
120 +if test "x$MONO_CSC" = "xno"; then
121 + AC_MSG_ERROR(could not find gmcs compiler)
122 +fi
123 +
124 +

and

132 +PKG_CHECK_MODULES(GTKSHARP, gtk-sharp-2.0)
133 AC_SUBST(PYGTK_CFLAGS)
134 AC_SUBST(PYGTK_LIBS)
135 +AC_SUBST(GTKSHARP_CFLAGS)
136 +AC_SUBST(GTKSHARP_LIBS)

it should check for the existence of the modules needed for the Mono bindings, but not fail, so that libu1 can be built even if those are not found, thus leaving the mono bindings unbuilt. This needs to be done also for the Python bindings though

review: Needs Fixing

[Rodrigo Moya (rodrigo-moya)]

Inclusion of Mono bindings has been accepted for Lucid, so merging this. We'll fix the issues in other branches

review: Approve

[Rodrigo Moya (rodrigo-moya)]

The attempt to merge lp:~directhex/libubuntuone/mono-bindings into lp:libubuntuone failed.Below is the output from the failed tests.

/usr/bin/gnome-autogen.sh
checking for autoconf >= 2.53...
(B testing autoconf2.50... not found.
  testing autoconf... found 2.64
checking for automake >= 1.6...
(B testing automake-1.11... found 1.11
checking for libtool >= 1.5...
(B testing libtoolize... found 2.2.6
checking for glib-gettext >= 2.2.0...
(B testing glib-gettextize... found 2.22.3
checking for intltool >= 0.30...
(B testing intltoolize... found 0.41.0
checking for pkg-config >= 0.14.0...
(B testing pkg-config... found 0.22
checking for gtk-doc >= 1.0...
(B testing gtkdocize... found 1.11
Checking for required M4 macros...
(BChecking for forbidden M4 macros...
(BProcessing ./configure.ac
(BRunning libtoolize...
(Blibtoolize: putting auxiliary files in `.'.
libtoolize: copying file `./ltmain.sh'
libtoolize: Consider adding `AC_CONFIG_MACRO_DIR([m4])' to configure.ac and
libtoolize: rerunning libtoolize, to keep the correct libtool macros in-tree.
libtoolize: Consider adding `-I m4' to ACLOCAL_AMFLAGS in Makefile.am.
Running glib-gettextize... Ignore non-fatal messages.
(BCopying file mkinstalldirs
Copying file po/Makefile.in.in

Please add the files
  codeset.m4 gettext.m4 glibc21.m4 iconv.m4 isc-posix.m4 lcmessage.m4
  progtest.m4
from the /aclocal directory to your autoconf macro directory
or directly to your aclocal.m4 file.
You will also need config.guess and config.sub, which you can get from
ftp://ftp.gnu.org/pub/gnu/config/.

Running intltoolize...
(BRunning gtkdocize...
(BRunning aclocal-1.11...
(BRunning autoconf...
(BRunning autoheader...
(BRunning automake-1.11...
(BRunning ./configure --prefix=/usr ...
(Bchecking for a BSD-compatible install... /usr/bin/install -c
checking whether build environment is sane... yes
checking for a thread-safe mkdir -p... /bin/mkdir -p
checking for gawk... no
checking for mawk... mawk
checking whether make sets $(MAKE)... yes
checking for style of include used by make... GNU
checking for gcc... gcc
checking for C compiler default output file name... a.out
checking whether the C compiler works... yes
checking whether we are cross compiling... no
checking for suffix of executables...
checking for suffix of object files... o
checking whether we are using the GNU C compiler... yes
checking whether gcc accepts -g... yes
checking for gcc option to accept ISO C89... none needed
checking dependency style of gcc... gcc3
checking how to run the C preprocessor... gcc -E
checking for grep that handles long lines and -e... /bin/grep
checking for egrep... /bin/grep -E
checking for ANSI C header files... yes
checking for sys/types.h... yes
checking for sys/stat.h... yes
checking for stdlib.h... yes
checking for string.h... yes
checking for memory.h... yes
checking for strings.h... yes
checking for inttypes.h... yes
checking for stdint.h... yes
checking for unistd.h... yes
checking minix/config.h usability... no
checking minix/config.h presence... no
checking for ...

[Rodrigo Moya (rodrigo-moya)]

Attempt to merge lp:~directhex/libubuntuone/mono-bindings into lp:libubuntuone failed due to merge conflicts:

duplicate in bindings/mono.moved

[Rodrigo Moya (rodrigo-moya)]

The attempt to merge lp:~directhex/libubuntuone/mono-bindings into lp:libubuntuone failed.Below is the output from the failed tests.

/usr/bin/gnome-autogen.sh
checking for autoconf >= 2.53...
(B testing autoconf2.50... not found.
  testing autoconf... found 2.64
checking for automake >= 1.6...
(B testing automake-1.11... found 1.11
checking for libtool >= 1.5...
(B testing libtoolize... found 2.2.6
checking for glib-gettext >= 2.2.0...
(B testing glib-gettextize... found 2.22.3
checking for intltool >= 0.30...
(B testing intltoolize... found 0.41.0
checking for pkg-config >= 0.14.0...
(B testing pkg-config... found 0.22
checking for gtk-doc >= 1.0...
(B testing gtkdocize... found 1.11
Checking for required M4 macros...
(BChecking for forbidden M4 macros...
(BProcessing ./configure.ac
(BRunning libtoolize...
(Blibtoolize: putting auxiliary files in `.'.
libtoolize: copying file `./ltmain.sh'
libtoolize: Consider adding `AC_CONFIG_MACRO_DIR([m4])' to configure.ac and
libtoolize: rerunning libtoolize, to keep the correct libtool macros in-tree.
libtoolize: Consider adding `-I m4' to ACLOCAL_AMFLAGS in Makefile.am.
Running glib-gettextize... Ignore non-fatal messages.
(BCopying file mkinstalldirs
Copying file po/Makefile.in.in

Please add the files
  codeset.m4 gettext.m4 glibc21.m4 iconv.m4 isc-posix.m4 lcmessage.m4
  progtest.m4
from the /aclocal directory to your autoconf macro directory
or directly to your aclocal.m4 file.
You will also need config.guess and config.sub, which you can get from
ftp://ftp.gnu.org/pub/gnu/config/.

Running intltoolize...
(BRunning gtkdocize...
(BRunning aclocal-1.11...
(BRunning autoconf...
(BRunning autoheader...
(BRunning automake-1.11...
(BRunning ./configure --prefix=/usr ...
(Bchecking for a BSD-compatible install... /usr/bin/install -c
checking whether build environment is sane... yes
checking for a thread-safe mkdir -p... /bin/mkdir -p
checking for gawk... no
checking for mawk... mawk
checking whether make sets $(MAKE)... yes
checking for style of include used by make... GNU
checking for gcc... gcc
checking for C compiler default output file name... a.out
checking whether the C compiler works... yes
checking whether we are cross compiling... no
checking for suffix of executables...
checking for suffix of object files... o
checking whether we are using the GNU C compiler... yes
checking whether gcc accepts -g... yes
checking for gcc option to accept ISO C89... none needed
checking dependency style of gcc... gcc3
checking how to run the C preprocessor... gcc -E
checking for grep that handles long lines and -e... /bin/grep
checking for egrep... /bin/grep -E
checking for ANSI C header files... yes
checking for sys/types.h... yes
checking for sys/stat.h... yes
checking for stdlib.h... yes
checking for string.h... yes
checking for memory.h... yes
checking for strings.h... yes
checking for inttypes.h... yes
checking for stdint.h... yes
checking for unistd.h... yes
checking minix/config.h usability... no
checking minix/config.h presence... no
checking for ...

[Rodrigo Moya (rodrigo-moya)]

Attempt to merge lp:~directhex/libubuntuone/mono-bindings into lp:libubuntuone failed due to merge conflicts:

duplicate in bindings/mono.moved
duplicate in bindings/mono.moved.moved

[Rodrigo Moya (rodrigo-moya)]

The attempt to merge lp:~directhex/libubuntuone/mono-bindings into lp:libubuntuone failed.Below is the output from the failed tests.

/usr/bin/gnome-autogen.sh
checking for autoconf >= 2.53...
(B testing autoconf2.50... not found.
  testing autoconf... found 2.64
checking for automake >= 1.6...
(B testing automake-1.11... found 1.11
checking for libtool >= 1.5...
(B testing libtoolize... found 2.2.6
checking for glib-gettext >= 2.2.0...
(B testing glib-gettextize... found 2.22.3
checking for intltool >= 0.30...
(B testing intltoolize... found 0.41.0
checking for pkg-config >= 0.14.0...
(B testing pkg-config... found 0.22
checking for gtk-doc >= 1.0...
(B testing gtkdocize... found 1.11
Checking for required M4 macros...
(BChecking for forbidden M4 macros...
(BProcessing ./configure.ac
(BRunning libtoolize...
(Blibtoolize: putting auxiliary files in `.'.
libtoolize: copying file `./ltmain.sh'
libtoolize: Consider adding `AC_CONFIG_MACRO_DIR([m4])' to configure.ac and
libtoolize: rerunning libtoolize, to keep the correct libtool macros in-tree.
libtoolize: Consider adding `-I m4' to ACLOCAL_AMFLAGS in Makefile.am.
Running glib-gettextize... Ignore non-fatal messages.
(BCopying file mkinstalldirs
Copying file po/Makefile.in.in

Please add the files
  codeset.m4 gettext.m4 glibc21.m4 iconv.m4 isc-posix.m4 lcmessage.m4
  progtest.m4
from the /aclocal directory to your autoconf macro directory
or directly to your aclocal.m4 file.
You will also need config.guess and config.sub, which you can get from
ftp://ftp.gnu.org/pub/gnu/config/.

Running intltoolize...
(BRunning gtkdocize...
(BRunning aclocal-1.11...
(BRunning autoconf...
(BRunning autoheader...
(BRunning automake-1.11...
(BRunning ./configure --prefix=/usr ...
(Bchecking for a BSD-compatible install... /usr/bin/install -c
checking whether build environment is sane... yes
checking for a thread-safe mkdir -p... /bin/mkdir -p
checking for gawk... no
checking for mawk... mawk
checking whether make sets $(MAKE)... yes
checking for style of include used by make... GNU
checking for gcc... gcc
checking for C compiler default output file name... a.out
checking whether the C compiler works... yes
checking whether we are cross compiling... no
checking for suffix of executables...
checking for suffix of object files... o
checking whether we are using the GNU C compiler... yes
checking whether gcc accepts -g... yes
checking for gcc option to accept ISO C89... none needed
checking dependency style of gcc... gcc3
checking how to run the C preprocessor... gcc -E
checking for grep that handles long lines and -e... /bin/grep
checking for egrep... /bin/grep -E
checking for ANSI C header files... yes
checking for sys/types.h... yes
checking for sys/stat.h... yes
checking for stdlib.h... yes
checking for string.h... yes
checking for memory.h... yes
checking for strings.h... yes
checking for inttypes.h... yes
checking for stdint.h... yes
checking for unistd.h... yes
checking minix/config.h usability... no
checking minix/config.h presence... no
checking for ...

[Rodrigo Moya (rodrigo-moya)]

hmm, can't merge it, don't know what that is, it seems it's missing something in the autogenerated code?

[Jo Shields (directhex)]

That merge storm looked painful, but the 22:17 merge worked.

Looks like the latest additions to the master branch cause FTBFS though. I'll look - probably just a 1-line change needed to handle the new event... I may need a smarter way to ignore the OAuth stuff without needing a manual list of the other source files.

[Rodrigo Moya (rodrigo-moya)]

ah, ok, that's probably it, so please merge from trunk and push again

[Jo Shields (directhex)]

Fixed and future-proofed. Ish. CLEANFILES isn't future-proof, but the binding sure is. No more messy hard-coding in the build. Hooray for all!

[Jo Shields (directhex)]

Making all in mono
make[3]: Entering directory `/home/directhex/Projects/mono-bindings/bindings/mono'
/usr/bin/gapi2-parser ubuntuone.sources
<dir ../../libubuntuone/>
// liboauth version #define LIBOAUTH_VERSION "0.5.3"
structs: 3 enums: 1 callbacks:
funcs: 11 types: 0 classes: 1
props: childprops: signals: 4

/usr/bin/gapi2-fixup --api=ubuntuone-api.xml --metadata=ubuntuone-api.metadata
/usr/bin/gapi2-codegen --outdir=. -I:/usr/lib/pkgconfig/../../share/gapi-2.0/pango-api.xml -I:/usr/lib/pkgconfig/../../share/gapi-2.0/atk-api.xml -I:/usr/lib/pkgconfig/../../share/gapi-2.0/gdk-api.xml -I:/usr/lib/pkgconfig/../../share/gapi-2.0/gtk-api.xml -I:/usr/lib/pkgconfig/../../share/gapi-2.0/glib-api.xml --generate ubuntuone-api.xml

Generation Summary:
  Enums: 0 Structs: 0 Boxed: 0 Opaques: 0 Interfaces: 0 Objects: 1 Callbacks: 0
  Properties: 0 Signals: 4 Methods: 1 Constructors: 1 Throttled: 0
Total Nodes: 7

/usr/bin/gmcs -target:library -pkg:gtk-sharp-2.0 -out:ubuntuone-sharp.dll *.cs
U1MusicStore.cs(44,37): warning CS0169: The private method `UbuntuOne.U1MusicStore.OverridePlayLibrary(GLib.GType)' is never used
U1MusicStore.cs(93,37): warning CS0169: The private method `UbuntuOne.U1MusicStore.OverrideDownloadFinished(GLib.GType)' is never used
U1MusicStore.cs(142,37): warning CS0169: The private method `UbuntuOne.U1MusicStore.OverrideUrlLoaded(GLib.GType)' is never used
U1MusicStore.cs(191,37): warning CS0169: The private method `UbuntuOne.U1MusicStore.OverridePreviewMp3(GLib.GType)' is never used
Compilation succeeded - 4 warning(s)
make[3]: Leaving directory `/home/directhex/Projects/mono-bindings/bindings/mono'

[lp:~directhex/libubuntuone/mono-bindings]

52. By Jo Shields <directhex@desire> on 2010-03-04

Add Mono bindings

=== modified file '.bzrignore'
--- .bzrignore	2010-02-12 15:48:04 +0000
+++ .bzrignore	2010-03-04 22:41:30 +0000
@@ -18,6 +18,7 @@
 libtool
 libubuntuone-1.0.pc
 libubuntuone.pc
+ubuntuone-sharp.pc
 ltmain.sh
 missing
 mkinstalldirs
@@ -31,6 +32,11 @@
 bindings/python/Makefile
 bindings/python/Makefile.in
 bindings/python/ubuntuone.c
+bindings/mono/Makefile.in
+bindings/mono/*.cs
+bindings/mono/ubuntuone-api.xml
+bindings/mono/ubuntuone-sharp.dll
+bindings/mono/ubuntuone-sharp.dll.config
 data/Makefile
 data/Makefile.in
 libubuntuone/.deps/

=== modified file 'Makefile.am'
--- Makefile.am	2010-02-16 23:12:12 +0000
+++ Makefile.am	2010-03-04 22:41:30 +0000
@@ -2,7 +2,7 @@
 
 EXTRA_DIST = COPYING.GPL
 
-pcfiles = libubuntuone-1.0.pc
+pcfiles = libubuntuone-1.0.pc ubuntuone-sharp.pc
 
 libubuntuone-1.0.pc: libubuntuone.pc
 	@cp -f $< $@

=== modified file 'bindings/Makefile.am'
--- bindings/Makefile.am	2009-12-21 16:45:31 +0000
+++ bindings/Makefile.am	2010-03-04 22:41:30 +0000
@@ -1,1 +1,1 @@
-SUBDIRS = python
\ No newline at end of file
+SUBDIRS = python mono

=== added directory 'bindings/mono'
=== added file 'bindings/mono/Makefile.am'
--- bindings/mono/Makefile.am	1970-01-01 00:00:00 +0000
+++ bindings/mono/Makefile.am	2010-03-04 22:41:30 +0000
@@ -0,0 +1,24 @@
+CLEANFILES = U1MusicStore.cs \
+             OAuthMethod.cs \
+             ObjectManager.cs \
+             PlayLibraryHandler.cs \
+             PreviewMp3Handler.cs \
+             DownloadFinishedHandler.cs \
+             ubuntuone-sharp.dll \
+             ubuntuone-api.xml \
+             ubuntuone-sharp.dll.config
+
+EXTRA_DIST = ubuntuone.sources
+
+ubuntuonesharpdir = $(libdir)/ubuntuone-sharp
+ubuntuonesharp_DATA = ubuntuone-sharp.dll ubuntuone-sharp.dll.config
+
+ubuntuone-sharp.dll: U1MusicStore.cs
+	$(MONO_CSC) -target:library -pkg:gtk-sharp-2.0 -out:ubuntuone-sharp.dll *.cs
+
+U1MusicStore.cs: ubuntuone-api.xml
+	$(MONO_GAPI_CODEGEN) --outdir=. $(GTKSHARP_CFLAGS) --generate $<
+
+ubuntuone-api.xml: ubuntuone.sources
+	$(MONO_GAPI_PARSER) $<
+	$(MONO_GAPI_FIXUP) --api=ubuntuone-api.xml --metadata=ubuntuone-api.metadata

=== added file 'bindings/mono/ubuntuone-api.metadata'
--- bindings/mono/ubuntuone-api.metadata	1970-01-01 00:00:00 +0000
+++ bindings/mono/ubuntuone-api.metadata	2010-03-04 22:41:30 +0000
@@ -0,0 +1,4 @@
+<?xml version="1.0"?>
+  <metadata>
+    <remove-node path="/api/namespace/enum[@cname='OAuthMethod']" />
+  </metadata>

=== added file 'bindings/mono/ubuntuone-sharp.dll.config.in'
--- bindings/mono/ubuntuone-sharp.dll.config.in	1970-01-01 00:00:00 +0000
+++ bindings/mono/ubuntuone-sharp.dll.config.in	2010-03-04 22:41:30 +0000
@@ -0,0 +1,4 @@
+<configuration>
+  <dllmap dll="ubuntuone-sharp.dll" target="libubuntuone-1.0.so.@LIBUBUNTUONE_CURRENT@"/>
+</configuration>
+

=== added file 'bindings/mono/ubuntuone.sources'
--- bindings/mono/ubuntuone.sources	1970-01-01 00:00:00 +0000
+++ bindings/mono/ubuntuone.sources	2010-03-04 22:41:30 +0000
@@ -0,0 +1,9 @@
+<gapi-parser-input>
+  <api filename="ubuntuone-api.xml">
+    <library name="ubuntuone-sharp.dll">
+      <namespace name="UbuntuOne">
+        <dir>../../libubuntuone/</dir>
+      </namespace>
+    </library>
+  </api>
+ </gapi-parser-input>

=== modified file 'configure.ac'
--- configure.ac	2010-03-03 14:38:13 +0000
+++ configure.ac	2010-03-04 22:41:30 +0000
@@ -68,6 +68,28 @@
 DISTCHECK_CONFIGURE_FLAGS="--enable-gtk-doc"
 AC_SUBST(DISTCHECK_CONFIGURE_FLAGS)
 
+dnl Checks for Mono bindings
+AC_PATH_PROG(MONO_GAPI_PARSER, gapi2-parser, no)
+if test "x$MONO_GAPI_PARSER" = "xno"; then
+  AC_MSG_ERROR(could not find gapi2-parser)
+fi
+
+AC_PATH_PROG(MONO_GAPI_CODEGEN, gapi2-codegen, no)
+if test "x$MONO_GAPI_CODEGEN" = "xno"; then
+  AC_MSG_ERROR(could not find gapi2-codegen)
+fi
+
+AC_PATH_PROG(MONO_GAPI_FIXUP, gapi2-fixup, no)
+if test "x$MONO_GAPI_FIXUP" = "xno"; then
+  AC_MSG_ERROR(could not find gapi2-fixup)
+fi
+
+AC_PATH_PROG(MONO_CSC, gmcs, no)
+if test "x$MONO_CSC" = "xno"; then
+  AC_MSG_ERROR(could not find gmcs compiler)
+fi
+
+
 dnl Checks for Python bindings
 AM_PATH_PYTHON(2.5)
 AC_PATH_PROG(PYTHON_CONFIG, python-config, no)
@@ -81,8 +103,11 @@
 fi
 
 PKG_CHECK_MODULES(PYGTK, pygtk-2.0)
+PKG_CHECK_MODULES(GTKSHARP, gtk-sharp-2.0)
 AC_SUBST(PYGTK_CFLAGS)
 AC_SUBST(PYGTK_LIBS)
+AC_SUBST(GTKSHARP_CFLAGS)
+AC_SUBST(GTKSHARP_LIBS)
 
 dnl Check for .defs pygtk dir
 AC_MSG_CHECKING(for pygtk defs)
@@ -113,10 +138,13 @@
 Makefile
 data/Makefile
 libubuntuone.pc
+ubuntuone-sharp.pc
 libubuntuone/Makefile
 tests/Makefile
 bindings/Makefile
 bindings/python/Makefile
+bindings/mono/Makefile
+bindings/mono/ubuntuone-sharp.dll.config
 po/Makefile.in
 ])
 

=== added file 'ubuntuone-sharp.pc.in'
--- ubuntuone-sharp.pc.in	1970-01-01 00:00:00 +0000
+++ ubuntuone-sharp.pc.in	2010-03-04 22:41:30 +0000
@@ -0,0 +1,12 @@
+prefix=${pcfiledir}/../..
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+assemblies_dir=${libdir}/ubuntuone-sharp
+Libraries=${assemblies_dir}/ubuntuone-sharp.dll
+
+
+Name: UbuntuOne#
+Description: UbuntuOne# - Ubuntu One .NET Binding
+Version: @VERSION@
+Libs: -r:${Libraries}
+