]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
meson: do not use generate_gperfs.py for keyboard-keys-from-name.gperf (#5968)
authorYu Watanabe <watanabe.yu+github@gmail.com>
Tue, 16 May 2017 00:51:22 +0000 (09:51 +0900)
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Tue, 16 May 2017 00:51:22 +0000 (20:51 -0400)
Fixes #5967.

src/udev/generate-keyboard-gperf.py [new file with mode: 0755]
src/udev/meson.build

diff --git a/src/udev/generate-keyboard-gperf.py b/src/udev/generate-keyboard-gperf.py
new file mode 100755 (executable)
index 0000000..03d3bba
--- /dev/null
@@ -0,0 +1,16 @@
+#!/usr/bin/env python3
+
+"""Generate keyboard-keys-from-name.gperf from keyboard-keys-list.txt
+"""
+
+import sys
+
+input = sys.argv[1]
+
+print("""\
+struct key_name { const char* name; unsigned short id; };
+%null-strings
+%%""")
+
+for line in open(input):
+    print("{0}, {1}".format(line.rstrip()[4:].lower(), line.rstrip()))
index 90033edda8f1c977b4805c306f33b950ba414010..9c81bce54546e48b1bcd87bbac30ee39bdf1c4dc 100644 (file)
@@ -59,12 +59,13 @@ keyboard_keys_list_txt = custom_target(
         command : [generate_keyboard_keys_list, cpp],
         capture : true)
 
+generate_keyboard_gperf = find_program('generate-keyboard-gperf.py')
 fname = 'keyboard-keys-from-name.gperf'
 gperf_file = custom_target(
         fname,
         input : keyboard_keys_list_txt,
         output : fname,
-        command : [generate_gperfs, 'key', '', '@INPUT@'],
+        command : [generate_keyboard_gperf, '@INPUT@'],
         capture : true)
 
 fname = 'keyboard-keys-from-name.h'
@@ -73,7 +74,7 @@ keyboard_keys_from_name_h = custom_target(
         input : gperf_file,
         output : fname,
         command : [gperf,
-                   '-L', 'ANSI-C', '-t', '--ignore-case',
+                   '-L', 'ANSI-C', '-t',
                    '-N', 'keyboard_lookup_key',
                    '-H', 'hash_key_name',
                    '-p', '-C',