X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=wizard%2Fbertos_utils.py;h=5d08f54db01d1ebbadf9cf9d0cbd160572a5d7c8;hb=3001f6f9ca19a6dd354cb1f82425253484c5468b;hp=b872cf1501986baacbdd101199241a1b712d2cfc;hpb=5caada91ff327558e599950dcf058d516ed88cb7;p=bertos.git diff --git a/wizard/bertos_utils.py b/wizard/bertos_utils.py index b872cf15..5d08f54d 100644 --- a/wizard/bertos_utils.py +++ b/wizard/bertos_utils.py @@ -4,7 +4,7 @@ # Copyright 2008 Develer S.r.l. (http://www.develer.com/) # All rights reserved. # -# $Id:$ +# $Id$ # # Author: Lorenzo Berni # @@ -14,9 +14,12 @@ import fnmatch import glob import re import shutil +# Use custom copytree function +import copytree +import pickle import const -import codelite_project +import plugins import DefineException def isBertosDir(directory): @@ -25,140 +28,218 @@ def isBertosDir(directory): def bertosVersion(directory): return open(directory + "/VERSION").readline().strip() -def createBertosProject(projectInfo): - directory = projectInfo.info("PROJECT_PATH") - sourcesDir = projectInfo.info("SOURCES_PATH") +def createBertosProject(project_info): + directory = project_info.info("PROJECT_PATH") + sources_dir = project_info.info("SOURCES_PATH") if not os.path.isdir(directory): os.mkdir(directory) f = open(directory + "/project.bertos", "w") - f.write(repr(projectInfo)) + f.write(pickle.dumps(project_info)) f.close() - ## Destination source dir + # Destination source dir srcdir = directory + "/bertos" shutil.rmtree(srcdir, True) - shutil.copytree(sourcesDir + "/bertos", srcdir) - ## Destination makefile + copytree.copytree(sources_dir + "/bertos", srcdir, ignore_list=const.IGNORE_LIST) + # Destination makefile makefile = directory + "/Makefile" if os.path.exists(makefile): os.remove(makefile) makefile = open("mktemplates/Makefile").read() - makefile = makefileGenerator(projectInfo, makefile) + makefile = makefileGenerator(project_info, makefile) open(directory + "/Makefile", "w").write(makefile) - ## Destination project dir + # Destination project dir prjdir = directory + "/" + os.path.basename(directory) shutil.rmtree(prjdir, True) os.mkdir(prjdir) - ## Destination configurations files + # Destination hw files + hwdir = prjdir + "/hw" + shutil.rmtree(hwdir, True) + os.mkdir(hwdir) + # Copy all the hw files + for module, information in project_info.info("MODULES").items(): + for hwfile in information["hw"]: + string = open(sources_dir + "/" + hwfile, "r").read() + open(hwdir + "/" + os.path.basename(hwfile), "w").write(string) + # Destination configurations files cfgdir = prjdir + "/cfg" shutil.rmtree(cfgdir, True) os.mkdir(cfgdir) - for key, value in projectInfo.info("CONFIGURATIONS").items(): - string = open(sourcesDir + "/" + key, "r").read() - for parameter, infos in value.items(): + # Set to 1 the autoenabled for enabled modules + for module, information in project_info.info("MODULES").items(): + if information["enabled"] and "configuration" in information and information["configuration"] != "": + configurations = project_info.info("CONFIGURATIONS") + configuration = configurations[information["configuration"]] + for start, parameter in configuration["paramlist"]: + if "type" in configuration[parameter] and configuration[parameter]["type"] == "autoenabled": + configuration[parameter]["value"] = "1" + project_info.setInfo("CONFIGURATIONS", configurations) + # Copy all the configuration files + for configuration, information in project_info.info("CONFIGURATIONS").items(): + string = open(sources_dir + "/" + configuration, "r").read() + for start, parameter in information["paramlist"]: + infos = information[parameter] value = infos["value"] - if "unsigned" in infos["informations"].keys() and infos["informations"]["unsigned"]: + if "unsigned" in infos["informations"] and infos["informations"]["unsigned"]: value += "U" - if "long" in infos["informations"].keys() and infos["informations"]["long"]: + if "long" in infos["informations"] and infos["informations"]["long"]: value += "L" string = sub(string, parameter, value) - f = open(cfgdir + "/" + os.path.basename(key), "w") + f = open(cfgdir + "/" + os.path.basename(configuration), "w") f.write(string) f.close() - ## Destinatio mk file + # Destinatio mk file makefile = open("mktemplates/template.mk", "r").read() - makefile = mkGenerator(projectInfo, makefile) + makefile = mkGenerator(project_info, makefile) open(prjdir + "/" + os.path.basename(prjdir) + ".mk", "w").write(makefile) - ## Destination main.c file + # Destination main.c file main = open("srctemplates/main.c", "r").read() open(prjdir + "/main.c", "w").write(main) - if "codelite" in projectInfo.info("OUTPUT"): - workspace = codeliteWorkspaceGenerator(projectInfo) - open(directory + "/" + os.path.basename(prjdir) + ".workspace", "w").write(workspace) - project = codeliteProjectGenerator(projectInfo) - open(directory + "/" + os.path.basename(prjdir) + ".project", "w").write(project) + # Files for selected plugins + for plugin in project_info.info("OUTPUT"): + module = getattr(__import__("plugins", {}, {}, [plugin]), plugin) + module.createProject(project_info) -def mkGenerator(projectInfo, makefile): +def mkGenerator(project_info, makefile): """ Generates the mk file for the current project. """ - mkData = {} - mkData["$pname"] = os.path.basename(projectInfo.info("PROJECT_PATH")) - mkData["$cpuname"] = projectInfo.info("CPU_INFOS")["CORE_CPU"] - mkData["$cflags"] = " ".join(projectInfo.info("CPU_INFOS")["C_FLAGS"]) - mkData["$ldflags"] = " ".join(projectInfo.info("CPU_INFOS")["LD_FLAGS"]) - mkData["$csrc"], mkData["$pcsrc"], mkData["$constants"] = csrcGenerator(projectInfo) - mkData["$prefix"] = projectInfo.info("TOOLCHAIN")["path"].split("gcc")[0] - mkData["$suffix"] = projectInfo.info("TOOLCHAIN")["path"].split("gcc")[1] - mkData["$cross"] = projectInfo.info("TOOLCHAIN")["path"].split("gcc")[0] - mkData["$main"] = projectInfo.info("PROJECT_PATH") + "/" + os.path.basename(projectInfo.info("PROJECT_PATH")) + "/main.c" - for key in mkData: + mk_data = {} + mk_data["$pname"] = os.path.basename(project_info.info("PROJECT_PATH")) + mk_data["$cpuflag"] = project_info.info("CPU_INFOS")["CPU_FLAG_NAME"] + mk_data["$cpuname"] = project_info.info("CPU_INFOS")["CORE_CPU"] + mk_data["$cpuclockfreq"] = project_info.info("SELECTED_FREQ") + mk_data["$cflags"] = " ".join(project_info.info("CPU_INFOS")["C_FLAGS"]) + mk_data["$ldflags"] = " ".join(project_info.info("CPU_INFOS")["LD_FLAGS"]) + mk_data["$cppflags"] = " ".join(project_info.info("CPU_INFOS")["CPP_FLAGS"]) + mk_data["$cppaflags"] = " ".join(project_info.info("CPU_INFOS")["CPPA_FLAGS"]) + mk_data["$cxxflags"] = " ".join(project_info.info("CPU_INFOS")["CXX_FLAGS"]) + mk_data["$asflags"] = " ".join(project_info.info("CPU_INFOS")["AS_FLAGS"]) + mk_data["$arflags"] = " ".join(project_info.info("CPU_INFOS")["AR_FLAGS"]) + mk_data["$csrc"], mk_data["$pcsrc"], mk_data["$cppasrc"], mk_data["$cxxsrc"], mk_data["$asrc"], mk_data["$constants"] = csrcGenerator(project_info) + mk_data["$prefix"] = replaceSeparators(project_info.info("TOOLCHAIN")["path"].split("gcc")[0]) + mk_data["$suffix"] = replaceSeparators(project_info.info("TOOLCHAIN")["path"].split("gcc")[1]) + mk_data["$main"] = os.path.basename(project_info.info("PROJECT_PATH")) + "/main.c" + for key in mk_data: while makefile.find(key) != -1: - makefile = makefile.replace(key, mkData[key]) + makefile = makefile.replace(key, mk_data[key]) return makefile -def makefileGenerator(projectInfo, makefile): +def makefileGenerator(project_info, makefile): """ Generate the Makefile for the current project. """ - # TODO: write a general function that works for both the mk file and the Makefile + # TODO write a general function that works for both the mk file and the Makefile while makefile.find("project_name") != -1: - makefile = makefile.replace("project_name", os.path.basename(projectInfo.info("PROJECT_PATH"))) + makefile = makefile.replace("project_name", os.path.basename(project_info.info("PROJECT_PATH"))) return makefile -def csrcGenerator(projectInfo): - modules = projectInfo.info("MODULES") - if "harvard" in projectInfo.info("CPU_INFOS")["CPU_TAGS"]: +def csrcGenerator(project_info): + modules = project_info.info("MODULES") + files = project_info.info("FILES") + if "harvard" in project_info.info("CPU_INFOS")["CPU_TAGS"]: harvard = True else: harvard = False + # file to be included in CSRC variable csrc = [] + # file to be included in PCSRC variable pcsrc = [] + # files to be included in CPPASRC variable + cppasrc = [] + # files to be included in CXXSRC variable + cxxsrc = [] + # files to be included in ASRC variable + asrc = [] + # constants to be included at the beginning of the makefile constants = {} for module, information in modules.items(): + module_files = set([]) + dependency_files = set([]) + # assembly sources + asm_files = set([]) + hwdir = os.path.basename(project_info.info("PROJECT_PATH")) + "/hw" if information["enabled"]: if "constants" in information: constants.update(information["constants"]) - for filename, path in findDefinitions(module + ".c", projectInfo): - path = path.replace(projectInfo.info("SOURCES_PATH"), projectInfo.info("PROJECT_PATH")) - if not harvard or "harvard" not in information or information["harvard"] == "both": - csrc.append(path + "/" + filename) + cfiles, sfiles = findModuleFiles(module, project_info) + module_files |= set(cfiles) + asm_files |= set(sfiles) + for file in information["hw"]: + if file.endswith(".c"): + module_files |= set([hwdir + "/" + os.path.basename(file)]) + for file_dependency in information["depends"]: + if file_dependency in files: + dependencyCFiles, dependencySFiles = findModuleFiles(file_dependency, project_info) + dependency_files |= set(dependencyCFiles) + asm_files |= set(dependencySFiles) + for file in module_files: + if not harvard or information.get("harvard", "both") == "both": + csrc.append(file) if harvard and "harvard" in information: - pcsrc.append(path + "/" + filename) - for filename, path in findDefinitions(module + "_" + projectInfo.info("CPU_INFOS")["TOOLCHAIN"] + ".c", projectInfo): - path = path.replace(projectInfo.info("SOURCES_PATH"), projectInfo.info("PROJECT_PATH")) - if not harvard or "harvard" not in information or information["harvard"] == "both": - csrc.append(path + "/" + filename) - if harvard and "harvard" in information: - pcsrc.append(path + "/" + filename) - for tag in projectInfo.info("CPU_INFOS")["CPU_TAGS"]: - for filename, path in findDefinitions(module + "_" + tag + ".c", projectInfo): - path = path.replace(projectInfo.info("SOURCES_PATH"), projectInfo.info("PROJECT_PATH")) - if not harvard or "harvard" not in information or information["harvard"] == "both": - csrc.append(path + "/" + filename) - if harvard and "harvard" in information: - pcsrc.append(path + "/" + filename) + pcsrc.append(file) + for file in dependency_files: + csrc.append(file) + for file in project_info.info("CPU_INFOS")["C_SRC"]: + csrc.append(file) + for file in project_info.info("CPU_INFOS")["PC_SRC"]: + pcsrc.append(file) + for file in asm_files: + cppasrc.append(file) + for file in project_info.info("CPU_INFOS")["CPPA_SRC"]: + cppasrc.append(file) + for file in project_info.info("CPU_INFOS")["CXX_SRC"]: + cxxsrc.append(file) + for file in project_info.info("CPU_INFOS")["ASRC"]: + asrc.append(file) csrc = " \\\n\t".join(csrc) + " \\" pcsrc = " \\\n\t".join(pcsrc) + " \\" - constants = "\n".join([os.path.basename(projectInfo.info("PROJECT_PATH")) + "_" + key + " = " + str(value) for key, value in constants.items()]) - return csrc, pcsrc, constants - -def codeliteProjectGenerator(projectInfo): - template = open("cltemplates/bertos.project").read() - filelist = "\n".join(codelite_project.clFiles(codelite_project.findSources(projectInfo.info("PROJECT_PATH")), projectInfo.info("PROJECT_PATH"))) - while template.find("$filelist") != -1: - template = template.replace("$filelist", filelist) - projectName = os.path.basename(projectInfo.info("PROJECT_PATH")) - while template.find("$project") != -1: - template = template.replace("$project", projectName) - return template - -def codeliteWorkspaceGenerator(projectInfo): - template = open("cltemplates/bertos.workspace").read() - projectName = os.path.basename(projectInfo.info("PROJECT_PATH")) - while template.find("$project") != -1: - template = template.replace("$project", projectName) - return template - + cppasrc = " \\\n\t".join(cppasrc) + " \\" + cxxsrc = " \\\n\t".join(cxxsrc) + " \\" + asrc = " \\\n\t".join(asrc) + " \\" + constants = "\n".join([os.path.basename(project_info.info("PROJECT_PATH")) + "_" + key + " = " + str(value) for key, value in constants.items()]) + return csrc, pcsrc, cppasrc, cxxsrc, asrc, constants + +def findModuleFiles(module, project_info): + # Find the files related to the selected module + cfiles = [] + sfiles = [] + # .c files related to the module and the cpu architecture + for filename, path in findDefinitions(module + ".c", project_info) + \ + findDefinitions(module + "_" + project_info.info("CPU_INFOS")["TOOLCHAIN"] + ".c", project_info): + path = path.replace(project_info.info("SOURCES_PATH") + os.sep, "") + path = replaceSeparators(path) + cfiles.append(path + "/" + filename) + # .s files related to the module and the cpu architecture + for filename, path in findDefinitions(module + ".s", project_info) + \ + findDefinitions(module + "_" + project_info.info("CPU_INFOS")["TOOLCHAIN"] + ".s", project_info) + \ + findDefinitions(module + ".S", project_info) + \ + findDefinitions(module + "_" + project_info.info("CPU_INFOS")["TOOLCHAIN"] + ".S", project_info): + path = path.replace(project_info.info("SOURCES_PATH") + os.sep, "") + path = replaceSeparators(path) + sfiles.append(path + "/" + filename) + # .c and .s files related to the module and the cpu tags + for tag in project_info.info("CPU_INFOS")["CPU_TAGS"]: + for filename, path in findDefinitions(module + "_" + tag + ".c", project_info): + path = path.replace(project_info.info("SOURCES_PATH") + os.sep, "") + if os.sep != "/": + path = replaceSeparators(path) + cfiles.append(path + "/" + filename) + for filename, path in findDefinitions(module + "_" + tag + ".s", project_info) + \ + findDefinitions(module + "_" + tag + ".S", project_info): + path = path.replace(project_info.info("SOURCES_PATH") + os.sep, "") + path = replaceSeparators(path) + sfiles.append(path + "/" + filename) + return cfiles, sfiles + +def replaceSeparators(path): + """ + Replace the separators in the given path with unix standard separator. + """ + if os.sep != "/": + while path.find(os.sep) != -1: + path = path.replace(os.sep, "/") + return path + def getSystemPath(): path = os.environ["PATH"] if os.name == "nt": @@ -167,9 +248,9 @@ def getSystemPath(): path = path.split(":") return path -def findToolchains(pathList): +def findToolchains(path_list): toolchains = [] - for element in pathList: + for element in path_list: for toolchain in glob.glob(element+ "/" + const.GCC_NAME): toolchains.append(toolchain) return list(set(toolchains)) @@ -219,6 +300,16 @@ def loadCpuInfos(project): cpuInfos.append(getInfos(definition)) return cpuInfos +def getTagSet(cpu_info): + tag_set = set([]) + for cpu in cpu_info: + tag_set |= set([cpu["CPU_NAME"]]) + tag_set |= set(cpu["CPU_TAGS"]) + tag_set |= set([cpu["CORE_CPU"]]) + tag_set |= set([cpu["TOOLCHAIN"]]) + return tag_set + + def getInfos(definition): D = {} D.update(const.CPU_DEF) @@ -232,71 +323,101 @@ def getInfos(definition): return D def getCommentList(string): - commentList = re.findall(r"/\*{2}\s*([^*]*\*(?:[^/*][^*]*\*+)*)/", string) - commentList = [re.findall(r"^\s*\* *(.*?)$", comment, re.MULTILINE) for comment in commentList] - return commentList + comment_list = re.findall(r"/\*{2}\s*([^*]*\*(?:[^/*][^*]*\*+)*)/", string) + comment_list = [re.findall(r"^\s*\* *(.*?)$", comment, re.MULTILINE) for comment in comment_list] + return comment_list def loadModuleDefinition(first_comment): - toBeParsed = False - moduleDefinition = {} + to_be_parsed = False + module_definition = {} for num, line in enumerate(first_comment): index = line.find("$WIZ$") if index != -1: - toBeParsed = True + to_be_parsed = True try: - exec line[index + len("$WIZ$ "):] in {}, moduleDefinition + exec line[index + len("$WIZ$ "):] in {}, module_definition except: raise ParseError(num, line[index:]) elif line.find("\\brief") != -1: - moduleDefinition["module_description"] = line[line.find("\\brief") + len("\\brief "):] - moduleDict = {} - if "module_name" in moduleDefinition.keys(): - moduleName = moduleDefinition[const.MODULE_DEFINITION["module_name"]] - del moduleDefinition[const.MODULE_DEFINITION["module_name"]] - moduleDict[moduleName] = {} - if const.MODULE_DEFINITION["module_depends"] in moduleDefinition.keys(): - if type(moduleDefinition[const.MODULE_DEFINITION["module_depends"]]) == str: - moduleDefinition[const.MODULE_DEFINITION["module_depends"]] = (moduleDefinition[const.MODULE_DEFINITION["module_depends"]],) - moduleDict[moduleName]["depends"] = moduleDefinition[const.MODULE_DEFINITION["module_depends"]] - del moduleDefinition[const.MODULE_DEFINITION["module_depends"]] + module_definition["module_description"] = line[line.find("\\brief") + len("\\brief "):] + module_dict = {} + if "module_name" in module_definition: + module_name = module_definition[const.MODULE_DEFINITION["module_name"]] + del module_definition[const.MODULE_DEFINITION["module_name"]] + module_dict[module_name] = {} + if const.MODULE_DEFINITION["module_depends"] in module_definition: + depends = module_definition[const.MODULE_DEFINITION["module_depends"]] + del module_definition[const.MODULE_DEFINITION["module_depends"]] + if type(depends) == str: + depends = (depends,) + module_dict[module_name]["depends"] = depends else: - moduleDict[moduleName]["depends"] = () - if const.MODULE_DEFINITION["module_configuration"] in moduleDefinition.keys(): - moduleDict[moduleName]["configuration"] = moduleDefinition[const.MODULE_DEFINITION["module_configuration"]] - del moduleDefinition[const.MODULE_DEFINITION["module_configuration"]] + module_dict[module_name]["depends"] = () + if const.MODULE_DEFINITION["module_configuration"] in module_definition: + module_dict[module_name]["configuration"] = module_definition[const.MODULE_DEFINITION["module_configuration"]] + del module_definition[const.MODULE_DEFINITION["module_configuration"]] else: - moduleDict[moduleName]["configuration"] = "" - if "module_description" in moduleDefinition.keys(): - moduleDict[moduleName]["description"] = moduleDefinition["module_description"] - del moduleDefinition["module_description"] - if const.MODULE_DEFINITION["module_harvard"] in moduleDefinition.keys(): - harvard = moduleDefinition[const.MODULE_DEFINITION["module_harvard"]] + module_dict[module_name]["configuration"] = "" + if "module_description" in module_definition: + module_dict[module_name]["description"] = module_definition["module_description"] + del module_definition["module_description"] + if const.MODULE_DEFINITION["module_harvard"] in module_definition: + harvard = module_definition[const.MODULE_DEFINITION["module_harvard"]] if harvard == "both" or harvard == "pgm_memory": - moduleDict[moduleName]["harvard"] = harvard - del moduleDefinition[const.MODULE_DEFINITION["module_harvard"]] - moduleDict[moduleName]["constants"] = moduleDefinition - moduleDict[moduleName]["enabled"] = False - return toBeParsed, moduleDict - -def loadDefineLists(commentList): - defineList = {} - for comment in commentList: + module_dict[module_name]["harvard"] = harvard + del module_definition[const.MODULE_DEFINITION["module_harvard"]] + if const.MODULE_DEFINITION["module_hw"] in module_definition: + hw = module_definition[const.MODULE_DEFINITION["module_hw"]] + del module_definition[const.MODULE_DEFINITION["module_hw"]] + if type(hw) == str: + hw = (hw, ) + module_dict[module_name]["hw"] = hw + else: + module_dict[module_name]["hw"] = () + if const.MODULE_DEFINITION["module_supports"] in module_definition: + supports = module_definition[const.MODULE_DEFINITION["module_supports"]] + del module_definition[const.MODULE_DEFINITION["module_supports"]] + module_dict[module_name]["supports"] = supports + module_dict[module_name]["constants"] = module_definition + module_dict[module_name]["enabled"] = False + return to_be_parsed, module_dict + +def isSupported(project, module=None, property_id=None): + if not module and property_id: + item = project.info("CONFIGURATIONS")[property_id[0]][property_id[1]]["informations"] + else: + item = project.info("MODULES")[module] + tag_dict = project.info("ALL_CPU_TAGS") + if "supports" in item: + support_string = item["supports"] + supported = {} + try: + exec "supported = " + support_string in tag_dict, supported + except: + raise SupportedException(support_string) + return supported["supported"] + else: + return True + +def loadDefineLists(comment_list): + define_list = {} + for comment in comment_list: for num, line in enumerate(comment): index = line.find("$WIZ$") if index != -1: try: - exec line[index + len("$WIZ$ "):] in {}, defineList + exec line[index + len("$WIZ$ "):] in {}, define_list except: raise ParseError(num, line[index:]) - for key, value in defineList.items(): + for key, value in define_list.items(): if type(value) == str: - defineList[key] = (value,) - return defineList + define_list[key] = (value,) + return define_list -def getDescriptionInformations(comment): - """ - Take the doxygen comment and strip the wizard informations, returning the tuple - (comment, wizard_information) +def getDescriptionInformations(comment): + """ + Take the doxygen comment and strip the wizard informations, returning the tuple + (comment, wizard_information) """ brief = "" description = "" @@ -325,56 +446,70 @@ def getDefinitionBlocks(text): Take a text and return a list of tuple (description, name-value). """ block = [] - block_tmp = re.findall(r"/\*{2}\s*([^*]*\*(?:[^/*][^*]*\*+)*)/\s*#define\s+((?:[^/]*?/?)+)\s*?(?:/{2,3}[^<].*?)?$", text, re.MULTILINE) - for comment, define in block_tmp: + block_tmp = re.finditer(r"/\*{2}\s*([^*]*\*(?:[^/*][^*]*\*+)*)/\s*#define\s+((?:[^/]*?/?)+)\s*?(?:/{2,3}[^<].*?)?$", text, re.MULTILINE) + for match in block_tmp: # Only the first element is needed - block.append(([re.findall(r"^\s*\* *(.*?)$", line, re.MULTILINE)[0] for line in comment.splitlines()], define)) - for comment, define in re.findall(r"/{3}\s*([^<].*?)\s*#define\s+((?:[^/]*?/?)+)\s*?(?:/{2,3}[^<].*?)?$", text, re.MULTILINE): - block.append(([comment], define)) - for define, comment in re.findall(r"#define\s*(.*?)\s*/{3}<\s*(.+?)\s*?(?:/{2,3}[^<].*?)?$", text, re.MULTILINE): - block.append(([comment], define)) + comment = match.group(1) + define = match.group(2) + start = match.start() + block.append(([re.findall(r"^\s*\* *(.*?)$", line, re.MULTILINE)[0] for line in comment.splitlines()], define, start)) + for match in re.finditer(r"/{3}\s*([^<].*?)\s*#define\s+((?:[^/]*?/?)+)\s*?(?:/{2,3}[^<].*?)?$", text, re.MULTILINE): + comment = match.group(1) + define = match.group(2) + start = match.start() + block.append(([comment], define, start)) + for match in re.finditer(r"#define\s*(.*?)\s*/{3}<\s*(.+?)\s*?(?:/{2,3}[^<].*?)?$", text, re.MULTILINE): + comment = match.group(2) + define = match.group(1) + start = match.start() + block.append(([comment], define, start)) return block def loadModuleData(project): - moduleInfoDict = {} - listInfoDict = {} - configurationInfoDict = {} - for filename, path in findDefinitions("*.h", project): - commentList = getCommentList(open(path + "/" + filename, "r").read()) - if len(commentList) > 0: - moduleInfo = {} - configurationInfo = {} + module_info_dict = {} + list_info_dict = {} + configuration_info_dict = {} + file_dict = {} + for filename, path in findDefinitions("*.h", project) + findDefinitions("*.c", project) + findDefinitions("*.s", project) + findDefinitions("*.S", project): + comment_list = getCommentList(open(path + "/" + filename, "r").read()) + if len(comment_list) > 0: + module_info = {} + configuration_info = {} try: - toBeParsed, moduleDict = loadModuleDefinition(commentList[0]) + to_be_parsed, module_dict = loadModuleDefinition(comment_list[0]) except ParseError, err: raise DefineException.ModuleDefineException(path, err.line_number, err.line) - for module, information in moduleDict.items(): + for module, information in module_dict.items(): + if "depends" not in information: + information["depends"] = () + information["depends"] += (filename.split(".")[0],) information["category"] = os.path.basename(path) - if "configuration" in information.keys() and len(information["configuration"]): - configuration = moduleDict[module]["configuration"] + if "configuration" in information and len(information["configuration"]): + configuration = module_dict[module]["configuration"] try: - configurationInfo[configuration] = loadConfigurationInfos(project.info("SOURCES_PATH") + "/" + configuration) + configuration_info[configuration] = loadConfigurationInfos(project.info("SOURCES_PATH") + "/" + configuration) except ParseError, err: raise DefineException.ConfigurationDefineException(project.info("SOURCES_PATH") + "/" + configuration, err.line_number, err.line) - moduleInfoDict.update(moduleDict) - configurationInfoDict.update(configurationInfo) - if toBeParsed: + module_info_dict.update(module_dict) + configuration_info_dict.update(configuration_info) + if to_be_parsed: try: - listDict = loadDefineLists(commentList[1:]) - listInfoDict.update(listDict) + list_dict = loadDefineLists(comment_list[1:]) + list_info_dict.update(list_dict) except ParseError, err: raise DefineException.EnumDefineException(path, err.line_number, err.line) for filename, path in findDefinitions("*_" + project.info("CPU_INFOS")["TOOLCHAIN"] + ".h", project): - commentList = getCommentList(open(path + "/" + filename, "r").read()) - listInfoDict.update(loadDefineLists(commentList)) + comment_list = getCommentList(open(path + "/" + filename, "r").read()) + list_info_dict.update(loadDefineLists(comment_list)) for tag in project.info("CPU_INFOS")["CPU_TAGS"]: for filename, path in findDefinitions("*_" + tag + ".h", project): - commentList = getCommentList(open(path + "/" + filename, "r").read()) - listInfoDict.update(loadDefineLists(commentList)) - project.setInfo("MODULES", moduleInfoDict) - project.setInfo("LISTS", listInfoDict) - project.setInfo("CONFIGURATIONS", configurationInfoDict) - + comment_list = getCommentList(open(path + "/" + filename, "r").read()) + list_info_dict.update(loadDefineLists(comment_list)) + project.setInfo("MODULES", module_info_dict) + project.setInfo("LISTS", list_info_dict) + project.setInfo("CONFIGURATIONS", configuration_info_dict) + project.setInfo("FILES", file_dict) + def formatParamNameValue(text): """ Take the given string and return a tuple with the name of the parameter in the first position @@ -394,28 +529,39 @@ def loadConfigurationInfos(path): "min": the minimum value for integer parameters "max": the maximum value for integer parameters "long": boolean indicating if the num is a long + "unsigned": boolean indicating if the num is an unsigned "value_list": the name of the enum for enum parameters """ - configurationInfos = {} - for comment, define in getDefinitionBlocks(open(path, "r").read()): + configuration_infos = {} + configuration_infos["paramlist"] = [] + for comment, define, start in getDefinitionBlocks(open(path, "r").read()): name, value = formatParamNameValue(define) brief, description, informations = getDescriptionInformations(comment) - configurationInfos[name] = {} - configurationInfos[name]["value"] = value - configurationInfos[name]["informations"] = informations - 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 ("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 - configurationInfos[name]["brief"] = brief - return configurationInfos + configuration_infos["paramlist"].append((start, name)) + configuration_infos[name] = {} + configuration_infos[name]["value"] = value + configuration_infos[name]["informations"] = informations + if not "type" in configuration_infos[name]["informations"]: + configuration_infos[name]["informations"]["type"] = findParameterType(configuration_infos[name]) + if ("type" in configuration_infos[name]["informations"] and + configuration_infos[name]["informations"]["type"] == "int" and + configuration_infos[name]["value"].find("L") != -1): + configuration_infos[name]["informations"]["long"] = True + configuration_infos[name]["value"] = configuration_infos[name]["value"].replace("L", "") + if ("type" in configuration_infos[name]["informations"] and + configuration_infos[name]["informations"]["type"] == "int" and + configuration_infos[name]["value"].find("U") != -1): + configuration_infos[name]["informations"]["unsigned"] = True + configuration_infos[name]["value"] = configuration_infos[name]["value"].replace("U", "") + configuration_infos[name]["description"] = description + configuration_infos[name]["brief"] = brief + return configuration_infos + +def findParameterType(parameter): + if "value_list" in parameter["informations"]: + return "enum" + if "min" in parameter["informations"] or "max" in parameter["informations"] or re.match(r"^\d+U?L?$", parameter["value"]) != None: + return "int" def sub(string, parameter, value): """ @@ -427,7 +573,7 @@ def isInt(informations): """ Return True if the value is a simple int. """ - if ("long" not in informatios.keys() or not informations["long"]) and ("unsigned" not in informations.keys() or informations["unsigned"]): + if ("long" not in informatios or not informations["long"]) and ("unsigned" not in informations or informations["unsigned"]): return True else: return False @@ -436,7 +582,7 @@ def isLong(informations): """ Return True if the value is a long. """ - if "long" in informations.keys() and informations["long"] and "unsigned" not in informations.keys(): + if "long" in informations and informations["long"] and "unsigned" not in informations: return True else: return False @@ -445,7 +591,7 @@ def isUnsigned(informations): """ Return True if the value is an unsigned. """ - if "unsigned" in informations.keys() and informations["unsigned"] and "long" not in informations.keys(): + if "unsigned" in informations and informations["unsigned"] and "long" not in informations: return True else: return False @@ -454,7 +600,7 @@ def isUnsignedLong(informations): """ Return True if the value is an unsigned long. """ - if "unsigned" in informations.keys() and "long" in informations.keys() and informations["unsigned"] and informations["long"]: + if "unsigned" in informations and "long" in informations and informations["unsigned"] and informations["long"]: return True else: return False @@ -464,3 +610,8 @@ class ParseError(Exception): Exception.__init__(self) self.line_number = line_number self.line = line + +class SupportedException(Exception): + def __init__(self, support_string): + Exception.__init__(self) + self.support_string = support_string \ No newline at end of file