Merge lp:~robert-ancell/launchpad-integration/cli-bindings into lp:~ubuntu-core-dev/launchpad-integration/ubuntu

[Robert Ancell]

[Robert Ancell (robert-ancell)]

Abandoning - lpi is dead

Unmerged revisions

119. By Robert Ancell on 2010-01-15

Add CLI bindings

=== modified file 'configure.ac'
--- configure.ac	2008-06-13 19:28:24 +0000
+++ configure.ac	2010-01-15 02:08:11 +0000
@@ -1,4 +1,4 @@
-AC_INIT([launchpad-integration], [0.1.20])
+AC_INIT([launchpad-integration], [0.1.26])
 
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])
@@ -43,6 +43,30 @@
 AC_MSG_RESULT($PYGTK_DEFSDIR)
 
 
+###########################
+# 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
+   AC_PATH_PROG(CSC, gmcs, no)
+fi
+
+if test "x$CSC" = "xno" ; then
+   AC_MSG_ERROR([No Mono compiler found.])
+fi
+AC_SUBST(CSC)
+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)
+
 AC_CONFIG_FILES([
 Makefile
 lib/Makefile

=== modified file 'debian/changelog'
--- debian/changelog	2009-09-24 17:07:57 +0000
+++ debian/changelog	2010-01-15 02:08:11 +0000
@@ -1,3 +1,9 @@
+launchpad-integration (0.1.26) lucid; urgency=low
+
+  * Add CLI bindings
+
+ -- Robert Ancell <[e-mail]>  Fri, 15 Jan 2010 12:39:36 +1100
+
 launchpad-integration (0.1.25) karmic; urgency=low
 
   * Update the url to use for launchpad translations

=== modified file 'debian/control'
--- debian/control	2008-10-16 11:45:19 +0000
+++ debian/control	2010-01-15 02:08:11 +0000
@@ -1,7 +1,17 @@
 Source: launchpad-integration
 Priority: optional
 Maintainer: Sebastien Bacher <[e-mail]>
-Build-Depends: debhelper (>= 5), cdbs, autotools-dev, libbonoboui2-dev (>= 2.10.1-0ubuntu2), libgtk2.0-dev (>= 2.8.2), python-gtk2-dev, python-gtk2-dbg, python-all-dev, python-all-dbg, python-central (>= 0.5)
+Build-Depends: debhelper (>= 5),
+               cdbs,
+               autotools-dev,
+               libbonoboui2-dev (>= 2.10.1-0ubuntu2),
+               libgtk2.0-dev (>= 2.8.2),
+               python-gtk2-dev,
+               python-gtk2-dbg,
+               python-all-dev,
+               python-all-dbg,
+               python-central (>= 0.5),
+               mono-gmcs
 XS-Python-Version: all
 Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/launchpad-integration/ubuntu
 Standards-Version: 3.7.2
@@ -98,3 +108,14 @@
   .
  This package contains the python bindings of the shared library, built
  for the python debug interpreter.
+
+Package: launchpad-integration1-cil
+Priority: optional
+Section: cli-mono
+Architecture: any
+Depends: liblaunchpad-integration1
+Description: CLI bindings for liblaunchpad-integration
+  This package provides the launchpad-integration-sharp assembly that allows CLI (.NET)
+  programs to provide Launchpad menu items.
+  .
+  This package contains assemblies to be used by applications.

=== added file 'debian/launchpad-integration1-cil.install'
--- debian/launchpad-integration1-cil.install	1970-01-01 00:00:00 +0000
+++ debian/launchpad-integration1-cil.install	2010-01-15 02:08:11 +0000
@@ -0,0 +1,1 @@
+debian/tmp/usr/lib/mono/lpi-sharp

=== added file 'lib/LaunchpadIntegration.cs'
--- lib/LaunchpadIntegration.cs	1970-01-01 00:00:00 +0000
+++ lib/LaunchpadIntegration.cs	2010-01-15 02:08:11 +0000
@@ -0,0 +1,41 @@
+namespace LaunchpadIntegration
+{
+    using Gtk;
+    using System;
+    using System.Runtime.InteropServices;
+
+    public static class LaunchpadIntegration
+    {
+        [DllImport("liblaunchpad-integration.so")]
+        static extern void launchpad_integration_set_sourcepackagename(string name);
+    
+        public static void SetSourcePackageName(string name)
+        {
+            launchpad_integration_set_sourcepackagename(name);
+        }
+    
+        [DllImport("liblaunchpad-integration.so")]
+        static extern void launchpad_integration_add_ui(IntPtr ui, string path);
+    
+        public static void AddUI(Gtk.UIManager ui, string path)
+        {
+            launchpad_integration_add_ui(ui.Handle, path);
+        }
+    
+        [DllImport("liblaunchpad-integration.so")]
+        static extern void launchpad_integration_add_ui_with_separators(IntPtr ui, string path, bool separator_before, bool separator_after);
+    
+        public static void AddUIWithSeparators(Gtk.UIManager ui, string path, bool separator_before, bool separator_after)
+        {
+            launchpad_integration_add_ui_with_separators(ui.Handle, path, separator_before, separator_after);
+        }
+    
+        [DllImport("liblaunchpad-integration.so")]
+        static extern void launchpad_integration_add_items(IntPtr helpmenu, int position, bool separator_before, bool separator_after);
+
+        public static void AddItems(Gtk.Widget helpmenu, int position, bool separator_before, bool separator_after)
+        {
+            launchpad_integration_add_items(helpmenu.Handle, position, separator_before, separator_after);
+        }
+    }
+}

=== modified file 'lib/Makefile.am'
--- lib/Makefile.am	2008-04-07 13:47:19 +0000
+++ lib/Makefile.am	2010-01-15 02:08:11 +0000
@@ -51,3 +51,19 @@
 	--prefix py$* $*.defs) > gen-$*.c \
 	&& cp gen-$*.c $*.c \
 	&& rm -f gen-$*.c
+
+# C# stuff
+
+lpisharpdir = $(libdir)/mono/lpi-sharp
+lpisharp_CSSOURCES = $(srcdir)/LaunchpadIntegration.cs
+lpisharp_DATA=$(ASSEMBLY)
+
+ASSEMBLY = $(ASSEMBLY_NAME).dll
+ASSEMBLY_NAME = lpi-sharp
+noinst_DATA = $(ASSEMBLY)
+
+EXTRA_DIST += $(lpisharp_CSSOURCES)
+CLEANFILES += $(ASSEMBLY)
+
+$(ASSEMBLY): $(CSSOURCES)
+	$(CSC) -target:library $(GTK_SHARP_LIBS) $(lpisharp_CSSOURCES) -out:$(ASSEMBLY)

=== modified file 'lib/launchpad-integration.c'
--- lib/launchpad-integration.c	2008-04-07 13:47:19 +0000
+++ lib/launchpad-integration.c	2010-01-15 02:08:11 +0000
@@ -16,7 +16,8 @@
 void
 launchpad_integration_set_sourcepackagename (const char *name)
 {
-    sourcepackagename = name;
+    g_free (sourcepackagename);
+    sourcepackagename = g_strdup (name);
 }