From 630741546192c5a61b4a36a954bd2f3fe2af940a Mon Sep 17 00:00:00 2001 From: Vratko Polak Date: Thu, 18 Jul 2019 15:58:41 +0200 Subject: build: add more src dirs for generate_json.py Because file vpe.api is in src/vpp/api/ and memclnt.api is in src/vlibmemory/. Also removed api_types, as iteration can be done over output_dir_map. Type: fix Fixes: 9529feb4525dfd13e5636640083361256121d275 Ticket: VPP-1715 Change-Id: I021afeafdf98904d076953f0b09d1e3587fd3100 Signed-off-by: Vratko Polak --- src/tools/vppapigen/generate_json.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/tools/vppapigen/generate_json.py b/src/tools/vppapigen/generate_json.py index 6987cd21f25..4be4f69f591 100755 --- a/src/tools/vppapigen/generate_json.py +++ b/src/tools/vppapigen/generate_json.py @@ -21,20 +21,23 @@ BASE_DIR = subprocess.check_output('git rev-parse --show-toplevel', vppapigen_bin = pathlib.Path( '%s/src/tools/vppapigen/vppapigen.py' % BASE_DIR).as_posix() -api_types = ['vnet', 'plugins'] src_dir_depth = 3 output_path = pathlib.Path( '%s/build-root/install-vpp-native/vpp/share/vpp/api/' % BASE_DIR) output_path_debug = pathlib.Path( '%s/build-root/install-vpp_debug-native/vpp/share/vpp/api/' % BASE_DIR) -output_dir_map = {'vnet': 'core', - 'plugins': 'plugins'} +output_dir_map = { + 'plugins': 'plugins', + 'vlibmemory': 'core', + 'vnet': 'core', + 'vpp': 'core', +} def api_search_globs(src_dir): globs = [] - for g in api_types: + for g in output_dir_map: globs.extend(list(src_dir.glob('%s/**/*.api' % g))) return globs -- cgit 1.2.3-korg