diff options
| -rw-r--r-- | extensions/Makefile.am | 14 | ||||
| -rw-r--r-- | extensions/extensions-cli.c | 1 | ||||
| -rw-r--r-- | extensions/extensions.c | 1 | ||||
| -rw-r--r-- | tools/glib-signals-marshal-gen.py | 55 |
4 files changed, 0 insertions, 71 deletions
diff --git a/extensions/Makefile.am b/extensions/Makefile.am index 8d674cd1..bc421330 100644 --- a/extensions/Makefile.am +++ b/extensions/Makefile.am @@ -33,9 +33,6 @@ libemp_extensions_la_SOURCES = \ extensions.h nodist_libemp_extensions_la_SOURCES = \ - _gen/signals-marshal.c \ - _gen/signals-marshal.h \ - _gen/signals-marshal.list \ _gen/register-dbus-glib-marshallers-body.h \ _gen/enums.h \ _gen/gtypes.h \ @@ -77,17 +74,6 @@ _gen/gtypes.h _gen/gtypes-body.h: _gen/all.xml \ $(AM_V_GEN)$(PYTHON) $(top_srcdir)/tools/glib-gtypes-generator.py \ $< _gen/gtypes Emp -_gen/signals-marshal.list: _gen/all.xml \ - $(tools_dir)/glib-signals-marshal-gen.py - $(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-signals-marshal-gen.py $< > $@ - -_gen/signals-marshal.h: _gen/signals-marshal.list Makefile.am - $(AM_V_GEN)$(GLIB_GENMARSHAL) --header --prefix=_emp_ext_marshal $< > $@ - -_gen/signals-marshal.c: _gen/signals-marshal.list Makefile.am - $(AM_V_GEN){ echo '#include "_gen/signals-marshal.h"' && \ - $(GLIB_GENMARSHAL) --body --prefix=_emp_ext_marshal $< ; } > $@ - _gen/register-dbus-glib-marshallers-body.h: _gen/all.xml \ $(tools_dir)/glib-client-marshaller-gen.py $(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-client-marshaller-gen.py $< \ diff --git a/extensions/extensions-cli.c b/extensions/extensions-cli.c index 9a72da14..e50a6231 100644 --- a/extensions/extensions-cli.c +++ b/extensions/extensions-cli.c @@ -5,7 +5,6 @@ static void _emp_ext_register_dbus_glib_marshallers (void); /* include auto-generated stubs for client-specific code */ -#include "_gen/signals-marshal.h" #include "_gen/cli-misc-body.h" #include "_gen/register-dbus-glib-marshallers-body.h" diff --git a/extensions/extensions.c b/extensions/extensions.c index eeda4623..4707c7a8 100644 --- a/extensions/extensions.c +++ b/extensions/extensions.c @@ -3,4 +3,3 @@ /* include auto-generated stubs for things common to service and client */ #include "_gen/gtypes-body.h" #include "_gen/interfaces-body.h" -#include "_gen/signals-marshal.h" diff --git a/tools/glib-signals-marshal-gen.py b/tools/glib-signals-marshal-gen.py deleted file mode 100644 index 0d02c134..00000000 --- a/tools/glib-signals-marshal-gen.py +++ /dev/null @@ -1,55 +0,0 @@ -#!/usr/bin/python - -import sys -import xml.dom.minidom -from string import ascii_letters, digits - - -from libglibcodegen import signal_to_marshal_name, method_to_glue_marshal_name - - -class Generator(object): - - def __init__(self, dom): - self.dom = dom - self.marshallers = {} - - def do_method(self, method): - marshaller = method_to_glue_marshal_name(method, 'PREFIX') - - assert '__' in marshaller - rhs = marshaller.split('__', 1)[1].split('_') - - self.marshallers[marshaller] = rhs - - def do_signal(self, signal): - marshaller = signal_to_marshal_name(signal, 'PREFIX') - - assert '__' in marshaller - rhs = marshaller.split('__', 1)[1].split('_') - - self.marshallers[marshaller] = rhs - - def __call__(self): - methods = self.dom.getElementsByTagName('method') - - for method in methods: - self.do_method(method) - - signals = self.dom.getElementsByTagName('signal') - - for signal in signals: - self.do_signal(signal) - - all = self.marshallers.keys() - all.sort() - for marshaller in all: - rhs = self.marshallers[marshaller] - if not marshaller.startswith('g_cclosure'): - print 'VOID:' + ','.join(rhs) - -if __name__ == '__main__': - argv = sys.argv[1:] - dom = xml.dom.minidom.parse(argv[0]) - - Generator(dom)() |