Merge lp://staging/~rodrigo-moya/libubuntuone/load-url-method into lp://staging/libubuntuone

Works for me in Rhythmbox!

The attempt to merge lp:~rodrigo-moya/libubuntuone/load-url-method 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.65
checking for automake >= 1.6...
(B testing automake-1.11... found 1.11.1
checking for libtool >= 1.5...
(B testing libtoolize... found 2.2.6b
checking for glib-gettext >= 2.2.0...
(B testing glib-gettextize... found 2.24.1
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.14
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: You should add the contents of the following files to `aclocal.m4':
libtoolize: `/usr/share/aclocal/libtool.m4'
libtoolize: `/usr/share/aclocal/ltoptions.m4'
libtoolize: `/usr/share/aclocal/ltversion.m4'
libtoolize: `/usr/share/aclocal/ltsugar.m4'
libtoolize: `/usr/share/aclocal/lt~obsolete.m4'
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 ...
(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... gawk
checking whether make sets $(MAKE)... yes
checking for style of include used by make... GNU
checking for gcc... gcc
checking whether the C compiler works... yes
checking for C compiler default output file name... a.out
checking for suffix of executables...
checking whether we are cross compiling... no
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 f...

Trying to land this, and the following warnings and errors happen:

../../tests/test-syncdaemon.c: In function ‘display_download_cb’:
../../tests/test-syncdaemon.c:35: warning: format ‘%d’ expects type ‘int’, but argument 2 has type ‘glong’
../../tests/test-syncdaemon.c:35: warning: format ‘%d’ expects type ‘int’, but argument 3 has type ‘glong’
In file included from /usr/include/gtk-2.0/gtk/gtk.h:233,
                 from ../../../libubuntuone/u1-music-store.h:25,
                 from ubuntuone.override:5:
/usr/include/gtk-2.0/gtk/gtkitemfactory.h:47: warning: function declaration isn’t a prototype
../../../bindings/python/ubuntuonemodule.c: In function ‘initgtkwidgets’:
../../../bindings/python/ubuntuonemodule.c:16: warning: implicit declaration of function ‘gtkwidgets_register_classes’
make[4]: *** No rule to make target `../../../bindings/mono/ubuntuone-api.xml', needed by `U1MusicStore.cs'. Stop.
make[3]: *** [all-recursive] Error 1
make[2]: *** [all-recursive] Error 1
make[1]: *** [all] Error 2
make: *** [distcheck] Error 1

Rodney, it seems to me you are missing some dependency, so can you please run ./autogen.sh again and pastebin the output?

U1MusicStore.cs: $(srcdir)/ubuntuone-api.xml

This is the problem. Because the file is built, it obviously won't be in $(srcdir) so the dependency should just have "ubuntuone-api.xml" rather than the "$(srcdir)/" prefix. It's also in the same subdir, so the $(srcdir) piece isn't necessary, and the file isn't already built, so it fails when srcdir != builddir (as with distcheck).

hmm, if I remove that $(srcdir), make distcheck fails for me

so, what are you running to have this fail? just 'make'?

Removing the $(srcdir) there fails with a different error.

I'm doing 'make distcheck' for running the tests. 'make check' works fine still. But distcheck fails in both cases.

These following changes fix the problems I was seeing here with distcheck. :)

=== modified file 'bindings/mono/Makefile.am'
--- bindings/mono/Makefile.am 2010-03-08 15:30:21 +0000
+++ bindings/mono/Makefile.am 2010-06-01 13:37:52 +0000
@@ -6,11 +6,12 @@ CLEANFILES = \
  PreviewMp3Handler.cs \
  DownloadFinishedHandler.cs \
  UrlLoadedHandler.cs \
+ ubuntuone.sources \
  ubuntuone-sharp.dll \
  ubuntuone-api.xml \
  ubuntuone-sharp.dll.config

-EXTRA_DIST = ubuntuone.sources ubuntuone-api.metadata mono.snk AssemblyInfo.cs
+EXTRA_DIST = ubuntuone.sources.in ubuntuone-api.metadata mono.snk AssemblyInfo.cs

 ubuntuonesharpdir = $(libdir)/mono/ubuntuone-sharp-1.0
 ubuntuonesharp_DATA = ubuntuone-sharp.dll ubuntuone-sharp.dll.config
@@ -18,9 +19,13 @@ ubuntuonesharp_DATA = ubuntuone-sharp.dl
 ubuntuone-sharp.dll: U1MusicStore.cs
  $(MONO_CSC) -target:library -pkg:gtk-sharp-2.0 -out:ubuntuone-sharp.dll *.cs

-U1MusicStore.cs: $(srcdir)/ubuntuone-api.xml
+U1MusicStore.cs: ubuntuone-api.xml
  $(MONO_GAPI_CODEGEN) --outdir=. $(GTKSHARP_CFLAGS) --generate $<

+ubuntuone.sources: $(srcdir)/ubuntuone.sources.in
+ sed -e "s|\@TOP_SRCDIR\@|$(top_srcdir)|g" < $< > $@
+
 ubuntuone-api.xml: ubuntuone.sources
  $(MONO_GAPI_PARSER) $<
- $(MONO_GAPI_FIXUP) --api=ubuntuone-api.xml --metadata=ubuntuone-api.metadata
+ $(MONO_GAPI_FIXUP) --api=$@ --metadata=$(srcdir)/ubuntuone-api.metadata
+

=== removed file 'bindings/mono/ubuntuone.sources'
--- bindings/mono/ubuntuone.sources 2010-03-04 10:15:10 +0000
+++ bindings/mono/ubuntuone.sources 1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-<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>

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

Attempt to merge lp:~rodrigo-moya/libubuntuone/load-url-method into lp:libubuntuone failed due to merge conflicts:

duplicate in bindings/mono/ubuntuone.sources.in.moved