From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Wed, 28 Nov 2018 11:19:41 +0000 (+0900)
Subject: tools: move generate-gperfs.py to tools/
X-Git-Tag: v240~186^2~2
X-Git-Url: http://git-history.diyao.me/?a=commitdiff_plain;h=6ec439fd4b93ecb660b7cc8bc15f8a59ecc530bd;p=systemd%2F.git

tools: move generate-gperfs.py to tools/
---

diff --git a/meson.build b/meson.build
index 8b51d032b8..210d5d64ee 100644
--- a/meson.build
+++ b/meson.build
@@ -1388,6 +1388,8 @@ includes = include_directories('src/basic',
 
 add_project_arguments('-include', 'config.h', language : 'c')
 
+generate_gperfs = find_program('tools/generate-gperfs.py')
+
 subdir('po')
 subdir('catalog')
 subdir('src/systemd')
diff --git a/src/basic/generate-gperfs.py b/src/basic/generate-gperfs.py
deleted file mode 100755
index aca9ab1fe9..0000000000
--- a/src/basic/generate-gperfs.py
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/env python3
-
-"""Generate %-from-name.gperf from %-list.txt
-"""
-
-import sys
-
-name, prefix, input = sys.argv[1:]
-
-print("""\
-%{
-#if __GNUC__ >= 7
-_Pragma("GCC diagnostic ignored \\"-Wimplicit-fallthrough\\"")
-#endif
-%}""")
-print("""\
-struct {}_name {{ const char* name; int id; }};
-%null-strings
-%%""".format(name))
-
-for line in open(input):
-    print("{0}, {1}{0}".format(line.rstrip(), prefix))
diff --git a/src/basic/meson.build b/src/basic/meson.build
index 0b27ffda7d..38537920b7 100644
--- a/src/basic/meson.build
+++ b/src/basic/meson.build
@@ -179,8 +179,6 @@ basic_sources = files('''
 
 missing_h = files('missing.h')
 
-generate_gperfs = find_program('generate-gperfs.py')
-
 generate_af_list = find_program('generate-af-list.sh')
 af_list_txt = custom_target(
         'af-list.txt',
diff --git a/tools/generate-gperfs.py b/tools/generate-gperfs.py
new file mode 100755
index 0000000000..aca9ab1fe9
--- /dev/null
+++ b/tools/generate-gperfs.py
@@ -0,0 +1,22 @@
+#!/usr/bin/env python3
+
+"""Generate %-from-name.gperf from %-list.txt
+"""
+
+import sys
+
+name, prefix, input = sys.argv[1:]
+
+print("""\
+%{
+#if __GNUC__ >= 7
+_Pragma("GCC diagnostic ignored \\"-Wimplicit-fallthrough\\"")
+#endif
+%}""")
+print("""\
+struct {}_name {{ const char* name; int id; }};
+%null-strings
+%%""".format(name))
+
+for line in open(input):
+    print("{0}, {1}{0}".format(line.rstrip(), prefix))