diff options
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | generate/.git-darcs-dir | 0 | ||||
| -rw-r--r-- | generate/Makefile.am | 8 | ||||
| -rw-r--r-- | generate/README | 21 | ||||
| -rw-r--r-- | generate/do_src.sh | 16 | ||||
| -rw-r--r-- | generate/do_xml.sh | 15 | ||||
| -rw-r--r-- | generate/src/.git-darcs-dir | 0 | ||||
| -rw-r--r-- | generate/src/tp-stream-engine-signals-marshal.list | 1 | ||||
| -rw-r--r-- | generate/src/tp-stream-engine.c | 256 | ||||
| -rw-r--r-- | generate/src/tp-stream-engine.h | 68 | ||||
| -rw-r--r-- | generate/stream-engine.def | 2 | ||||
| -rw-r--r-- | generate/xml-modified/.git-darcs-dir | 0 | ||||
| -rw-r--r-- | generate/xml-pristine/.git-darcs-dir | 0 | ||||
| -rw-r--r-- | tools/.git-darcs-dir | 0 | ||||
| -rw-r--r-- | tools/Makefile.am | 3 | ||||
| -rw-r--r-- | tools/generrors.py | 65 | ||||
| -rw-r--r-- | tools/gengobject.py | 427 | ||||
| -rw-r--r-- | tools/geninterfaces.py | 23 |
19 files changed, 1 insertions, 907 deletions
diff --git a/Makefile.am b/Makefile.am index e7cad7a..ed4f0f4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ ACLOCAL_AMFLAGS = -I m4 -SUBDIRS = common src test doc data generate +SUBDIRS = common src test doc data dist-hook: chmod a+w ${distdir}/ChangeLog diff --git a/configure.ac b/configure.ac index 7d26a1d..3ffc690 100644 --- a/configure.ac +++ b/configure.ac @@ -117,7 +117,6 @@ AC_OUTPUT( Makefile \ common/Makefile \ data/Makefile \ doc/Makefile \ - generate/Makefile \ src/Makefile \ test/Makefile \ test/python/Makefile diff --git a/generate/.git-darcs-dir b/generate/.git-darcs-dir deleted file mode 100644 index e69de29..0000000 --- a/generate/.git-darcs-dir +++ /dev/null diff --git a/generate/Makefile.am b/generate/Makefile.am deleted file mode 100644 index 79da299..0000000 --- a/generate/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -EXTRA_DIST = \ - README \ - do_src.sh \ - do_xml.sh \ - src \ - stream-engine.def \ - xml-pristine \ - xml-modified diff --git a/generate/README b/generate/README deleted file mode 100644 index 0f00655..0000000 --- a/generate/README +++ /dev/null @@ -1,21 +0,0 @@ -Source code in this tree was originally generated from a magical gobject -generation tool called gengobject.py. It takes D-Bus XML introspection data and -outputs source, header and other files like signal marshallers. To read the XML -from generate/xml-modified/ directory, and output new source in the -generate/src/ directory, where changes can be reveiwed and applied to the src/ -directory by hand, run generate/do_src.sh. - -The XML is generated from the Python classes which are the current canonical -definition of the Telepathy interfaces, according to the definitions in -xml.def. Some manual modifications are necessary, to mark asynchronous methods, -and to remove the Introspect methods which are implemented automatically by the -bindings, so the pristine XML is kept in generate/xml-pristine/ and changed -applied by hand to generate/xml-modified/. To generate this pristine XML, run -generate/do_xml.sh. - -In both cases, applying the changes to the generated XML or src can be as easy -as: - darcs diff -u generate/src | patch -d src -Patch does a much better job of applying generated changes to the modified code -than darcs did when pulling patches from seperate trees (xml -> generate -> -live). diff --git a/generate/do_src.sh b/generate/do_src.sh deleted file mode 100644 index a82e751..0000000 --- a/generate/do_src.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh - -if [ `basename $PWD` == "generate" ]; then - TP=${TELEPATHY_PYTHON:=$PWD/../../telepathy-python} -else - TP=${TELEPATHY_PYTHON:=$PWD/../telepathy-python} -fi - -export PYTHONPATH=$TP:$PYTHONPATH - -test -d generate && cd generate -cd src - -echo Generating StreamEngine files ... -python2.4 $TP/tools/gengobject.py ../xml-modified/tp-stream-engine.xml TpStreamEngine - diff --git a/generate/do_xml.sh b/generate/do_xml.sh deleted file mode 100644 index 8cb783c..0000000 --- a/generate/do_xml.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh - -if [ `basename $PWD` == "generate" ]; then - TP=${TELEPATHY_PYTHON:=$PWD/../../telepathy-python} -else - TP=${TELEPATHY_PYTHON:=$PWD/../telepathy-python} -fi - -export PYTHONPATH=$TP:$PYTHONPATH - -test -d generate && cd generate -cd xml-pristine - -echo "Generating pristine XML in generate/xml-pristine..." -python2.4 $TP/tools/genxml.py ../stream-engine.def diff --git a/generate/src/.git-darcs-dir b/generate/src/.git-darcs-dir deleted file mode 100644 index e69de29..0000000 --- a/generate/src/.git-darcs-dir +++ /dev/null diff --git a/generate/src/tp-stream-engine-signals-marshal.list b/generate/src/tp-stream-engine-signals-marshal.list deleted file mode 100644 index b221d5a..0000000 --- a/generate/src/tp-stream-engine-signals-marshal.list +++ /dev/null @@ -1 +0,0 @@ -VOID:STRING,INT,BOOLEAN diff --git a/generate/src/tp-stream-engine.c b/generate/src/tp-stream-engine.c deleted file mode 100644 index 3999cf2..0000000 --- a/generate/src/tp-stream-engine.c +++ /dev/null @@ -1,256 +0,0 @@ -/* - * tp-stream-engine.c - Source for TpStreamEngine - * Copyright (C) 2005 Collabora Ltd. - * Copyright (C) 2005 Nokia Corporation - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include <dbus/dbus-glib.h> -#include <stdio.h> -#include <stdlib.h> - -#include "tp-stream-engine.h" -#include "tp-stream-engine-signals-marshal.h" - -#include "tp-stream-engine-glue.h" - -G_DEFINE_TYPE(TpStreamEngine, tp_stream_engine, G_TYPE_OBJECT) - -/* signal enum */ -enum -{ - RECEIVING, - LAST_SIGNAL -}; - -static guint signals[LAST_SIGNAL] = {0}; - -/* private structure */ -typedef struct _TpStreamEnginePrivate TpStreamEnginePrivate; - -struct _TpStreamEnginePrivate -{ - gboolean dispose_has_run; -}; - -#define TP_STREAM_ENGINE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TP_TYPE_STREAM_ENGINE, TpStreamEnginePrivate)) - -static void -tp_stream_engine_init (TpStreamEngine *obj) -{ - TpStreamEnginePrivate *priv = TP_STREAM_ENGINE_GET_PRIVATE (obj); - - /* allocate any data required by the object here */ -} - -static void tp_stream_engine_dispose (GObject *object); -static void tp_stream_engine_finalize (GObject *object); - -static void -tp_stream_engine_class_init (TpStreamEngineClass *tp_stream_engine_class) -{ - GObjectClass *object_class = G_OBJECT_CLASS (tp_stream_engine_class); - - g_type_class_add_private (tp_stream_engine_class, sizeof (TpStreamEnginePrivate)); - - object_class->dispose = tp_stream_engine_dispose; - object_class->finalize = tp_stream_engine_finalize; - - signals[RECEIVING] = - g_signal_new ("receiving", - G_OBJECT_CLASS_TYPE (tp_stream_engine_class), - G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED, - 0, - NULL, NULL, - tp_stream_engine_marshal_VOID__STRING_INT_BOOLEAN, - G_TYPE_NONE, 3, DBUS_TYPE_G_OBJECT_PATH, G_TYPE_UINT, G_TYPE_BOOLEAN); - - dbus_g_object_type_install_info (G_TYPE_FROM_CLASS (tp_stream_engine_class), &dbus_glib_tp_stream_engine_object_info); -} - -void -tp_stream_engine_dispose (GObject *object) -{ - TpStreamEngine *self = TP_STREAM_ENGINE (object); - TpStreamEnginePrivate *priv = TP_STREAM_ENGINE_GET_PRIVATE (self); - - if (priv->dispose_has_run) - return; - - priv->dispose_has_run = TRUE; - - /* release any references held by the object here */ - - if (G_OBJECT_CLASS (tp_stream_engine_parent_class)->dispose) - G_OBJECT_CLASS (tp_stream_engine_parent_class)->dispose (object); -} - -void -tp_stream_engine_finalize (GObject *object) -{ - TpStreamEngine *self = TP_STREAM_ENGINE (object); - TpStreamEnginePrivate *priv = TP_STREAM_ENGINE_GET_PRIVATE (self); - - /* free any data held directly by the object here */ - - G_OBJECT_CLASS (tp_stream_engine_parent_class)->finalize (object); -} - - - -/** - * tp_stream_engine_add_preview_window - * - * Implements DBus method AddPreviewWindow - * on interface org.freedesktop.Telepathy.StreamEngine - * - * @error: Used to return a pointer to a GError detailing any error - * that occured, DBus will throw the error only if this - * function returns false. - * - * Returns: TRUE if successful, FALSE if an error was thrown. - */ -gboolean tp_stream_engine_add_preview_window (TpStreamEngine *obj, guint window, GError **error) -{ - return TRUE; -} - - -/** - * tp_stream_engine_handle_channel - * - * Implements DBus method HandleChannel - * on interface org.freedesktop.Telepathy.ChannelHandler - * - * @error: Used to return a pointer to a GError detailing any error - * that occured, DBus will throw the error only if this - * function returns false. - * - * Returns: TRUE if successful, FALSE if an error was thrown. - */ -gboolean tp_stream_engine_handle_channel (TpStreamEngine *obj, const gchar * bus_name, const gchar * connection, const gchar * channel_type, const gchar * channel, guint handle_type, guint handle, GError **error) -{ - return TRUE; -} - - -/** - * tp_stream_engine_mute_input - * - * Implements DBus method MuteInput - * on interface org.freedesktop.Telepathy.StreamEngine - * - * @error: Used to return a pointer to a GError detailing any error - * that occured, DBus will throw the error only if this - * function returns false. - * - * Returns: TRUE if successful, FALSE if an error was thrown. - */ -gboolean tp_stream_engine_mute_input (TpStreamEngine *obj, const gchar * channel_path, guint stream_id, gboolean mute_state, GError **error) -{ - return TRUE; -} - - -/** - * tp_stream_engine_mute_output - * - * Implements DBus method MuteOutput - * on interface org.freedesktop.Telepathy.StreamEngine - * - * @error: Used to return a pointer to a GError detailing any error - * that occured, DBus will throw the error only if this - * function returns false. - * - * Returns: TRUE if successful, FALSE if an error was thrown. - */ -gboolean tp_stream_engine_mute_output (TpStreamEngine *obj, const gchar * channel_path, guint stream_id, gboolean mute_state, GError **error) -{ - return TRUE; -} - - -/** - * tp_stream_engine_remove_preview_window - * - * Implements DBus method RemovePreviewWindow - * on interface org.freedesktop.Telepathy.StreamEngine - * - * @error: Used to return a pointer to a GError detailing any error - * that occured, DBus will throw the error only if this - * function returns false. - * - * Returns: TRUE if successful, FALSE if an error was thrown. - */ -gboolean tp_stream_engine_remove_preview_window (TpStreamEngine *obj, guint window, GError **error) -{ - return TRUE; -} - - -/** - * tp_stream_engine_set_output_volume - * - * Implements DBus method SetOutputVolume - * on interface org.freedesktop.Telepathy.StreamEngine - * - * @error: Used to return a pointer to a GError detailing any error - * that occured, DBus will throw the error only if this - * function returns false. - * - * Returns: TRUE if successful, FALSE if an error was thrown. - */ -gboolean tp_stream_engine_set_output_volume (TpStreamEngine *obj, const gchar * channel_path, guint stream_id, guint volume, GError **error) -{ - return TRUE; -} - - -/** - * tp_stream_engine_set_output_window - * - * Implements DBus method SetOutputWindow - * on interface org.freedesktop.Telepathy.StreamEngine - * - * @error: Used to return a pointer to a GError detailing any error - * that occured, DBus will throw the error only if this - * function returns false. - * - * Returns: TRUE if successful, FALSE if an error was thrown. - */ -gboolean tp_stream_engine_set_output_window (TpStreamEngine *obj, const gchar * channel_path, guint stream_id, guint window, GError **error) -{ - return TRUE; -} - - -/** - * tp_stream_engine_shutdown - * - * Implements DBus method Shutdown - * on interface org.freedesktop.Telepathy.StreamEngine - * - * @error: Used to return a pointer to a GError detailing any error - * that occured, DBus will throw the error only if this - * function returns false. - * - * Returns: TRUE if successful, FALSE if an error was thrown. - */ -gboolean tp_stream_engine_shutdown (TpStreamEngine *obj, GError **error) -{ - return TRUE; -} - diff --git a/generate/src/tp-stream-engine.h b/generate/src/tp-stream-engine.h deleted file mode 100644 index bab1c87..0000000 --- a/generate/src/tp-stream-engine.h +++ /dev/null @@ -1,68 +0,0 @@ -/* - * tp-stream-engine.h - Header for TpStreamEngine - * Copyright (C) 2005 Collabora Ltd. - * Copyright (C) 2005 Nokia Corporation - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifndef __TP_STREAM_ENGINE_H__ -#define __TP_STREAM_ENGINE_H__ - -#include <glib-object.h> - -G_BEGIN_DECLS - -typedef struct _TpStreamEngine TpStreamEngine; -typedef struct _TpStreamEngineClass TpStreamEngineClass; - -struct _TpStreamEngineClass { - GObjectClass parent_class; -}; - -struct _TpStreamEngine { - GObject parent; -}; - -GType tp_stream_engine_get_type(void); - -/* TYPE MACROS */ -#define TP_TYPE_STREAM_ENGINE \ - (tp_stream_engine_get_type()) -#define TP_STREAM_ENGINE(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_STREAM_ENGINE, TpStreamEngine)) -#define TP_STREAM_ENGINE_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST((klass), TP_TYPE_STREAM_ENGINE, TpStreamEngineClass)) -#define TP_IS_STREAM_ENGINE(obj) \ - (G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_STREAM_ENGINE)) -#define TP_IS_STREAM_ENGINE_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_TYPE((klass), TP_TYPE_STREAM_ENGINE)) -#define TP_STREAM_ENGINE_GET_CLASS(obj) \ - (G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TYPE_STREAM_ENGINE, TpStreamEngineClass)) - - -gboolean tp_stream_engine_add_preview_window (TpStreamEngine *obj, guint window, GError **error); -gboolean tp_stream_engine_handle_channel (TpStreamEngine *obj, const gchar * bus_name, const gchar * connection, const gchar * channel_type, const gchar * channel, guint handle_type, guint handle, GError **error); -gboolean tp_stream_engine_mute_input (TpStreamEngine *obj, const gchar * channel_path, guint stream_id, gboolean mute_state, GError **error); -gboolean tp_stream_engine_mute_output (TpStreamEngine *obj, const gchar * channel_path, guint stream_id, gboolean mute_state, GError **error); -gboolean tp_stream_engine_remove_preview_window (TpStreamEngine *obj, guint window, GError **error); -gboolean tp_stream_engine_set_output_volume (TpStreamEngine *obj, const gchar * channel_path, guint stream_id, guint volume, GError **error); -gboolean tp_stream_engine_set_output_window (TpStreamEngine *obj, const gchar * channel_path, guint stream_id, guint window, GError **error); -gboolean tp_stream_engine_shutdown (TpStreamEngine *obj, GError **error); - - -G_END_DECLS - -#endif /* #ifndef __TP_STREAM_ENGINE_H__*/ diff --git a/generate/stream-engine.def b/generate/stream-engine.def deleted file mode 100644 index c1315df..0000000 --- a/generate/stream-engine.def +++ /dev/null @@ -1,2 +0,0 @@ -tp-media-session-handler.xml TpMediaSessionHandler IceSessionHandler -tp-media-stream-handler.xml TpMediaStreamHandler IceStreamHandler diff --git a/generate/xml-modified/.git-darcs-dir b/generate/xml-modified/.git-darcs-dir deleted file mode 100644 index e69de29..0000000 --- a/generate/xml-modified/.git-darcs-dir +++ /dev/null diff --git a/generate/xml-pristine/.git-darcs-dir b/generate/xml-pristine/.git-darcs-dir deleted file mode 100644 index e69de29..0000000 --- a/generate/xml-pristine/.git-darcs-dir +++ /dev/null diff --git a/tools/.git-darcs-dir b/tools/.git-darcs-dir deleted file mode 100644 index e69de29..0000000 --- a/tools/.git-darcs-dir +++ /dev/null diff --git a/tools/Makefile.am b/tools/Makefile.am deleted file mode 100644 index 9bfdbcc..0000000 --- a/tools/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -EXTRA_DIST = \ - generrors.py \ - gengobject.py diff --git a/tools/generrors.py b/tools/generrors.py deleted file mode 100644 index 050ec4a..0000000 --- a/tools/generrors.py +++ /dev/null @@ -1,65 +0,0 @@ -#!/usr/bin/python2.4 -import telepathy.errors -import inspect -import gengobject - -out = open("telepathy-errors.h", 'w') - -gengobject.print_license(out, "telepathy-errors.h", "Header for Telepathy error types") - -gengobject.print_header_begin(out, "telepathy_errors") -out.write("typedef enum\n{\n") - -errors = []; -max_name_length = 0 -for (cname,val) in telepathy.errors.__dict__.items(): - if inspect.isclass(val): - if '_dbus_error_name' in val.__dict__: - errors.append(val) - if len(val.__name__) > max_name_length: - max_name_length = len(val.__name__) - - -for val in errors: - line = " "+val.__name__ + "," - line = line.ljust(max_name_length + 4) - line += "/** "+val.__doc__.strip() - while len (line) > 79: - cut = line[:80] - cutidx = cut.rfind(' ') - if cutidx == 80: - out.write(cut[:79]) - else: - out.write(cut[:cutidx]) - out.write('\n') - line = ' ' * (max_name_length +4) + ' * ' + line[cutidx:] - out.write(line + '\n') - out.write(' ' * (max_name_length + 4) + ' */\n') - -out.write("} TelepathyErrors; \n\n") - -out.write( -""" - GQuark telepathy_errors_quark (void); - #define TELEPATHY_ERRORS telepathy_errors_quark () -""") - - -gengobject.print_header_end(out, "telepathy_errors"); - -out = open("telepathy-errors.c", 'w') - -out.write( -""" -#include <glib.h> -#include "telepathy-errors.h" - -GQuark -telepathy_errors_quark (void) -{ - static GQuark quark = 0; - if (!quark) - quark = g_quark_from_static_string ("telepathy_errors"); - return quark; -} -""") diff --git a/tools/gengobject.py b/tools/gengobject.py deleted file mode 100644 index 2d98823..0000000 --- a/tools/gengobject.py +++ /dev/null @@ -1,427 +0,0 @@ -#!/usr/bin/python - -import sys -import os.path -import xml.dom.minidom - -def cmdline_error(): - print "usage: gen-gobject xmlfile classname" - sys.exit(1) - -def camelcase_to_lower(s): - out =""; - out += s[0].lower() - last_upper=False - if s[0].isupper(): - last_upper=True - for i in range(1,len(s)): - if s[i].isupper(): - if last_upper: - if (i+1) < len(s) and s[i+1].islower(): - out += "_" + s[i].lower() - else: - out += s[i].lower() - else: - out += "_" + s[i].lower() - last_upper=True - else: - out += s[i] - last_upper=False - return out - -def camelcase_to_upper(s): - return camelcase_to_lower(s).upper() - -def type_to_gtype(s): - if s == 'y': #byte - return ("guchar", "G_TYPE_UCHAR","UCHAR", False) - if s == 'b': #boolean - return ("gboolean", "G_TYPE_BOOLEAN","BOOLEAN", False) - if s == 'n': #int16 - return ("gint", "G_TYPE_INT","INT", False) - if s == 'q': #uint16 - return ("guint", "G_TYPE_UINT","UINT", False) - if s == 'i': #int32 - return ("gint", "G_TYPE_INT","INT", False) - if s == 'u': #uint32 - return ("guint", "G_TYPE_UINT","INT", False) - if s == 'x': #int64 - return ("gint", "G_TYPE_INT64","INT64", False) - if s == 't': #uint32 - return ("guint", "G_TYPE_UINT64","UINT64", False) - if s == 'd': #double - return ("gdouble", "G_TYPE_DOUBLE","DOUBLE", False) - if s == 's': #string - return ("gchar *", "G_TYPE_STRING", "STRING", True) - if s == 'o': #object path - return ("gchar *", "DBUS_TYPE_G_OBJECT_PATH", "STRING", True) - if s == 'as': #array of strings - return ("gchar **", "G_TYPE_STRV", "BOXED", True) - if s == 'v': #variant - return ("GValue *", "G_TYPE_VALUE", "BOXED", True) - if s[:3] == 'a{s': # dict mapping of strings to any marshalable value - return ("GHashTable *", "DBUS_TYPE_G_STRING_HASHTABLE", "BOXED", False) - if s == 'ay': #byte array - return ("GArray *", "DBUS_TYPE_G_BYTE_ARRAY", "BOXED", True) - if s == 'au': #uint array - return ("GArray *", "DBUS_TYPE_G_UINT_ARRAY", "BOXED", True) - if s == 'ai': #int array - return ("GArray *", "DBUS_TYPE_G_INT_ARRAY", "BOXED", True) - if s == 'ax': #int64 array - return ("GArray *", "DBUS_TYPE_G_INT64_ARRAY", "BOXED", True) - if s == 'at': #uint64 array - return ("GArray *", "DBUS_TYPE_G_UINT64_ARRAY", "BOXED", True) - if s == 'ad': #double array - return ("GArray *", "DBUS_TYPE_G_DOUBLE_ARRAY", "BOXED", True) - if s == 'ab': #boolean array - return ("GArray *", "DBUS_TYPE_G_BOOLEAN_ARRAY", "BOXED", True) - if s[:2] == 'a(': #array of structs - return ("GArray *", "G_TYPE_BOXED", "BOXED", True) - if s[:2] == 'a{': #dict - return ("GHashTable *", "G_TYPE_BOXED", "BOXED", True) - - # we just don't know .. - return ("gpointer", "G_TYPE_BOXED", "BOXED", True) - - -def signal_to_marshal_type(signal): - """ - return a list of strings indicating the marshalling type for this signal. - """ - - mtype=[] - for i in signal.getElementsByTagName("arg"): - name =i.getAttribute("name") - type = i.getAttribute("type") - mtype.append(type_to_gtype(type)[2]) - - return mtype - -def signal_to_marshal_name(signal, prefix): - mtype=signal_to_marshal_type(signal) - if len(mtype): - return prefix+'_marshal_VOID__' + '_'.join(mtype) - else: - return prefix+'_marshal_VOID__VOID' - -def signal_to_gtype_list(signal): - gtype=[] - for i in signal.getElementsByTagName("arg"): - name =i.getAttribute("name") - type = i.getAttribute("type") - gtype.append(type_to_gtype(type)[1]) - - return gtype - - -def print_license(stream, filename, description): - stream.write( -"""/* - * %s - %s - * Copyright (C) 2005 Collabora Ltd. - * Copyright (C) 2005 Nokia Corporation - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -""" % (filename, description)) - -def print_header_begin(stream, prefix): - guardname = '__'+prefix.upper()+'_H__' - stream.write ("#ifndef "+guardname+"\n") - stream.write ("#define "+guardname+"\n\n") - - stream.write ("#include <glib-object.h>\n\n") - stream.write ("G_BEGIN_DECLS\n\n") - -def print_header_end(stream, prefix): - guardname = '__'+prefix.upper()+'_H__' - stream.write ("\nG_END_DECLS\n\n") - stream.write ("#endif /* #ifndef "+guardname+"*/\n") - -def print_simple_class_defn(stream, prefix, classname): - stream.write ("typedef struct _%s %s;\n" % (classname,classname)) - stream.write ("typedef struct _%sClass %sClass;\n\n" % (classname,classname)) - stream.write ("struct _%sClass {\n" % classname) - stream.write (" GObjectClass parent_class;\n") - stream.write ("};\n\n") - - stream.write ("struct _%s {\n" % classname) - stream.write (" GObject parent;\n") - stream.write ("};\n") - - stream.write( -""" -GType %(prefix)s_get_type(void); - -""" % {'prefix':prefix,'uprefix':prefix.upper()}) - - macro_prefix = prefix.upper().split('_',1) - gtype = '_TYPE_'.join(macro_prefix) - - stream.write( -"""/* TYPE MACROS */ -#define %(type)s \\ - (%(prefix)s_get_type()) -#define %(main)s_%(sub)s(obj) \\ - (G_TYPE_CHECK_INSTANCE_CAST((obj), %(type)s, %(name)s)) -#define %(main)s_%(sub)s_CLASS(klass) \\ - (G_TYPE_CHECK_CLASS_CAST((klass), %(type)s, %(name)sClass)) -#define %(main)s_IS_%(sub)s(obj) \\ - (G_TYPE_CHECK_INSTANCE_TYPE((obj), %(type)s)) -#define %(main)s_IS_%(sub)s_CLASS(klass) \\ - (G_TYPE_CHECK_CLASS_TYPE((klass), %(type)s)) -#define %(main)s_%(sub)s_GET_CLASS(obj) \\ - (G_TYPE_INSTANCE_GET_CLASS ((obj), %(type)s, %(name)sClass)) - -""" % {"main":macro_prefix[0], "sub":macro_prefix[1], "type":gtype, "name":classname, "prefix":prefix}) - -if __name__ == '__main__': - try: - classname = sys.argv[2] - except IndexError: - cmdline_error() - - prefix = camelcase_to_lower(classname) - basename = prefix.replace('_','-') - outname_header = basename + ".h" - outname_body = basename + ".c" - outname_signal_marshal = basename + "-signals-marshal.list" - - header=open(outname_header,'w') - body=open(outname_body, 'w') - signal_marshal=open(outname_signal_marshal, 'w') - - try: - dom = xml.dom.minidom.parse(sys.argv[1]) - except IndexError: - cmdline_error() - - signals = dom.getElementsByTagName("signal") - signals.sort(key=lambda n: n.getAttributeNode("name").nodeValue) - methods = dom.getElementsByTagName("method") - methods.sort(key=lambda n: n.getAttributeNode("name").nodeValue) - - print_license(header, outname_header, "Header for " + classname) - print_license(body, outname_body, "Source for " + classname) - print_header_begin(header,prefix) - - print_simple_class_defn(header, prefix, classname) - - body.write( -"""#include <dbus/dbus-glib.h> -#include <stdio.h> -#include <stdlib.h> - -#include "%s" -#include "%s-signals-marshal.h" - -#include "%s-glue.h" - -""" % (outname_header, basename, basename)) - - body.write( -"""G_DEFINE_TYPE(%(classname)s, %(prefix)s, G_TYPE_OBJECT) - -""" % {'classname':classname, 'prefix':prefix}) - - if signals: - body.write("/* signal enum */\nenum\n{\n") - for signal in signals: - dbus_name = signal.getAttributeNode("name").nodeValue - body.write(" %s,\n" % camelcase_to_upper(dbus_name) ) - body.write(" LAST_SIGNAL\n};\n\n") - body.write("static guint signals[LAST_SIGNAL] = {0};\n\n") - - gtypename = '_TYPE_'.join(prefix.upper().split('_',1)) - - body.write("""/* private structure */ -typedef struct _%(classname)sPrivate %(classname)sPrivate; - -struct _%(classname)sPrivate -{ - gboolean dispose_has_run; -}; - -#define %(uprefix)s_GET_PRIVATE(o) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((o), %(gtypename)s, %(classname)sPrivate)) -""" % {'classname':classname, 'uprefix':prefix.upper(), 'gtypename':gtypename}) - - body.write( -""" -static void -%(prefix)s_init (%(classname)s *obj) -{ - %(classname)sPrivate *priv = %(uprefix)s_GET_PRIVATE (obj); - - /* allocate any data required by the object here */ - /* this line allows the plain autogenerated code to compile with -Werror - remove it!*/ - g_assert(priv); -} - -static void %(prefix)s_dispose (GObject *object); -static void %(prefix)s_finalize (GObject *object); - -static void -%(prefix)s_class_init (%(classname)sClass *%(prefix)s_class) -{ - GObjectClass *object_class = G_OBJECT_CLASS (%(prefix)s_class); - - g_type_class_add_private (%(prefix)s_class, sizeof (%(classname)sPrivate)); - - object_class->dispose = %(prefix)s_dispose; - object_class->finalize = %(prefix)s_finalize; -""" % {"prefix":prefix, "classname":classname, 'uprefix':prefix.upper()}) - - for signal in signals: - mtype = signal_to_marshal_type(signal) - if len(mtype): - signal_marshal.write("VOID:"+','.join(mtype)+"\n") - else: - signal_marshal.write("VOID:VOID\n") - - header.write("\n") - - for signal in signals: - dbus_name = signal.getAttributeNode("name").nodeValue - gtypelist=signal_to_gtype_list(signal) - - body.write( -""" - signals[%s] = - g_signal_new ("%s", - G_OBJECT_CLASS_TYPE (%s_class), - G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED, - 0, - NULL, NULL, - %s, - G_TYPE_NONE, %s); -""" % (camelcase_to_upper(dbus_name), - camelcase_to_lower(dbus_name).replace('_','-'), - prefix, - signal_to_marshal_name(signal,prefix), ', '.join([str(len(gtypelist))] + gtypelist))) - - body.write( -""" - dbus_g_object_type_install_info (G_TYPE_FROM_CLASS (%(prefix)s_class), &dbus_glib_%(prefix)s_object_info); -} - -void -%(prefix)s_dispose (GObject *object) -{ - %(classname)s *self = %(uprefix)s (object); - %(classname)sPrivate *priv = %(uprefix)s_GET_PRIVATE (self); - - if (priv->dispose_has_run) - return; - - priv->dispose_has_run = TRUE; - - /* release any references held by the object here */ - - if (G_OBJECT_CLASS (%(prefix)s_parent_class)->dispose) - G_OBJECT_CLASS (%(prefix)s_parent_class)->dispose (object); -} - -void -%(prefix)s_finalize (GObject *object) -{ - %(classname)s *self = %(uprefix)s (object); - %(classname)sPrivate *priv = %(uprefix)s_GET_PRIVATE (self); - - /* free any data held directly by the object here */ - /* this line allows the plain autogenerated code to compile with -Werror - remove it!*/ - g_assert(priv); - - G_OBJECT_CLASS (%(prefix)s_parent_class)->finalize (object); -} - - -""" % {'classname':classname,'prefix':prefix, 'uprefix':prefix.upper()}) - - for method in methods: - dbus_method_name = method.getAttributeNode("name").nodeValue - c_method_name = prefix + '_' + camelcase_to_lower(dbus_method_name) - c_decl = 'gboolean '+c_method_name+' ('+classname+' *obj' - async=False - ret_count=0 - - for i in method.getElementsByTagName("annotation"): - if i.getAttribute("name") == "org.freedesktop.DBus.GLib.Async": - async=True - - for i in method.getElementsByTagName("arg"): - name =i.getAttribute("name") - direction = i.getAttribute("direction") - type = i.getAttribute("type") - - if async and direction=="out": - continue - - if not name and direction == "out": - if ret_count==0: - name = "ret" - else: - name = "ret"+str(ret_count) - ret_count += 1 - - gtype = type_to_gtype(type)[0] - if direction =="out": - gtype+='*' - else: - if type_to_gtype(type)[3]: - gtype="const "+gtype - c_decl +=", "+gtype+" "+name - if async: - c_decl += ", DBusGMethodInvocation *context)" - else: - c_decl += ", GError **error)" - - interface = method.parentNode.getAttribute("name"); - header.write(c_decl+";\n") - body.write( -""" -/** - * %(c_method_name)s - * - * Implements DBus method %(method)s - * on interface %(interface)s - *""" % {'c_method_name':c_method_name, 'method':dbus_method_name, 'interface':interface}) - if async: - body.write( -""" - * @context: The DBUS invocation context to use to return values - * or throw an error. - */ -""") - else: - body.write( -""" - * @error: Used to return a pointer to a GError detailing any error - * that occured, DBus will throw the error only if this - * function returns false. - * - * Returns: TRUE if successful, FALSE if an error was thrown. - */ -""") - body.write(c_decl+"\n{\n return TRUE;\n}\n\n") - - header.write('\n') - - print_header_end(header,prefix) - header.close() - body.close() diff --git a/tools/geninterfaces.py b/tools/geninterfaces.py deleted file mode 100644 index 74c3024..0000000 --- a/tools/geninterfaces.py +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/python2.4 -import telepathy.interfaces -import inspect -import gengobject - -out = open("telepathy-interfaces.h", 'w') - -gengobject.print_license(out, "telepathy-interfaces.h", "Header for Telepathy interface names") - -gengobject.print_header_begin(out, "telepathy_interfaces") - -interfaces = telepathy.interfaces.__dict__.keys() -interfaces.sort() - -for cname in interfaces: - val = telepathy.interfaces.__dict__[cname] - if cname[:2] !='__': - out.write('#define TP_IFACE_'+cname +' \\\n') - out.write(' "'+val+'"\n') - - -gengobject.print_header_end(out, "telepathy_interfaces"); - |