From 603db9e55be8c40494e790c4997c84211498de04 Mon Sep 17 00:00:00 2001 From: Maxime Chretien Date: Fri, 12 Jun 2020 15:44:12 +0200 Subject: [PATCH] Index CONFIG_ references in makefiles Signed-off-by: Maxime Chretien --- lib.py | 5 ++++- update.py | 10 ++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/lib.py b/lib.py index 61dabf7..7b218b3 100755 --- a/lib.py +++ b/lib.py @@ -207,6 +207,8 @@ def getFileFamily(filename): # Some files are named like Kconfig-nommu so we only check the first 7 letters # We also exclude documentation files that can be named kconfig return 'K' # Kconfig files + elif name.lower()[:8] in ['makefile'] and not ext.lower() in ['.rst']: + return 'M' # Makefiles else : return None @@ -215,7 +217,8 @@ def getFileFamily(filename): compatibility_list = { 'C' : ['C', 'K'], 'K' : ['K'], - 'D' : ['D', 'CM'] + 'D' : ['D', 'CM'], + 'M' : ['K'] } # Check if families are compatible diff --git a/update.py b/update.py index 08bc759..4169b29 100755 --- a/update.py +++ b/update.py @@ -231,7 +231,7 @@ class UpdateDefs(Thread): filename = db.file.get(idx) family = lib.getFileFamily(filename); - if family == None: continue + if family in [None, 'M']: continue lines = scriptLines('parse-defs', hash, filename, family) @@ -312,7 +312,9 @@ class UpdateRefs(Thread): if even: tok = prefix + tok - if db.defs.exists(tok): + if (db.defs.exists(tok) and + (family != 'M' or tok.startswith(b'CONFIG_'))): + # We only index CONFIG_??? in makefiles if tok in idents: idents[tok] += ',' + str(line_num) else: @@ -374,7 +376,7 @@ class UpdateDocs(Thread): filename = db.file.get(idx) family = lib.getFileFamily(filename) - if family == None: continue + if family in [None, 'M']: continue lines = scriptLines('parse-docs', hash, filename) with docs_lock: @@ -435,7 +437,7 @@ class UpdateComps(Thread): filename = db.file.get(idx) family = lib.getFileFamily(filename) - if family in [None, 'K']: continue + if family in [None, 'K', 'M']: continue lines = compatibles_parser.run(scriptLines('get-blob', hash), family) comps = {}