mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2025-04-22 23:29:16 +02:00
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
This commit is contained in:
parent
f7643a7df7
commit
9c66e65b29
@ -144,8 +144,7 @@ endif
|
|||||||
# non-header sources (headers should be specified in the above variables)
|
# 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
|
# 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
|
# their own .lo rules and don't get publically installed
|
||||||
gobject_extra_sources = \
|
gobject_extra_sources =
|
||||||
gmarshal.list
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# setup GObject library sources and their dependancies
|
# setup GObject library sources and their dependancies
|
||||||
@ -155,8 +154,7 @@ gobject_target_sources = $(gobject_c_sources)
|
|||||||
EXTRA_HEADERS =
|
EXTRA_HEADERS =
|
||||||
EXTRA_DIST += \
|
EXTRA_DIST += \
|
||||||
$(gobject_private_h_sources) \
|
$(gobject_private_h_sources) \
|
||||||
$(gobject_extra_sources) \
|
$(gobject_extra_sources)
|
||||||
marshal-genstrings.pl
|
|
||||||
|
|
||||||
# This is read by gobject-introspection/misc/ and gtk-doc
|
# This is read by gobject-introspection/misc/ and gtk-doc
|
||||||
gobject-public-headers.txt: Makefile
|
gobject-public-headers.txt: Makefile
|
||||||
|
@ -92,7 +92,7 @@ UNBOX_UNTYPED_STR = \
|
|||||||
|
|
||||||
STD_PREFIX = 'g_cclosure_marshal'
|
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 = {
|
GOBJECT_MARSHALLERS = {
|
||||||
'g_cclosure_marshal_VOID__VOID',
|
'g_cclosure_marshal_VOID__VOID',
|
||||||
'g_cclosure_marshal_VOID__BOOLEAN',
|
'g_cclosure_marshal_VOID__BOOLEAN',
|
||||||
|
@ -1,32 +0,0 @@
|
|||||||
# Note: This file used to generate gmarshal.[ch], but it doesn't any
|
|
||||||
# longer; it is kept mainly for backward compatibility purposes. If
|
|
||||||
# you find yourself in the need to add a marshaller in GObject, use
|
|
||||||
# g_cclosure_marshal_generic() instead.
|
|
||||||
#
|
|
||||||
# Warning: The generated symbols are part of the GObject ABI.
|
|
||||||
|
|
||||||
# standard VOID return marshallers
|
|
||||||
VOID:VOID
|
|
||||||
VOID:BOOLEAN
|
|
||||||
VOID:CHAR
|
|
||||||
VOID:UCHAR
|
|
||||||
VOID:INT
|
|
||||||
VOID:UINT
|
|
||||||
VOID:LONG
|
|
||||||
VOID:ULONG
|
|
||||||
VOID:ENUM
|
|
||||||
VOID:FLAGS
|
|
||||||
VOID:FLOAT
|
|
||||||
VOID:DOUBLE
|
|
||||||
VOID:STRING
|
|
||||||
VOID:PARAM
|
|
||||||
VOID:BOXED
|
|
||||||
VOID:POINTER
|
|
||||||
VOID:OBJECT
|
|
||||||
VOID:VARIANT
|
|
||||||
|
|
||||||
# GRuntime specific marshallers
|
|
||||||
VOID:UINT,POINTER
|
|
||||||
BOOL:FLAGS
|
|
||||||
STRING:OBJECT,POINTER
|
|
||||||
BOOL:BOXED,BOXED
|
|
@ -1,9 +0,0 @@
|
|||||||
#!/usr/bin/perl
|
|
||||||
|
|
||||||
open (List, "gmarshal.list");
|
|
||||||
|
|
||||||
while (<List>) {
|
|
||||||
next unless /^[A-Z]/;
|
|
||||||
s/^/"g_cclosure_marshal_/; s/:/__/; s/,/_/g; s/$/",/;
|
|
||||||
print;
|
|
||||||
}
|
|
@ -297,26 +297,6 @@ def main(argv):
|
|||||||
os.path.join(srcroot, 'gobject', 'glib-mkenums'),
|
os.path.join(srcroot, 'gobject', 'glib-mkenums'),
|
||||||
mkenums_vars)
|
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,
|
generate_libgobject_sourcefiles(srcroot,
|
||||||
os.path.join(srcroot, 'win32', 'libgobject.sourcefiles'), '9')
|
os.path.join(srcroot, 'win32', 'libgobject.sourcefiles'), '9')
|
||||||
generate_libgobject_sourcefiles(srcroot,
|
generate_libgobject_sourcefiles(srcroot,
|
||||||
|
Loading…
x
Reference in New Issue
Block a user