summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Akulich <akulichalexander@gmail.com>2019-09-15 02:33:58 +0300
committerAlexander Akulich <akulichalexander@gmail.com>2019-09-15 17:35:27 +0300
commitf44db86a6619f4c97b7b8e5819c885ac9f8893b0 (patch)
tree5217dc792ce9d8fa72e10fe5ef3907226488590c
parent23a212f0b3201e34e7a4f3b3ba3b916e1e379bcc (diff)
downloadtelepathy-mission-control-f44db86a6619f4c97b7b8e5819c885ac9f8893b0.tar.gz
Tools: Remove glib-signals-marshal-gen
See commit d70ba9ba46ea037b8003efc27de7f8c2d067befa in telepathy-glib. See also: https://bugs.freedesktop.org/show_bug.cgi?id=46523
-rw-r--r--src/Makefile.am16
-rw-r--r--src/mcd-misc.c1
-rw-r--r--tools/Makefile.am3
-rw-r--r--tools/glib-signals-marshal-gen.py55
4 files changed, 0 insertions, 75 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index fe81e97f..ae1de3e4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -57,9 +57,6 @@ nodist_libmcd_convenience_la_SOURCES = \
_gen/gtypes-body.h \
_gen/interfaces-body.h \
_gen/register-dbus-glib-marshallers-body.h \
- _gen/signals-marshal.c \
- _gen/signals-marshal.h \
- _gen/signals-marshal.list \
_gen/svc-Account_Interface_Conditions.c \
_gen/svc-Account_Interface_External_Password_Storage.c \
_gen/svc-Account_Interface_Hidden.c \
@@ -236,18 +233,6 @@ _gen/%.xml: $(top_srcdir)/xml/%.xml $(wildcard $(top_srcdir)/xml/*.xml)
# Generated files which can be done for all "classes" at once
-_gen/signals-marshal.list: _gen/mcd.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=_mcd_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=_mcd_ext_marshal $<; } \
- > $@
-
_gen/register-dbus-glib-marshallers-body.h: _gen/mcd.xml \
$(tools_dir)/glib-client-marshaller-gen.py Makefile.am
$(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-client-marshaller-gen.py $< \
@@ -328,7 +313,6 @@ _gen/svc-%-gtk-doc.h: _gen/%.xml \
--filename=_gen/svc-$* \
--signal-marshal-prefix=_mcd_ext \
--include='<telepathy-glib/telepathy-glib.h>' \
- --include='"_gen/signals-marshal.h"' \
--not-implemented-func='tp_dbus_g_method_return_not_implemented' \
--allow-unstable \
$< Mc_Svc_
diff --git a/src/mcd-misc.c b/src/mcd-misc.c
index 58b2f667..3a3f1541 100644
--- a/src/mcd-misc.c
+++ b/src/mcd-misc.c
@@ -37,7 +37,6 @@
#include "mcd-debug.h"
-#include "_gen/signals-marshal.h"
#include "_gen/register-dbus-glib-marshallers-body.h"
#include <dbus/dbus.h>
diff --git a/tools/Makefile.am b/tools/Makefile.am
index befd2666..b5fa3273 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -9,7 +9,6 @@ EXTRA_DIST = \
glib-interfaces-body-generator.xsl \
glib-ginterface-gen.py \
glib-gtypes-generator.py \
- glib-signals-marshal-gen.py \
gquark-gen.py \
identity.xsl \
lcov.am \
@@ -31,8 +30,6 @@ glib-ginterface-gen.py: libglibcodegen.py
$(AM_V_GEN)test -e ${srcdir}/$@ && touch ${srcdir}/$@
glib-gtypes-generator.py: libglibcodegen.py
$(AM_V_GEN)test -e ${srcdir}/$@ && touch ${srcdir}/$@
-glib-signals-marshal-gen.py: libglibcodegen.py
- $(AM_V_GEN)test -e ${srcdir}/$@ && touch ${srcdir}/$@
TELEPATHY_GLIB_SRCDIR = $(top_srcdir)/../telepathy-glib
maintainer-update-from-telepathy-glib:
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)()