Merge lp:~dobey/libubuntuone/init-restructure into lp:libubuntuone

[dobey]

Remove the manual python bindings, as we'll be switching to only GI for this
Disable the mono bindings for now (not usable on gtk3)

This removes the current python bindings code (as it is complicated to build, and we will be using only gobject-introspection bindings in the future). This also disables building the mono bindings for now, as gtk3 on mono is up in the air, and may or may not exist in Ubuntu 12.04. However, it is improbable that GI will be supported in mono/gtk-sharp in either case, we'll leave the code around for now, in trunk.

[Manuel de la Peña (mandel)]

review: Approve

[Roberto Alsina (ralsina)]

+1

review: Approve

=== modified file 'Makefile.am'
--- Makefile.am	2010-08-25 18:35:07 +0000
+++ Makefile.am	2012-01-12 18:15:41 +0000
@@ -1,8 +1,8 @@
-SUBDIRS = data libubuntuone tests bindings po
+SUBDIRS = data libubuntuone tests po
 
 EXTRA_DIST = COPYING.GPL
 
-pcfiles = libubuntuone-1.0.pc ubuntuone-sharp-1.0.pc
+pcfiles = libubuntuone-1.0.pc
 
 libubuntuone-1.0.pc: libubuntuone.pc
 	@cp -f $< $@

=== modified file 'bindings/Makefile.am'
--- bindings/Makefile.am	2010-08-25 18:35:07 +0000
+++ bindings/Makefile.am	2012-01-12 18:15:41 +0000
@@ -1,3 +1,3 @@
-SUBDIRS = python mono
+SUBDIRS = mono
 
 MAINTAINERCLEANFILES = Makefile.in

=== removed directory 'bindings/python'
=== removed file 'bindings/python/Makefile.am'
--- bindings/python/Makefile.am	2011-02-16 15:30:29 +0000
+++ bindings/python/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,46 +0,0 @@
-INCLUDES =				\
-	-I$(top_srcdir)/libubuntuone	\
-	$(LIBUBUNTUONE_CFLAGS)		\
-	$(PYGTK_CFLAGS)			\
-	$(PYTHON_CFLAGS)
-
-defsdir = $(datadir)/ubuntuone/1.0/defs
-defs_DATA = ubuntuone.defs
-
-ubuntuonedir = $(pkgpyexecdir)/ubuntuone
-ubuntuone_LTLIBRARIES = _gtkwidgets.la
-ubuntuone_DATA = ubuntuone/__init__.py
-
-gtkwidgetsdir = $(pkgpythondir)/ubuntuone/gtkwidgets
-gtkwidgets_DATA = __init__.py
-
-python_DATA = $(PACKAGE).pth
-
-$(PACKAGE).pth: Makefile
-	echo $(PACKAGE) > $@
-
-ubuntuone.c: ubuntuone.defs ubuntuone.override
-	$(PYGNOME_CODEGEN) \
-		--register $(PYGTK_DEFSDIR)/pango-types.defs \
-		--register $(PYGTK_DEFSDIR)/gdk-types.defs \
-		--register $(PYGTK_DEFSDIR)/gtk-types.defs \
-		--prefix gtkwidgets \
-		--override $(srcdir)/ubuntuone.override \
-		$(srcdir)/ubuntuone.defs > $@
-
-
-_gtkwidgets_la_SOURCES =		\
-	ubuntuone.c		\
-	ubuntuonemodule.c
-_gtkwidgets_la_LDFLAGS = -module -avoid-version -export-symbols-regex init_gtkwidgets
-_gtkwidgets_la_LIBADD =	 				\
-	$(LIBUBUNTUONE_LIBS)				\
-	$(PYGTK_LIBS)					\
-	$(PYTHON_LDFLAGS)				\
-	$(top_builddir)/libubuntuone/libubuntuone-1.0.la
-
-CLEANFILES = ubuntuone.c $(python_DATA)
-
-EXTRA_DIST = ubuntuone.defs ubuntuone.override __init__.py ubuntuone/__init__.py
-
-MAINTAINERCLEANFILES = Makefile.in

=== removed file 'bindings/python/__init__.py'
--- bindings/python/__init__.py	2010-08-25 18:35:07 +0000
+++ bindings/python/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-# Copyright 2010 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 <http://www.gnu.org/licenses/>.
-"""ubuntuone.gtkwidgets package"""
-from ubuntuone._gtkwidgets import *

=== removed file 'bindings/python/test-music-store.py'
--- bindings/python/test-music-store.py	2010-05-27 11:51:36 +0000
+++ bindings/python/test-music-store.py	1970-01-01 00:00:00 +0000
@@ -1,25 +0,0 @@
-#!/usr/bin/python
-
-import gtk
-from ubuntuone.gtkwidgets import MusicStore
-
-def preview_mp3_cb(music_store, url, title):
-    print "Requested preview of file %s with title %s" % (url, title)
-    music_store.load_store_link('http://stores.7digital.com/corporate_1/artists/govt-mule/the-deepest-end-live-in-concert-1/')
-
-def url_loaded_cb(music_store, url):
-    print "URL loaded %s" % url
-
-window = gtk.Window()
-window.set_size_request(839, 600)
-window.connect("destroy", gtk.main_quit)
-
-store = MusicStore()
-print 'Library location is %s' % store.get_library_location()
-store.show()
-store.connect("preview-mp3", preview_mp3_cb)
-store.connect("url-loaded", url_loaded_cb)
-window.add(store)
-window.show()
-
-gtk.main()

