X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=wizard%2Fbertos_utils.py;h=a30aaed4cdb37f0a3f4c234d67c801ae4f587dfd;hb=bb9ed2f778c62e37fe8dab83fcb6dc9a6928619f;hp=98fd23dde905930765964e160d0d00c35a17564b;hpb=85a0e5ef831385250d4855b1a19b1ae561f14f0c;p=bertos.git diff --git a/wizard/bertos_utils.py b/wizard/bertos_utils.py index 98fd23dd..a30aaed4 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,63 +56,15 @@ def isBertosDir(directory): def bertosVersion(directory): return open(directory + "/VERSION").readline().strip() -def loadBertosProject(project_file, info_dict): - project_data = pickle.loads(open(project_file, "r").read()) - project_info = BProject.BProject() - project_info.setInfo("PROJECT_PATH", os.path.dirname(project_file)) - # Check for the Wizard version - wizard_version = project_data.get("WIZARD_VERSION", 0) - if not wizard_version: - project_data["SOURCES_PATH"] = os.path.dirname(project_file) - 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) - loadSourceTree(project_info) - 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 = {} for module, information in modules.items(): information["enabled"] = module in enabled_modules - for dependency in information["depends"]: - if not dependency in modules: - if dependency in files: - files[dependency] += 1 - else: - files[dependency] = 1 + if information["enabled"]: + for dependency in information["depends"]: + if not dependency in modules: + files[dependency] = files.get(dependency, 0) + 1 project_info.setInfo("MODULES", modules) project_info.setInfo("FILES", files) @@ -124,6 +75,26 @@ 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. + """ + def getPresetInfo(preset_dir): + # Find and returns information about the preset + # Keys needed for BBoardPage: + # - "name": + # - "description": + + # NOTE: this is only a test stub. + preset_info = pickle.loads(open(os.path.join(preset_dir, 'info'), "r").read()) + return preset_info + abspath = os.path.join(directory, const.PREDEFINED_BOARDS_DIR) + preset_list = dict([ + (os.path.join(abspath, preset_dir), getPresetInfo(os.path.join(abspath, preset_dir))) + for preset_dir in os.listdir(os.path.join(directory, const.PREDEFINED_BOARDS_DIR)) + ]) + return preset_list + def mergeSources(srcdir, new_sources, old_sources): # The current mergeSources function provide only a raw copy of the sources in the # created project. @@ -144,6 +115,7 @@ def projectFileGenerator(project_info): # Use the local BeRTOS version instead of the original one # project_data["SOURCES_PATH"] = project_info.info("SOURCES_PATH") project_data["SOURCES_PATH"] = directory + project_data["PROJECT_NAME"] = project_info.info("PROJECT_NAME", os.path.basename(directory)) project_data["TOOLCHAIN"] = project_info.info("TOOLCHAIN") project_data["CPU_NAME"] = project_info.info("CPU_NAME") project_data["SELECTED_FREQ"] = project_info.info("SELECTED_FREQ") @@ -183,7 +155,8 @@ def createBertosProject(project_info, edit=False): makefile = makefileGenerator(project_info, makefile) open(directory + "/Makefile", "w").write(makefile) # Destination project dir - prjdir = directory + "/" + os.path.basename(directory) + # prjdir = directory + "/" + os.path.basename(directory) + prjdir = os.path.join(directory, project_info.info("PROJECT_NAME")) if not edit: shutil.rmtree(prjdir, True) os.mkdir(prjdir) @@ -232,7 +205,8 @@ def createBertosProject(project_info, edit=False): if not edit: # Destination user mk file (only on project creation) makefile = open(os.path.join(const.DATA_DIR, "mktemplates/template.mk"), "r").read() - makefile = mkGenerator(project_info, makefile) + # Deadly performances loss was here :( + makefile = userMkGenerator(project_info, makefile) open(prjdir + "/" + os.path.basename(prjdir) + ".mk", "w").write(makefile) # Destination wizard mk file makefile = open(os.path.join(const.DATA_DIR, "mktemplates/template_wiz.mk"), "r").read() @@ -259,6 +233,15 @@ def versionFileGenerator(project_info, version_file): version = bertosVersion(project_info.info("SOURCES_PATH")) return version_file.replace('$version', version) +def userMkGenerator(project_info, makefile): + mk_data = {} + mk_data["$pname"] = os.path.basename(project_info.info("PROJECT_PATH")) + 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, mk_data[key]) + return makefile + def mkGenerator(project_info, makefile): """ Generates the mk file for the current project. @@ -364,28 +347,28 @@ def findModuleFiles(module, project_info): 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): + for filename, path in project_info.searchFiles(module + ".c") + \ + project_info.searchFiles(module + "_" + project_info.info("CPU_INFOS")["TOOLCHAIN"] + ".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 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): + 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"): 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): + for filename, path in project_info.searchFiles(module + "_" + tag + ".c"): 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): + for filename, path in project_info.searchFiles(module + "_" + tag + ".s") + \ + project_info.searchFiles(module + "_" + tag + ".S"): path = path.replace(project_info.info("SOURCES_PATH") + os.sep, "") path = replaceSeparators(path) sfiles.append(path + "/" + filename) @@ -445,30 +428,6 @@ def getToolchainName(toolchain_info): name = "GCC " + toolchain_info["version"] + " - " + toolchain_info["target"].strip() return name -def loadSourceTree(project): - # Index only the SOURCES_PATH/bertos content - bertos_sources_dir = os.path.join(project.info("SOURCES_PATH"), 'bertos') - if os.path.exists(bertos_sources_dir): - fileList = [f for f in os.walk(bertos_sources_dir)] - else: - fileList = [] - 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): - definitions.append((filename, element[0])) - return definitions - -def loadCpuInfos(project): - cpuInfos = [] - for definition in findDefinitions(const.CPU_DEFINITION, project): - cpuInfos.append(getInfos(definition)) - return cpuInfos - def getTagSet(cpu_info): tag_set = set([]) for cpu in cpu_info: @@ -632,59 +591,6 @@ def getDefinitionBlocks(text): block.append(([comment], define, start)) return block -def loadModuleData(project, edit=False): - 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: - 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("SOURCES_PATH") + "/" + configuration) - except ParseError, err: - raise DefineException.ConfigurationDefineException(project.info("SOURCES_PATH") + "/" + configuration, err.line_number, err.line) - if edit: - try: - path = os.path.basename(project.info("PROJECT_PATH")) - directory = project.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 findDefinitions("*_" + project.info("CPU_INFOS")["TOOLCHAIN"] + ".h", project): - 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): - 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