[glib] Remove unused marshallers-related files



commit 9c66e65b29d5fd17dcfd77c4b010aa792b2e1d5a
Author: Emmanuele Bassi <ebassi gnome org>
Date:   Wed Jul 5 19:26:26 2017 +0100

    Remove unused marshallers-related files
    
    We don't use gmarshal.list any more, and the generated gmarshal.strings
    file is not used after the Python port of glib-genmarshal.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=784528

 gobject/Makefile.am           |    6 ++----
 gobject/glib-genmarshal.in    |    2 +-
 gobject/gmarshal.list         |   32 --------------------------------
 gobject/marshal-genstrings.pl |    9 ---------
 win32/setup.py                |   20 --------------------
 5 files changed, 3 insertions(+), 66 deletions(-)
---
diff --git a/gobject/Makefile.am b/gobject/Makefile.am
index 8c5b8f4..7396762 100644
--- a/gobject/Makefile.am
+++ b/gobject/Makefile.am
@@ -144,8 +144,7 @@ endif
 # non-header sources (headers should be specified in the above variables)
 # that don't serve as direct make target sources, i.e. they don't have
 # their own .lo rules and don't get publically installed
-gobject_extra_sources = \
-       gmarshal.list
+gobject_extra_sources =
 
 #
 # setup GObject library sources and their dependancies
@@ -155,8 +154,7 @@ gobject_target_sources = $(gobject_c_sources)
 EXTRA_HEADERS =
 EXTRA_DIST += \
        $(gobject_private_h_sources)    \
-       $(gobject_extra_sources)        \
-       marshal-genstrings.pl
+       $(gobject_extra_sources)
 
 # This is read by gobject-introspection/misc/ and gtk-doc
 gobject-public-headers.txt: Makefile
diff --git a/gobject/glib-genmarshal.in b/gobject/glib-genmarshal.in
index 65037cc..ca78e1a 100755
--- a/gobject/glib-genmarshal.in
+++ b/gobject/glib-genmarshal.in
@@ -92,7 +92,7 @@ UNBOX_UNTYPED_STR = \
 
 STD_PREFIX = 'g_cclosure_marshal'
 
-# Keep it in sync with gmarshal.list
+# These are part of our ABI; keep this in sync with gmarshal.h
 GOBJECT_MARSHALLERS = {
     'g_cclosure_marshal_VOID__VOID',
     'g_cclosure_marshal_VOID__BOOLEAN',
diff --git a/win32/setup.py b/win32/setup.py
index f3cac2e..ec57dc8 100644
--- a/win32/setup.py
+++ b/win32/setup.py
@@ -297,26 +297,6 @@ def main(argv):
                os.path.join(srcroot, 'gobject', 'glib-mkenums'),
                mkenums_vars)
 
-    #gmarshal.strings
-    cwd = os.getcwd()
-    os.chdir(os.path.join(srcroot, 'gobject'))
-    with open(os.path.join(srcroot, 'gobject', 'gmarshal.strings'), 'w') as d:
-        with open(os.path.join(srcroot, 'gobject', 'gmarshal.list'), 'r') as s:
-            for i in s:
-                if i[0] not in string.ascii_uppercase: #^[A-Z]
-                    continue
-                line = '"g_cclosure_marshal_' # s/^/"g_cclosure_marshal_/
-                for c in i:
-                    if c == ':':
-                        line += '__'          # s/:/__
-                    elif c == ',':
-                        line += '_'           # s/,/_
-                    elif c not in '\r\n':
-                        line += c
-                d.write(line + '",\n')
-        #subprocess.Popen([opt.perl, 'marshal-genstrings.pl'], stdout=d).communicate()
-    os.chdir(cwd)
-
     generate_libgobject_sourcefiles(srcroot,
                                 os.path.join(srcroot, 'win32', 'libgobject.sourcefiles'), '9')
     generate_libgobject_sourcefiles(srcroot,


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]