meson: do not use generate_gperfs.py for keyboard-keys-from-name.gperf (#5968)

Fixes #5967.
This commit is contained in:
Yu Watanabe 2017-05-16 09:51:22 +09:00 committed by Zbigniew Jędrzejewski-Szmek
parent f9d77d198e
commit 8ff213fd65
2 changed files with 19 additions and 2 deletions

View file

@ -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()))

View file

@ -59,12 +59,13 @@ keyboard_keys_list_txt = custom_target(
command : [generate_keyboard_keys_list, cpp], command : [generate_keyboard_keys_list, cpp],
capture : true) capture : true)
generate_keyboard_gperf = find_program('generate-keyboard-gperf.py')
fname = 'keyboard-keys-from-name.gperf' fname = 'keyboard-keys-from-name.gperf'
gperf_file = custom_target( gperf_file = custom_target(
fname, fname,
input : keyboard_keys_list_txt, input : keyboard_keys_list_txt,
output : fname, output : fname,
command : [generate_gperfs, 'key', '', '@INPUT@'], command : [generate_keyboard_gperf, '@INPUT@'],
capture : true) capture : true)
fname = 'keyboard-keys-from-name.h' fname = 'keyboard-keys-from-name.h'
@ -73,7 +74,7 @@ keyboard_keys_from_name_h = custom_target(
input : gperf_file, input : gperf_file,
output : fname, output : fname,
command : [gperf, command : [gperf,
'-L', 'ANSI-C', '-t', '--ignore-case', '-L', 'ANSI-C', '-t',
'-N', 'keyboard_lookup_key', '-N', 'keyboard_lookup_key',
'-H', 'hash_key_name', '-H', 'hash_key_name',
'-p', '-C', '-p', '-C',