From ce2245bb7a6e1f3ac6f0caf0ce640feb235d8e27 Mon Sep 17 00:00:00 2001 From: duplo Date: Wed, 21 Jan 2009 15:18:15 +0000 Subject: [PATCH] Correct a commit error git-svn-id: https://src.develer.com/svnoss/bertos/trunk@2197 38d2e660-2303-0410-9eaa-f027e97ec537 --- wizard/bertos_utils.py | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/wizard/bertos_utils.py b/wizard/bertos_utils.py index fbf83818..c38a88b4 100644 --- a/wizard/bertos_utils.py +++ b/wizard/bertos_utils.py @@ -114,6 +114,18 @@ def formatModuleNameValue(text): block = re.findall("\s*([^\s]+)\s*(.+?)\s*$", text, re.MULTILINE) return block[0] +def getDescriptionInformations(text): + """ + Take the doxygen comment and strip the wizard informations, returning the tuple + (comment, wizard_informations) + """ + informations = {} + index = text.find("$WIZARD") + if index != -1: + exec(text[index + 1:]) + informations.update(WIZARD) + return text[:index].strip(), informations + def loadModuleInfos(path): """ Return the module configurations found in the given path as a dict with the name as key @@ -124,9 +136,11 @@ def loadModuleInfos(path): for definition in findDefinitions(const.MODULE_CONFIGURATION, path): moduleName = definition[0].replace("cfg_", "").replace(".h", "") moduleInfos[moduleName] = {} - for description, define in getDefinitionBlocks(open(definition[1] + "/" + definition[0], "r").read()): + for comment, define in getDefinitionBlocks(open(definition[1] + "/" + definition[0], "r").read()): name, value = formatModuleNameValue(define) + description, informations = getDescriptionInformations(comment) moduleInfos[moduleName][name] = {} moduleInfos[moduleName][name]["value"] = value + moduleInfos[moduleName][name]["informations"] = informations moduleInfos[moduleName][name]["description"] = description return moduleInfos -- 2.25.1