telepathy-qt: Tools: Remove glib-signals-marshal-gen

Alexandr Akulich kaffeine at kemper.freedesktop.org
Mon Sep 2 18:00:11 UTC 2019


Module: telepathy-qt
Branch: master
Commit: 2f418e83686d09079c9379e0398ddde6abd6fe38
URL:    http://cgit.freedesktop.org/telepathy/telepathy-qt/commit/?id=2f418e83686d09079c9379e0398ddde6abd6fe38

Author: Alexander Akulich <akulichalexander at gmail.com>
Date:   Fri Aug 30 00:00:42 2019 +0300

Tools: Remove glib-signals-marshal-gen

See commit d70ba9ba46ea037b8003efc27de7f8c2d067befa in telepathy-glib.

---

 tests/lib/glib/future/extensions/CMakeLists.txt | 27 ------------
 tests/lib/glib/future/extensions/extensions.c   |  1 -
 tools/CMakeLists.txt                            |  1 -
 tools/glib-signals-marshal-gen.py               | 55 -------------------------
 4 files changed, 84 deletions(-)

diff --git a/tests/lib/glib/future/extensions/CMakeLists.txt b/tests/lib/glib/future/extensions/CMakeLists.txt
index fb1e940a..c415eeac 100644
--- a/tests/lib/glib/future/extensions/CMakeLists.txt
+++ b/tests/lib/glib/future/extensions/CMakeLists.txt
@@ -25,29 +25,6 @@ if(ENABLE_TP_GLIB_TESTS)
         DEPENDS ${gen_all_xml}
                 ${CMAKE_SOURCE_DIR}/tools/glib-gtypes-generator.py)
 
-    add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/_gen/signals-marshal.list
-        COMMAND ${PYTHON_EXECUTABLE}
-        ARGS ${CMAKE_SOURCE_DIR}/tools/glib-signals-marshal-gen.py
-             ${CMAKE_CURRENT_BINARY_DIR}/_gen/all.xml
-             > _gen/signals-marshal.list
-        DEPENDS ${gen_all_xml})
-
-    add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/_gen/signals-marshal.h
-        COMMAND ${GLIB_GENMARSHAL} --header --prefix=_future_ext_marshal
-             ${CMAKE_CURRENT_BINARY_DIR}/_gen/signals-marshal.list
-             > _gen/signals-marshal.h
-        DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/_gen/signals-marshal.list)
-
-    file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/gen-signals-marshal-c.sh "
-         echo '#include \"_gen/signals-marshal.h\"' > _gen/signals-marshal.c
-         ${GLIB_GENMARSHAL} --body --prefix=_future_ext_marshal ${CMAKE_CURRENT_BINARY_DIR}/_gen/signals-marshal.list >> _gen/signals-marshal.c
-    ")
-    set(gen_signals_marshal_c ${SH} ${CMAKE_CURRENT_BINARY_DIR}/gen-signals-marshal-c.sh)
-
-    add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/_gen/signals-marshal.c
-        COMMAND ${gen_signals_marshal_c}
-        DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/_gen/signals-marshal.list)
-
     add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/_gen/enums.h
         COMMAND ${PYTHON_EXECUTABLE}
         ARGS ${CMAKE_SOURCE_DIR}/tools/c-constants-gen.py
@@ -84,7 +61,6 @@ if(ENABLE_TP_GLIB_TESTS)
                 --filename=${CMAKE_CURRENT_BINARY_DIR}/_gen/svc-${spec}
                 --signal-marshal-prefix=_future_ext
                 --include='<telepathy-glib/dbus.h>'
-                --include='_gen/signals-marshal.h'
                 --not-implemented-func='tp_dbus_g_method_return_not_implemented'
                 --allow-unstable
                 ${CMAKE_CURRENT_BINARY_DIR}/_gen/${spec}.xml Future_Svc_)
@@ -106,9 +82,6 @@ if(ENABLE_TP_GLIB_TESTS)
         ${CMAKE_CURRENT_BINARY_DIR}/_gen/gtypes-body.h
         ${CMAKE_CURRENT_BINARY_DIR}/_gen/interfaces.h
         ${CMAKE_CURRENT_BINARY_DIR}/_gen/interfaces-body.h
-        ${CMAKE_CURRENT_BINARY_DIR}/_gen/signals-marshal.c
-        ${CMAKE_CURRENT_BINARY_DIR}/_gen/signals-marshal.h
-        ${CMAKE_CURRENT_BINARY_DIR}/_gen/signals-marshal.list
         ${CMAKE_CURRENT_BINARY_DIR}/_gen/svc-channel.c
         ${CMAKE_CURRENT_BINARY_DIR}/_gen/svc-channel.h
         ${CMAKE_CURRENT_BINARY_DIR}/_gen/svc-connection.c
diff --git a/tests/lib/glib/future/extensions/extensions.c b/tests/lib/glib/future/extensions/extensions.c
index eeda4623..4707c7a8 100644
--- a/tests/lib/glib/future/extensions/extensions.c
+++ b/tests/lib/glib/future/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/CMakeLists.txt b/tools/CMakeLists.txt
index 82df6525..a0d56d45 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -81,7 +81,6 @@ set(toolchain_files
     glib-ginterface-gen.py
     glib-gtypes-generator.py
     glib-interfaces-gen.py
-    glib-signals-marshal-gen.py
     libtpcodegen.py
     libglibcodegen.py
     libqtcodegen.py
diff --git a/tools/glib-signals-marshal-gen.py b/tools/glib-signals-marshal-gen.py
deleted file mode 100644
index 19133995..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 = list(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)()



More information about the telepathy-commits mailing list