=== removed directory 'bindings/python/ubuntuone'
=== removed file 'bindings/python/ubuntuone.defs'
--- bindings/python/ubuntuone.defs	2010-05-27 11:51:36 +0000
+++ bindings/python/ubuntuone.defs	1970-01-01 00:00:00 +0000
@@ -1,41 +0,0 @@
-;; -*- scheme -*-
-
-; object definitions ...
-(define-object MusicStore
-  (in-module "U1")
-  (parent "GtkVBox")
-  (c-name "U1MusicStore")
-  (gtype-id "U1_TYPE_MUSIC_STORE")
-)
-
-;; Enumerations and flags ...
-
-
-;; From u1-music-store.h
-
-(define-function music_store_get_type
-  (c-name "u1_music_store_get_type")
-  (return-type "GType")
-)
-
-(define-function u1_music_store_new
-  (c-name "u1_music_store_new")
-  (is-constructor-of "U1MusicStore")
-  (return-type "GtkWidget*")
-)
-
-(define-method get_library_location
-  (of-object "U1MusicStore")
-  (c-name "u1_music_store_get_library_location")
-  (return-type "const-gchar*")
-)
-
-(define-method load_store_link
-  (of-object "U1MusicStore")
-  (c-name "u1_music_store_load_store_link")
-  (return-type "none")
-  (parameters
-    '("const-gchar*" "url")
-  )
-)
-

=== removed file 'bindings/python/ubuntuone.override'
--- bindings/python/ubuntuone.override	2010-02-09 22:54:22 +0000
+++ bindings/python/ubuntuone.override	1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
-%%
-headers
-#include <Python.h>
-#include "pygobject.h"
-#include "u1-music-store.h"
-%%
-modulename ubuntuone.gtkwidgets
-%%
-import gtk.VBox as PyGtkVBox_Type
-%%
-ignore-glob
-  *_get_type
-%%

=== removed file 'bindings/python/ubuntuone/__init__.py'
--- bindings/python/ubuntuone/__init__.py	2011-02-16 15:30:29 +0000
+++ bindings/python/ubuntuone/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-# Copyright 2009-2011 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 <http://www.gnu.org/licenses/>.
-"""ubuntuone package"""
-__import__('pkg_resources').declare_namespace(__name__)

=== removed file 'bindings/python/ubuntuonemodule.c'
--- bindings/python/ubuntuonemodule.c	2010-10-18 18:25:45 +0000
+++ bindings/python/ubuntuonemodule.c	1970-01-01 00:00:00 +0000
@@ -1,21 +0,0 @@
-#include <pygobject.h>
-
-void gtkwidgets_register_classes (PyObject *d);
-extern PyMethodDef gtkwidgets_functions[];
- 
-DL_EXPORT(void)
-init_gtkwidgets(void)
-{
-    PyObject *m, *d;
-
-    init_pygobject ();
-
-    m = Py_InitModule ("ubuntuone._gtkwidgets", gtkwidgets_functions);
-    d = PyModule_GetDict (m);
-
-    gtkwidgets_register_classes (d);
-
-    if (PyErr_Occurred ()) {
-        Py_FatalError ("can't initialise module ubuntuone._gtkwidgets");
-    }
-}

=== modified file 'configure.ac'
--- configure.ac	2011-12-20 23:11:04 +0000
+++ configure.ac	2012-01-12 18:15:41 +0000
@@ -89,72 +89,6 @@
 DISTCHECK_CONFIGURE_FLAGS="--enable-gtk-doc --enable-debug"
 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
-
-AC_PATH_PROG([MONO_SN], [sn], [no])
-if test "x$MONO_SN" = "xno"; then
-   AC_MSG_ERROR([could not find sn])
-fi
-
-dnl Checks for Python bindings
-AM_PATH_PYTHON(2.5)
-AC_PATH_PROG(PYTHON_CONFIG, python-config, no)
-if test "x$PYTHON_CONFIG" = "xno"; then
-  AC_MSG_ERROR(could not find python-config script)
-else
-  PYTHON_CFLAGS=`$PYTHON_CONFIG --cflags`
-  PYTHON_LDFLAGS=`$PYTHON_CONFIG --ldflags`
-  AC_SUBST(PYTHON_CFLAGS)
-  AC_SUBST(PYTHON_LDFLAGS)
-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)
-PYGTK_DEFSDIR=`$PKG_CONFIG --variable=defsdir pygtk-2.0`
-AC_SUBST(PYGTK_DEFSDIR)
-AC_MSG_RESULT($PYGTK_DEFSDIR)
-
-dnl check for codegen script
-AC_PATH_PROG(PYGOBJECT_CODEGEN, pygobject-codegen-2.0, no)
-if test "x$PYGOBJECT_CODEGEN" = xno; then
-  dnl This is for compat with older releases when codegen was shipped
-  dnl in pygtk. It should be removed in future releases.
-  AC_PATH_PROG(PYGTK_CODEGEN, pygtk-codegen-2.0, no)
-  if test "x$PYGTK_CODEGEN" = xno; then
-    AC_MSG_ERROR(could not find pygobject-codegen-2.0 script)
-  else
-    AC_SUBST(PYGNOME_CODEGEN, $PYGTK_CODEGEN)
-  fi
-else
-  AC_SUBST(PYGNOME_CODEGEN, $PYGOBJECT_CODEGEN)
-fi
-
 dnl JavaScript scripts location
 U1_JAVASCRIPT_DIR=$datadir/libubuntuone/$LIBUBUNTUONE_CURRENT/javascript
 AC_SUBST(U1_JAVASCRIPT_DIR)
@@ -177,13 +111,8 @@
 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
 ])