X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=wizard%2Fbertos_utils.py;h=7e16c1bf11aede8741bc3005fe736cd6bac3c1b9;hb=1fe604ce663530130833c05d65dbcf7fec9d2ebe;hp=3854f9f269682ff7c6c02ca0f5f8838b2c9228ff;hpb=ad42262ffafdf46844bfbea6573691d2200600c2;p=bertos.git diff --git a/wizard/bertos_utils.py b/wizard/bertos_utils.py index 3854f9f2..7e16c1bf 100644 --- a/wizard/bertos_utils.py +++ b/wizard/bertos_utils.py @@ -133,16 +133,22 @@ def getToolchainInfo(output): info["thread"] = thread[0].split("Thread model: ")[1] return info -def findDefinitions(ftype, path): - L = os.walk(path) +def loadSourceTree(project): + fileList = [f for f in os.walk(project.info("SOURCES_PATH"))] + project.setInfo("FILE_LIST", fileList) + +def findDefinitions(ftype, project): + L = project.info("FILE_LIST") + definitions = [] for element in L: for filename in element[2]: if fnmatch.fnmatch(filename, ftype): - yield (filename, element[0]) + definitions.append((filename, element[0])) + return definitions -def loadCpuInfos(path): +def loadCpuInfos(project): cpuInfos = [] - for definition in findDefinitions(const.CPU_DEFINITION, path): + for definition in findDefinitions(const.CPU_DEFINITION, project): cpuInfos.append(getInfos(definition)) return cpuInfos @@ -158,6 +164,23 @@ def getInfos(definition): del D["include"] return D +def loadModuleData(project): + moduleInfosDict = {} + listInfosDict = {} + configurationsInfoDict = {} + for filename, path in findDefinitions("*.h", project): + moduleInfos, listInfos, configurationInfos= loadModuleInfos(path + "/" + filename) + moduleInfosDict.update(moduleInfos) + listInfosDict.update(listInfos) + for configuration in configurationInfos.keys(): + configurationsInfoDict[configuration] = loadConfigurationInfos(project.info("SOURCES_PATH") + "/" + configuration) + print "*_" + project.info("CPU_INFOS")["TOOLCHAIN"] + ".h" + for filename, path in findDefinitions("*_" + project.info("CPU_INFOS")["TOOLCHAIN"] + ".h", project): + listInfosDict.update(loadDefineLists(path + "/" + filename)) + project.setInfo("MODULES", moduleInfosDict) + project.setInfo("LISTS", listInfosDict) + project.setInfo("CONFIGURATIONS", configurationsInfoDict) + def getDefinitionBlocks(text): """ Take a text and return a list of tuple (description, name-value). @@ -212,16 +235,32 @@ def loadConfigurationInfos(path): configurationInfos[name] = {} configurationInfos[name]["value"] = value configurationInfos[name]["informations"] = informations - if configurationInfos[name]["informations"]["type"] == "int" and configurationInfos[name]["value"].find("L") != -1: + if ("type" in configurationInfos[name]["informations"].keys() and + configurationInfos[name]["informations"]["type"] == "int" and + configurationInfos[name]["value"].find("L") != -1): configurationInfos[name]["informations"]["long"] = True configurationInfos[name]["value"] = configurationInfos[name]["value"].replace("L", "") - if configurationInfos[name]["informations"]["type"] == "int" and configurationInfos[name]["value"].find("U") != -1: + if ("type" in configurationInfos[name]["informations"].keys() and + configurationInfos[name]["informations"]["type"] == "int" and + configurationInfos[name]["value"].find("U") != -1): configurationInfos[name]["informations"]["unsigned"] = True configurationInfos[name]["value"] = configurationInfos[name]["value"].replace("U", "") configurationInfos[name]["description"] = description return configurationInfos except SyntaxError: - raise DefineException.ConfigurationDefineException(path) + raise DefineException.ConfigurationDefineException(path, name) + +def loadConfigurationInfosDict(project): + """ + Store in the project the configuration infos as a dict. + """ + modules = project.info("MODULES") + configurations = {} + for module, informations in modules.items(): + if len(informations["configuration"]) > 0: + configurations[informations["configuration"]] = loadConfigurationInfos(project.info("SOURCES_PATH") + + "/" + informations["configuration"]) + project.setInfo("CONFIGURATIONS", configurations) def loadModuleInfos(path): """ @@ -236,30 +275,43 @@ def loadModuleInfos(path): """ try: moduleInfos = {} + listInfos = {} + configurationsInfos = {} string = open(path, "r").read() commentList = re.findall(r"/\*{2}\s*([^*]*\*(?:[^/*][^*]*\*+)*)/", string) commentList = [" ".join(re.findall(r"^\s*\*?\s*(.*?)\s*?(?:/{2}.*?)?$", comment, re.MULTILINE)).strip() for comment in commentList] - for comment in commentList: - index = comment.find("$WIZARD_MODULE") - if index != -1: - exec(comment[index + 1:]) - moduleInfos[WIZARD_MODULE["name"]] = {"depends": WIZARD_MODULE["depends"], - "configuration": WIZARD_MODULE["configuration"], - "description": "", - "enabled": False} - return moduleInfos - return {} + if len(commentList) > 0: + comment = commentList[0] + if comment.find("$WIZARD_MODULE") != -1: + index = comment.find("$WIZARD_MODULE") + if index != -1: + # 14 is the length of "$WIZARD_MODULE" + if len(comment[index + 14:].strip()) > 0: + exec(comment[index + 1:]) + moduleInfos[WIZARD_MODULE["name"]] = {"depends": WIZARD_MODULE["depends"], + "configuration": WIZARD_MODULE["configuration"], + "description": "", + "enabled": False} + index = comment.find("\\brief") + if index != -1: + description = comment[index + 7:] + description = description[:description.find(" * ")] + moduleInfos[WIZARD_MODULE["name"]]["description"] = description + if "configuration" in WIZARD_MODULE.keys() and len(WIZARD_MODULE["configuration"]) > 0: + configurationsInfos[WIZARD_MODULE["configuration"]] = {} + listInfos.update(loadDefineLists(path)) + return moduleInfos, listInfos, configurationsInfos except SyntaxError: raise DefineException.ModuleDefineException(path) -def loadModuleInfosDict(path): +def loadModuleInfosDict(project): """ - Return the dict containig all the modules + Store in the project the dict containig all the modules """ moduleInfosDict = {} - for filename, path in findDefinitions("*.h", path): + for filename, path in findDefinitions("*.h", project): moduleInfosDict.update(loadModuleInfos(path + "/" + filename)) - return moduleInfosDict + project.setInfo("MODULES", moduleInfosDict) def loadDefineLists(path): """ @@ -279,14 +331,17 @@ def loadDefineLists(path): except SyntaxError: raise DefineException.EnumDefineException(path) -def loadDefineListsDict(path): +def loadDefineListsDict(project): """ - Return the dict containing all the define lists + Store in the project the dict containing all the define lists """ defineListsDict = {} - for filename, path in findDefinitions("*.h", path): + for filename, path in findDefinitions("*.h", project): defineListsDict.update(loadDefineLists(path + "/" + filename)) - return defineListsDict + lists = project.info("LISTS") + if lists is not None: + defineListsDict.update(lists) + project.setInfo("LISTS", defineListsDict) def sub(string, parameter, value): """ @@ -294,38 +349,38 @@ def sub(string, parameter, value): """ return re.sub(r"(?P#define\s+" + parameter + r"\s+)([^\s]+)", r"\g" + value, string) -def isInt(value): +def isInt(informations): """ Return True if the value is a simple int. """ - if "long" not in value["informations"].keys() and "unsigned" not in value["informations"].keys(): + if ("long" not in informatios.keys() or not informations["long"]) and ("unsigned" not in informations.keys() or informations["unsigned"]): return True else: return False -def isLong(value): +def isLong(informations): """ Return True if the value is a long. """ - if "long" in value["informations"].keys() and value["informations"]["long"] and "unsigned" not in value["informations"].keys(): + if "long" in informations.keys() and informations["long"] and "unsigned" not in informations.keys(): return True else: return False -def isUnsigned(value): +def isUnsigned(informations): """ Return True if the value is an unsigned. """ - if "unsigned" in value["informations"].keys() and value["informations"]["unsigned"] and "long" not in value["informations"].keys(): + if "unsigned" in informations.keys() and informations["unsigned"] and "long" not in informations.keys(): return True else: return False -def isUnsignedLong(value): +def isUnsignedLong(informations): """ Return True if the value is an unsigned long. """ - if "unsigned" in value["informations"].keys() and "long" in value["informations"].keys() and value["informations"]["unsigned"] and value["informations"]["long"]: + if "unsigned" in informations.keys() and "long" in informations.keys() and informations["unsigned"] and informations["long"]: return True else: return False \ No newline at end of file