[gtk/render-node-types: 72/75] Improve the gtktypefuncs.inc generator
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/render-node-types: 72/75] Improve the gtktypefuncs.inc generator
- Date: Wed, 8 Apr 2020 14:46:26 +0000 (UTC)
commit 54e4e6cd230b71db8609b68c911ee80eb53ac4b4
Author: Emmanuele Bassi <ebassi gnome org>
Date: Wed Apr 8 15:26:14 2020 +0100
Improve the gtktypefuncs.inc generator
Remove the plug/socket exception, and add exceptions for non-X11
windowing systems.
Additionally, speed up the file generation by avoiding string
concatenation in Python.
gtk/gentypefuncs.py | 34 ++++++++++++++++++++++++++--------
1 file changed, 26 insertions(+), 8 deletions(-)
---
diff --git a/gtk/gentypefuncs.py b/gtk/gentypefuncs.py
index c67c5c4a5f..522c04688a 100644
--- a/gtk/gentypefuncs.py
+++ b/gtk/gentypefuncs.py
@@ -43,28 +43,46 @@ for filename in in_files:
for line in f:
line = line.rstrip('\n').rstrip('\r')
# print line
- match = re.search(r'\bg[tds]k_[a-zA-Z0-9_]*_get_type\b', line)
+ match = re.search(r'\bg[dst]k_[a-zA-Z0-9_]*_get_type\b', line)
if match:
func = match.group(0)
if not func in funcs:
funcs.append(func)
if debug: print ('Found ', func)
-file_output = 'G_GNUC_BEGIN_IGNORE_DEPRECATIONS\n'
+file_output = ['G_GNUC_BEGIN_IGNORE_DEPRECATIONS']
funcs = sorted(funcs)
for f in funcs:
- if f.startswith('gdk_x11') or f.startswith('gtk_socket') or f.startswith('gtk_plug'):
- file_output += '#ifdef GDK_WINDOWING_X11\n'
- file_output += '*tp++ = {0}();\n'.format(f)
- file_output += '#endif\n'
+ if f.startswith('gdk_x11'):
+ file_output += ['#ifdef GDK_WINDOWING_X11']
+ file_output += ['*tp++ = {0}();'.format(f)]
+ file_output += ['#endif']
+ elif f.startswith('gdk_broadway'):
+ file_output += ['#ifdef GDK_WINDOWING_BROADWAY']
+ file_output += ['*tp++ = {0}();'.format(f)]
+ file_output += ['#endif']
+ elif f.startswith('gdk_wayland'):
+ file_output += ['#ifdef GDK_WINDOWING_WAYLAND']
+ file_output += ['*tp++ = {0}();'.format(f)]
+ file_output += ['#endif']
+ elif f.startswith('gdk_win32'):
+ file_output += ['#ifdef GDK_WINDOWING_WIN32']
+ file_output += ['*tp++ = {0}();'.format(f)]
+ file_output += ['#endif']
+ elif f.startswith('gdk_quartz'):
+ file_output += ['#ifdef GDK_WINDOWING_QUARTZ']
+ file_output += ['*tp++ = {0}();'.format(f)]
+ file_output += ['#endif']
else:
- file_output += '*tp++ = {0}();\n'.format(f)
+ file_output += ['*tp++ = {0}();'.format(f)]
+
+file_output += ['G_GNUC_END_IGNORE_DEPRECATIONS']
if debug: print (len(funcs), 'functions')
tmp_file = out_file + '~'
with open(tmp_file, 'w') as f:
- f.write(file_output)
+ f.write('\n'.join(file_output))
replace_if_changed(tmp_file, out_file)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]