From 30787378f49714319e75437b347b7027a949700d Mon Sep 17 00:00:00 2001 From: Ole Troan Date: Thu, 1 Mar 2018 13:33:39 +0100 Subject: [PATCH] VPPAPIGEN: Improve output module finding for out-of-tree builds. Change-Id: I3b646d84586dd61018f71cbf21c971c97fda75c1 Signed-off-by: Ole Troan --- src/tools/vppapigen/vppapigen.py | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/tools/vppapigen/vppapigen.py b/src/tools/vppapigen/vppapigen.py index 81f26fe4432..a230e2290e3 100755 --- a/src/tools/vppapigen/vppapigen.py +++ b/src/tools/vppapigen/vppapigen.py @@ -720,11 +720,21 @@ def main(): import imp # Default path + pluginpath = '' if not args.pluginpath: - pluginpath = os.path.dirname(os.path.realpath(__file__)) + \ - '/../share/vpp/' + cand = [] + cand.append(os.path.dirname(os.path.realpath(__file__))) + cand.append(os.path.dirname(os.path.realpath(__file__)) + \ + '/../share/vpp/') + for c in cand: + c += '/' + if os.path.isfile(c + args.output_module + '.py'): + pluginpath = c + break else: pluginpath = args.pluginpath + '/' + if pluginpath == '': + raise Exception('Output plugin not found') module_path = pluginpath + args.output_module + '.py' try: -- 2.16.6