X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=wizard%2Fbertos_utils.py;h=fcd329ff22984c90ac3bef97f5b19f6ecfddbfb5;hb=f35b6066ecdeffcc8998dd566b5246bdcf43c548;hp=e291f56bd3b554f0d049f190605f27b0a05419fa;hpb=5ba80baaddfcca4bfd0a3307196101130891e766;p=bertos.git diff --git a/wizard/bertos_utils.py b/wizard/bertos_utils.py index e291f56b..fcd329ff 100644 --- a/wizard/bertos_utils.py +++ b/wizard/bertos_utils.py @@ -45,7 +45,6 @@ import pickle import const import plugins import DefineException -import BProject from _wizard_version import WIZARD_VERSION @@ -57,59 +56,6 @@ def isBertosDir(directory): def bertosVersion(directory): return open(directory + "/VERSION").readline().strip() -def loadBertosProject(project_file, info_dict): - project_dir = os.path.dirname(project_file) - project_data = pickle.loads(open(project_file, "r").read()) - project_info = BProject.BProject() - # If PROJECT_NAME is not defined it use the directory name as PROJECT_NAME - # NOTE: this can throw an Exception if the user has changed the directory containing the project - project_info.setInfo("PROJECT_NAME", project_data.get("PROJECT_NAME", os.path.basename(project_dir))) - project_info.setInfo("PROJECT_PATH", os.path.dirname(project_file)) - # Check for the Wizard version - wizard_version = project_data.get("WIZARD_VERSION", 0) - # Ignore the SOURCES_PATH inside the project file - project_data["SOURCES_PATH"] = project_dir - if "SOURCES_PATH" in info_dict: - project_data["SOURCES_PATH"] = info_dict["SOURCES_PATH"] - if os.path.exists(project_data["SOURCES_PATH"]): - project_info.setInfo("SOURCES_PATH", project_data["SOURCES_PATH"]) - else: - raise VersionException(project_info) - if not isBertosDir(project_dir): - version_file = open(os.path.join(const.DATA_DIR, "vtemplates/VERSION"), "r").read() - open(os.path.join(project_dir, "VERSION"), "w").write(version_file.replace("$version", "").strip()) - project_info.loadSourceTree() - cpu_name = project_data["CPU_NAME"] - project_info.setInfo("CPU_NAME", cpu_name) - cpu_info = loadCpuInfos(project_info) - for cpu in cpu_info: - if cpu["CPU_NAME"] == cpu_name: - project_info.setInfo("CPU_INFOS", cpu) - break - tag_list = getTagSet(cpu_info) - # Create, fill and store the dict with the tags - tag_dict = {} - for element in tag_list: - tag_dict[element] = False - infos = project_info.info("CPU_INFOS") - for tag in tag_dict: - if tag in infos["CPU_TAGS"] + [infos["CPU_NAME"], infos["TOOLCHAIN"]]: - tag_dict[tag] = True - else: - tag_dict[tag] = False - project_info.setInfo("ALL_CPU_TAGS", tag_dict) - if "TOOLCHAIN" in info_dict: - project_data["TOOLCHAIN"] = info_dict["TOOLCHAIN"] - if os.path.exists(project_data["TOOLCHAIN"]["path"]): - project_info.setInfo("TOOLCHAIN", project_data["TOOLCHAIN"]) - else: - raise ToolchainException(project_info) - project_info.setInfo("SELECTED_FREQ", project_data["SELECTED_FREQ"]) - project_info.setInfo("OUTPUT", project_data["OUTPUT"]) - loadModuleData(project_info, True) - setEnabledModules(project_info, project_data["ENABLED_MODULES"]) - return project_info - def setEnabledModules(project_info, enabled_modules): modules = project_info.info("MODULES") files = {} @@ -129,6 +75,36 @@ def enabledModules(project_info): enabled_modules.append(name) return enabled_modules +def presetList(directory): + """ + Return the list of the preset found in the selected BeRTOS Version. + """ + abspath = os.path.join(directory, const.PREDEFINED_BOARDS_DIR) + preset_list = dict([ + (os.path.join(abspath, preset_dir), presetInfo(os.path.join(abspath, preset_dir))) + for preset_dir in os.listdir(os.path.join(directory, const.PREDEFINED_BOARDS_DIR)) + ]) + return preset_list + +def presetInfo(preset_dir): + """ + Return the preset-relevant info contined into the project_file. + """ + preset_info = pickle.loads(open(os.path.join(preset_dir, "project.bertos"), "r").read()) + try: + description = open(os.path.join(preset_dir, "description"), "r").read() + except IOError: + # No description file found. + description = "" + relevant_info = { + "CPU_NAME": preset_info.get("CPU_NAME"), + "SELECTED_FREQ": preset_info.get("SELECTED_FREQ"), + "WIZARD_VERSION": preset_info.get("WIZARD_VERSION", None), + "PRESET_NAME": preset_info.get("PROJECT_NAME"), + "PRESET_DESCRIPTION": description.decode("utf-8"), + } + return relevant_info + def mergeSources(srcdir, new_sources, old_sources): # The current mergeSources function provide only a raw copy of the sources in the # created project. @@ -381,21 +357,32 @@ def findModuleFiles(module, project_info): cfiles = [] sfiles = [] # .c files related to the module and the cpu architecture - for filename, path in project_info.searchFiles(module + ".c") + \ - project_info.searchFiles(module + "_" + project_info.info("CPU_INFOS")["TOOLCHAIN"] + ".c"): + for filename, path in project_info.searchFiles(module + ".c"): 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 project_info.searchFiles(module + ".s") + \ - project_info.searchFiles(module + "_" + project_info.info("CPU_INFOS")["TOOLCHAIN"] + ".s") + \ - project_info.searchFiles(module + ".S") + \ - project_info.searchFiles(module + "_" + project_info.info("CPU_INFOS")["TOOLCHAIN"] + ".S"): + project_info.searchFiles(module + ".S"): 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"]: + tags = project_info.info("CPU_INFOS")["CPU_TAGS"] + + # Awful, but secure check for version + # TODO: split me in a method/function + try: + version_string = bertosVersion(project_info.info("SOURCES_PATH")) + version_list = [int(i) for i in version_string.split()[-1].split('.')] + if version_list < [2, 5]: + # For older versions of BeRTOS add the toolchain to the tags + tags.append(project_info.info("CPU_INFOS")["TOOLCHAIN"]) + except ValueError: + # If the version file hasn't a valid version number do nothing + pass + + for tag in tags: for filename, path in project_info.searchFiles(module + "_" + tag + ".c"): path = path.replace(project_info.info("SOURCES_PATH") + os.sep, "") if os.sep != "/": @@ -462,12 +449,6 @@ def getToolchainName(toolchain_info): name = "GCC " + toolchain_info["version"] + " - " + toolchain_info["target"].strip() return name -def loadCpuInfos(project_info): - cpuInfos = [] - for definition in project_info.findDefinitions(const.CPU_DEFINITION): - cpuInfos.append(getInfos(definition)) - return cpuInfos - def getTagSet(cpu_info): tag_set = set([]) for cpu in cpu_info: @@ -631,59 +612,6 @@ def getDefinitionBlocks(text): block.append(([comment], define, start)) return block -def loadModuleData(project_info, edit=False): - module_info_dict = {} - list_info_dict = {} - configuration_info_dict = {} - file_dict = {} - for filename, path in project_info.findDefinitions("*.h") + project_info.findDefinitions("*.c") + project_info.findDefinitions("*.s") + project_info.findDefinitions("*.S"): - comment_list = getCommentList(open(path + "/" + filename, "r").read()) - if len(comment_list) > 0: - module_info = {} - configuration_info = {} - try: - 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 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 and len(information["configuration"]): - configuration = module_dict[module]["configuration"] - try: - configuration_info[configuration] = loadConfigurationInfos(project_info.info("SOURCES_PATH") + "/" + configuration) - except ParseError, err: - raise DefineException.ConfigurationDefineException(project_info.info("SOURCES_PATH") + "/" + configuration, err.line_number, err.line) - if edit: - try: - path = project_info.info("PROJECT_NAME") - directory = project_info.info("PROJECT_PATH") - user_configuration = loadConfigurationInfos(directory + "/" + configuration.replace("bertos", path)) - configuration_info[configuration] = updateConfigurationValues(configuration_info[configuration], user_configuration) - except ParseError, err: - raise DefineException.ConfigurationDefineException(directory + "/" + configuration.replace("bertos", path)) - module_info_dict.update(module_dict) - configuration_info_dict.update(configuration_info) - if to_be_parsed: - try: - 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 project_info.findDefinitions("*_" + project_info.info("CPU_INFOS")["TOOLCHAIN"] + ".h"): - comment_list = getCommentList(open(path + "/" + filename, "r").read()) - list_info_dict.update(loadDefineLists(comment_list)) - for tag in project_info.info("CPU_INFOS")["CPU_TAGS"]: - for filename, path in project_info.findDefinitions("*_" + tag + ".h"): - comment_list = getCommentList(open(path + "/" + filename, "r").read()) - list_info_dict.update(loadDefineLists(comment_list)) - project_info.setInfo("MODULES", module_info_dict) - project_info.setInfo("LISTS", list_info_dict) - project_info.setInfo("CONFIGURATIONS", configuration_info_dict) - project_info.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